diff --git a/mastercopies.json b/mastercopies.json index f7e3df0..4fbee64 100644 --- a/mastercopies.json +++ b/mastercopies.json @@ -1,6 +1,11 @@ { "Delay": { "1.0.0": { + "contractName": "Delay", + "sourceName": "contracts/Delay.sol", + "contractVersion": "1.0.0", + "compilerVersion": "v0.8.0+commit.c7dfd78e", + "factory": "0xce0042b868300000d44a59004da54a005ffdcf9f", "address": "0xD62129BF40CD1694b3d9D9847367783a1A4d5cB4", "bytecode": "0x60806040523480156200001157600080fd5b5060405162004e2138038062004e21833981810160405281019062000037919062000a30565b600085858585856040516020016200005495949392919062000d57565b604051602081830303815290604052905062000076816200008260201b60201c565b50505050505062000f53565b600080600080600085806020019051810190620000a09190620009ae565b94509450945094509450620000ba6200032a60201b60201c565b600073ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff1614156200012d576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620001249062000e5e565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161415620001a0576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620001979062000dd6565b60405180910390fd5b6000811480620001b15750603c8110155b620001f3576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620001ea9062000e3c565b60405180910390fd5b83606660006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555082606760006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080606a819055508160698190555062000294856200042960201b60201c565b620002a46200053f60201b60201c565b8373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167ffd805e12a6d02f83d7029c03fdfcf3f226ebcd409af51b3095237015eae50300866040516200031a919062000d3a565b60405180910390a4505050505050565b600060019054906101000a900460ff168062000351575060008054906101000a900460ff16155b62000393576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016200038a9062000df8565b60405180910390fd5b60008060019054906101000a900460ff161590508015620003e4576001600060016101000a81548160ff02191690831515021790555060016000806101000a81548160ff0219169083151502179055505b620003f46200069360201b60201c565b620004046200077260201b60201c565b8015620004265760008060016101000a81548160ff0219169083151502179055505b50565b620004396200087160201b60201c565b73ffffffffffffffffffffffffffffffffffffffff166200045f6200087960201b60201c565b73ffffffffffffffffffffffffffffffffffffffff1614620004b8576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620004af9062000e1a565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614156200052b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620005229062000db4565b60405180910390fd5b6200053c81620008a360201b60201c565b50565b600073ffffffffffffffffffffffffffffffffffffffff1660686000600173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161462000611576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620006089062000e80565b60405180910390fd5b600160686000600173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550565b600060019054906101000a900460ff1680620006ba575060008054906101000a900460ff16155b620006fc576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620006f39062000df8565b60405180910390fd5b60008060019054906101000a900460ff1615905080156200074d576001600060016101000a81548160ff02191690831515021790555060016000806101000a81548160ff0219169083151502179055505b80156200076f5760008060016101000a81548160ff0219169083151502179055505b50565b600060019054906101000a900460ff168062000799575060008054906101000a900460ff16155b620007db576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620007d29062000df8565b60405180910390fd5b60008060019054906101000a900460ff1615905080156200082c576001600060016101000a81548160ff02191690831515021790555060016000806101000a81548160ff0219169083151502179055505b6200084c620008406200087160201b60201c565b620008a360201b60201c565b80156200086e5760008060016101000a81548160ff0219169083151502179055505b50565b600033905090565b6000603360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b6000603360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905081603360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508173ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a35050565b6000815190506200097a8162000f05565b92915050565b600081519050620009918162000f1f565b92915050565b600081519050620009a88162000f39565b92915050565b600080600080600060a08688031215620009c757600080fd5b6000620009d78882890162000980565b9550506020620009ea8882890162000980565b9450506040620009fd8882890162000980565b935050606062000a108882890162000997565b925050608062000a238882890162000997565b9150509295509295909350565b600080600080600060a0868803121562000a4957600080fd5b600062000a598882890162000969565b955050602062000a6c8882890162000969565b945050604062000a7f8882890162000969565b935050606062000a928882890162000997565b925050608062000aa58882890162000997565b9150509295509295909350565b62000abd8162000eb3565b82525050565b600062000ad260268362000ea2565b91507f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160008301527f64647265737300000000000000000000000000000000000000000000000000006020830152604082019050919050565b600062000b3a601e8362000ea2565b91507f5461726765742063616e206e6f74206265207a65726f206164647265737300006000830152602082019050919050565b600062000b7c602e8362000ea2565b91507f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160008301527f647920696e697469616c697a65640000000000000000000000000000000000006020830152604082019050919050565b600062000be460208362000ea2565b91507f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726000830152602082019050919050565b600062000c26602d8362000ea2565b91507f457870697261746974696f6e206d7573742062652030206f72206174206c656160008301527f7374203630207365636f6e6473000000000000000000000000000000000000006020830152604082019050919050565b600062000c8e601e8362000ea2565b91507f4176617461722063616e206e6f74206265207a65726f206164647265737300006000830152602082019050919050565b600062000cd060248362000ea2565b91507f73657455704d6f64756c65732068617320616c7265616479206265656e20636160008301527f6c6c6564000000000000000000000000000000000000000000000000000000006020830152604082019050919050565b62000d348162000efb565b82525050565b600060208201905062000d51600083018462000ab2565b92915050565b600060a08201905062000d6e600083018862000ab2565b62000d7d602083018762000ab2565b62000d8c604083018662000ab2565b62000d9b606083018562000d29565b62000daa608083018462000d29565b9695505050505050565b6000602082019050818103600083015262000dcf8162000ac3565b9050919050565b6000602082019050818103600083015262000df18162000b2b565b9050919050565b6000602082019050818103600083015262000e138162000b6d565b9050919050565b6000602082019050818103600083015262000e358162000bd5565b9050919050565b6000602082019050818103600083015262000e578162000c17565b9050919050565b6000602082019050818103600083015262000e798162000c7f565b9050919050565b6000602082019050818103600083015262000e9b8162000cc1565b9050919050565b600082825260208201905092915050565b600062000ec08262000edb565b9050919050565b600062000ed48262000edb565b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b62000f108162000eb3565b811462000f1c57600080fd5b50565b62000f2a8162000ec7565b811462000f3657600080fd5b50565b62000f448162000efb565b811462000f5057600080fd5b50565b613ebe8062000f636000396000f3fe608060405234801561001057600080fd5b50600436106101e55760003560e01c80637ceab3b11161010f578063d4b83992116100a2578063e19a9dd911610071578063e19a9dd914610582578063ebb2b4a21461059e578063ee072baf146105ba578063f2fde38b146105d6576101e5565b8063d4b839921461050c578063dcafac091461052a578063de8dd91d14610548578063e009cfde14610566576101e5565b8063b19d4758116100de578063b19d475814610495578063c66323e51461049f578063c9106389146104bd578063cc2f8452146104db576101e5565b80637ceab3b1146104215780638da5cb5b1461043f5780639b56d5be1461045d578063a4f9edbf14610479576101e5565b806346ba230711610187578063610b592511610156578063610b5925146103af5780636b0a4cf6146103cb578063715018a6146103fb578063776d1a0114610405576101e5565b806346ba2307146103265780635229073f146103425780635aef7de614610373578063605df59c14610391576101e5565b8063300c661f116101c3578063300c661f146102665780633aa7690614610296578063427e232f146102c6578063468721a7146102f6576101e5565b8063086cfca8146101ea578063258148cc146102065780632d9ad53d14610236575b600080fd5b61020460048036038101906101ff9190612b58565b6105f2565b005b610220600480360381019061021b9190612dd5565b610734565b60405161022d9190613a47565b60405180910390f35b610250600480360381019061024b9190612b58565b61074c565b60405161025d919061373d565b60405180910390f35b610280600480360381019061027b9190612cf0565b61081e565b60405161028d9190613788565b60405180910390f35b6102b060048036038101906102ab9190612dd5565b610857565b6040516102bd9190613a47565b60405180910390f35b6102e060048036038101906102db9190612dd5565b610874565b6040516102ed9190613788565b60405180910390f35b610310600480360381019061030b9190612c70565b61088c565b60405161031d919061373d565b60405180910390f35b610340600480360381019061033b9190612dd5565b610a5c565b005b61035c60048036038101906103579190612c70565b610b6b565b60405161036a929190613758565b60405180910390f35b61037b610c48565b604051610388919061359f565b60405180910390f35b610399610c6e565b6040516103a69190613a47565b60405180910390f35b6103c960048036038101906103c49190612b58565b610c74565b005b6103e560048036038101906103e09190612dd5565b610ffe565b6040516103f29190613788565b60405180910390f35b61040361101b565b005b61041f600480360381019061041a9190612b58565b6110a3565b005b6104296111e5565b604051610436919061359f565b60405180910390f35b61044761120b565b604051610454919061359f565b60405180910390f35b61047760048036038101906104729190612dd5565b611235565b005b610493600480360381019061048e9190612d94565b61130a565b005b61049d61158c565b005b6104a7611601565b6040516104b49190613a47565b60405180910390f35b6104c5611607565b6040516104d2919061359f565b60405180910390f35b6104f560048036038101906104f09190612c34565b611631565b60405161050392919061370d565b60405180910390f35b61051461187e565b604051610521919061359f565b60405180910390f35b6105326118a4565b60405161053f9190613a47565b60405180910390f35b6105506118aa565b60405161055d9190613a47565b60405180910390f35b610580600480360381019061057b9190612bf8565b6118b0565b005b61059c60048036038101906105979190612b58565b611c39565b005b6105b860048036038101906105b39190612dd5565b611e6f565b005b6105d460048036038101906105cf9190612c70565b611ef5565b005b6105f060048036038101906105eb9190612b58565b612171565b005b6105fa612269565b73ffffffffffffffffffffffffffffffffffffffff1661061861120b565b73ffffffffffffffffffffffffffffffffffffffff161461066e576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610665906138c7565b60405180910390fd5b6000606660009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905081606660006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508173ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f52ae88b092de36f87fb43fe794eb1381023b9c1bce563a871154022c63dce34260405160405180910390a35050565b606e6020528060005260406000206000915090505481565b60008173ffffffffffffffffffffffffffffffffffffffff16600173ffffffffffffffffffffffffffffffffffffffff16141580156108175750600073ffffffffffffffffffffffffffffffffffffffff16606860008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614155b9050919050565b6000848484846040516020016108379493929190613555565b604051602081830303815290604052805190602001209050949350505050565b6000606e6000838152602001908152602001600020549050919050565b606d6020528060005260406000206000915090505481565b60008073ffffffffffffffffffffffffffffffffffffffff16606860003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141561095c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161095390613947565b60405180910390fd5b6109ac868686868080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f820116905080830192505050505050508561081e565b606d6000606c5481526020019081526020016000208190555042606e6000606c54815260200190815260200160002081905550606d6000606c54815260200190815260200160002054606c547f4c8a9c748e976c17c2eb2c2bc50da76eac9cd90ff529f0fe900e0c10a179f0318888888888604051610a2f9594939291906135ba565b60405180910390a3606c6000815480929190610a4a90613cc7565b91905055506001905095945050505050565b610a64612269565b73ffffffffffffffffffffffffffffffffffffffff16610a8261120b565b73ffffffffffffffffffffffffffffffffffffffff1614610ad8576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610acf906138c7565b60405180910390fd5b606b548111610b1c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610b13906138a7565b60405180910390fd5b606c54811115610b61576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610b58906138e7565b60405180910390fd5b80606b8190555050565b60006060600073ffffffffffffffffffffffffffffffffffffffff16606860003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415610c3e576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610c3590613947565b60405180910390fd5b9550959350505050565b606660009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b606a5481565b610c7c612269565b73ffffffffffffffffffffffffffffffffffffffff16610c9a61120b565b73ffffffffffffffffffffffffffffffffffffffff1614610cf0576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610ce7906138c7565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614158015610d5a5750600173ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614155b610d99576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610d9090613a07565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff16606860008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614610e67576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610e5e906139a7565b60405180910390fd5b60686000600173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16606860008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508060686000600173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055507fecdf3a3effea5783a3c4c2140e677577666428d44ed9d474a0b3a4c9943f844081604051610ff3919061359f565b60405180910390a150565b6000606d6000838152602001908152602001600020549050919050565b611023612269565b73ffffffffffffffffffffffffffffffffffffffff1661104161120b565b73ffffffffffffffffffffffffffffffffffffffff1614611097576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161108e906138c7565b60405180910390fd5b6110a16000612271565b565b6110ab612269565b73ffffffffffffffffffffffffffffffffffffffff166110c961120b565b73ffffffffffffffffffffffffffffffffffffffff161461111f576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611116906138c7565b60405180910390fd5b6000606760009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905081606760006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508173ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f90cc2f570a6eb594b1580ea3e41247d2d73a55281889e86bd4ec2fc29c7e62d660405160405180910390a35050565b606560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000603360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b61123d612269565b73ffffffffffffffffffffffffffffffffffffffff1661125b61120b565b73ffffffffffffffffffffffffffffffffffffffff16146112b1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016112a8906138c7565b60405180910390fd5b60008114806112c15750603c8110155b611300576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016112f790613907565b60405180910390fd5b80606a8190555050565b6000806000806000858060200190518101906113269190612b81565b94509450945094509450611338612337565b600073ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff1614156113a8576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161139f90613927565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161415611418576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161140f90613867565b60405180910390fd5b60008114806114285750603c8110155b611467576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161145e90613907565b60405180910390fd5b83606660006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555082606760006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080606a819055508160698190555061150085612171565b611508612420565b8373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167ffd805e12a6d02f83d7029c03fdfcf3f226ebcd409af51b3095237015eae503008660405161157c919061359f565b60405180910390a4505050505050565b5b6000606a54141580156115ce575042606a54606954606e6000606b548152602001908152602001600020546115c29190613b34565b6115cc9190613b34565b105b80156115dd5750606c54606b54105b156115ff57606b60008154809291906115f590613cc7565b919050555061158d565b565b606b5481565b6000606560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b606060008267ffffffffffffffff811115611675577f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040519080825280602002602001820160405280156116a35781602001602082028036833780820191505090505b509150600080606860008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690505b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16141580156117765750600173ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614155b801561178157508482105b1561186f57808483815181106117c0577f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050606860008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050818061186790613cc7565b92505061170c565b80925081845250509250929050565b606760009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60695481565b606c5481565b6118b8612269565b73ffffffffffffffffffffffffffffffffffffffff166118d661120b565b73ffffffffffffffffffffffffffffffffffffffff161461192c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611923906138c7565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16141580156119965750600173ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614155b6119d5576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016119cc90613a07565b60405180910390fd5b8073ffffffffffffffffffffffffffffffffffffffff16606860008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614611aa2576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611a99906137e7565b60405180910390fd5b606860008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16606860008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000606860008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055507faab4fa2b463f581b2b32cb3b7e3b704b9ce37cc209b5fb4d77e593ace405427681604051611c2d919061359f565b60405180910390a15050565b611c41612269565b73ffffffffffffffffffffffffffffffffffffffff16611c5f61120b565b73ffffffffffffffffffffffffffffffffffffffff1614611cb5576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611cac906138c7565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614611dd2578073ffffffffffffffffffffffffffffffffffffffff166301ffc9a77fe6d7a83a000000000000000000000000000000000000000000000000000000006040518263ffffffff1660e01b8152600401611d4291906137cc565b60206040518083038186803b158015611d5a57600080fd5b505afa158015611d6e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d929190612d6b565b611dd1576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611dc890613967565b60405180910390fd5b5b80606560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055507f1151116914515bc0891ff9047a6cb32cf902546f83066499bcf8ba33d2353fa2606560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16604051611e64919061359f565b60405180910390a150565b611e77612269565b73ffffffffffffffffffffffffffffffffffffffff16611e9561120b565b73ffffffffffffffffffffffffffffffffffffffff1614611eeb576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611ee2906138c7565b60405180910390fd5b8060698190555050565b606c54606b5410611f3b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611f32906139e7565b60405180910390fd5b606954606e6000606b5481526020019081526020016000205442611f5f9190613b8a565b1015611fa0576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611f9790613987565b60405180910390fd5b6000606a541461201d5742606a54606954606e6000606b54815260200190815260200160002054611fd19190613b34565b611fdb9190613b34565b101561201c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161201390613827565b60405180910390fd5b5b61206d858585858080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f820116905080830192505050505050508461081e565b606d6000606b54815260200190815260200160002054146120c3576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016120ba90613847565b60405180910390fd5b606b60008154809291906120d690613cc7565b919050555061212b858585858080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f8201169050808301925050505050505084612571565b61216a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161216190613a27565b60405180910390fd5b5050505050565b612179612269565b73ffffffffffffffffffffffffffffffffffffffff1661219761120b565b73ffffffffffffffffffffffffffffffffffffffff16146121ed576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016121e4906138c7565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16141561225d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161225490613807565b60405180910390fd5b61226681612271565b50565b600033905090565b6000603360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905081603360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508173ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a35050565b600060019054906101000a900460ff168061235d575060008054906101000a900460ff16155b61239c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161239390613887565b60405180910390fd5b60008060019054906101000a900460ff1615905080156123ec576001600060016101000a81548160ff02191690831515021790555060016000806101000a81548160ff0219169083151502179055505b6123f4612866565b6123fc61293f565b801561241d5760008060016101000a81548160ff0219169083151502179055505b50565b600073ffffffffffffffffffffffffffffffffffffffff1660686000600173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16146124ef576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016124e6906139c7565b60405180910390fd5b600160686000600173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550565b60008073ffffffffffffffffffffffffffffffffffffffff16606560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16146126a357606560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166375f0bb528686868660008060008060006040518060400160405280600281526020017f307800000000000000000000000000000000000000000000000000000000000081525060006040518c63ffffffff1660e01b81526004016126709b9a99989796959493929190613654565b600060405180830381600087803b15801561268a57600080fd5b505af115801561269e573d6000803e3d6000fd5b505050505b606760009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663468721a7868686866040518563ffffffff1660e01b81526004016127049493929190613608565b602060405180830381600087803b15801561271e57600080fd5b505af1158015612732573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906127569190612d6b565b9050600073ffffffffffffffffffffffffffffffffffffffff16606560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161461285e57606560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663932713687f3078000000000000000000000000000000000000000000000000000000000000836040518363ffffffff1660e01b815260040161282b9291906137a3565b600060405180830381600087803b15801561284557600080fd5b505af1158015612859573d6000803e3d6000fd5b505050505b949350505050565b600060019054906101000a900460ff168061288c575060008054906101000a900460ff16155b6128cb576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016128c290613887565b60405180910390fd5b60008060019054906101000a900460ff16159050801561291b576001600060016101000a81548160ff02191690831515021790555060016000806101000a81548160ff0219169083151502179055505b801561293c5760008060016101000a81548160ff0219169083151502179055505b50565b600060019054906101000a900460ff1680612965575060008054906101000a900460ff16155b6129a4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161299b90613887565b60405180910390fd5b60008060019054906101000a900460ff1615905080156129f4576001600060016101000a81548160ff02191690831515021790555060016000806101000a81548160ff0219169083151502179055505b612a046129ff612269565b612271565b8015612a255760008060016101000a81548160ff0219169083151502179055505b50565b6000612a3b612a3684613a93565b613a62565b905082815260208101848484011115612a5357600080fd5b612a5e848285613c85565b509392505050565b600081359050612a7581613e1c565b92915050565b600081519050612a8a81613e33565b92915050565b600081519050612a9f81613e4a565b92915050565b60008083601f840112612ab757600080fd5b8235905067ffffffffffffffff811115612ad057600080fd5b602083019150836001820283011115612ae857600080fd5b9250929050565b600082601f830112612b0057600080fd5b8135612b10848260208601612a28565b91505092915050565b600081359050612b2881613e61565b92915050565b600081359050612b3d81613e71565b92915050565b600081519050612b5281613e71565b92915050565b600060208284031215612b6a57600080fd5b6000612b7884828501612a66565b91505092915050565b600080600080600060a08688031215612b9957600080fd5b6000612ba788828901612a7b565b9550506020612bb888828901612a7b565b9450506040612bc988828901612a7b565b9350506060612bda88828901612b43565b9250506080612beb88828901612b43565b9150509295509295909350565b60008060408385031215612c0b57600080fd5b6000612c1985828601612a66565b9250506020612c2a85828601612a66565b9150509250929050565b60008060408385031215612c4757600080fd5b6000612c5585828601612a66565b9250506020612c6685828601612b2e565b9150509250929050565b600080600080600060808688031215612c8857600080fd5b6000612c9688828901612a66565b9550506020612ca788828901612b2e565b945050604086013567ffffffffffffffff811115612cc457600080fd5b612cd088828901612aa5565b93509350506060612ce388828901612b19565b9150509295509295909350565b60008060008060808587031215612d0657600080fd5b6000612d1487828801612a66565b9450506020612d2587828801612b2e565b935050604085013567ffffffffffffffff811115612d4257600080fd5b612d4e87828801612aef565b9250506060612d5f87828801612b19565b91505092959194509250565b600060208284031215612d7d57600080fd5b6000612d8b84828501612a90565b91505092915050565b600060208284031215612da657600080fd5b600082013567ffffffffffffffff811115612dc057600080fd5b612dcc84828501612aef565b91505092915050565b600060208284031215612de757600080fd5b6000612df584828501612b2e565b91505092915050565b6000612e0a8383612e25565b60208301905092915050565b612e1f81613bd0565b82525050565b612e2e81613bbe565b82525050565b612e3d81613bbe565b82525050565b612e54612e4f82613bbe565b613d10565b82525050565b6000612e6582613ad3565b612e6f8185613af6565b9350612e7a83613ac3565b8060005b83811015612eab578151612e928882612dfe565b9750612e9d83613ae9565b925050600181019050612e7e565b5085935050505092915050565b612ec181613be2565b82525050565b612ed081613bee565b82525050565b612edf81613bf8565b82525050565b6000612ef18385613b07565b9350612efe838584613c85565b612f0783613ddd565b840190509392505050565b6000612f1d82613ade565b612f278185613b07565b9350612f37818560208601613c94565b612f4081613ddd565b840191505092915050565b6000612f5682613ade565b612f608185613b18565b9350612f70818560208601613c94565b80840191505092915050565b612f8581613c61565b82525050565b612f9c612f9782613c61565b613d3e565b82525050565b612fab81613c73565b82525050565b6000612fbe601783613b23565b91507f4d6f64756c6520616c72656164792064697361626c65640000000000000000006000830152602082019050919050565b6000612ffe602683613b23565b91507f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160008301527f64647265737300000000000000000000000000000000000000000000000000006020830152604082019050919050565b6000613064601383613b23565b91507f5472616e73616374696f6e2065787069726564000000000000000000000000006000830152602082019050919050565b60006130a4601f83613b23565b91507f5472616e73616374696f6e2068617368657320646f206e6f74206d61746368006000830152602082019050919050565b60006130e4601e83613b23565b91507f5461726765742063616e206e6f74206265207a65726f206164647265737300006000830152602082019050919050565b6000613124602e83613b23565b91507f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160008301527f647920696e697469616c697a65640000000000000000000000000000000000006020830152604082019050919050565b600061318a602d83613b23565b91507f4e6577206e6f6e6365206d75737420626520686967686572207468616e20637560008301527f7272656e742074784e6f6e6365000000000000000000000000000000000000006020830152604082019050919050565b60006131f0602083613b23565b91507f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726000830152602082019050919050565b6000613230602083613b23565b91507f43616e6e6f7420626520686967686572207468616e2071756575654e6f6e63656000830152602082019050919050565b6000613270602d83613b23565b91507f457870697261746974696f6e206d7573742062652030206f72206174206c656160008301527f7374203630207365636f6e6473000000000000000000000000000000000000006020830152604082019050919050565b60006132d6601e83613b23565b91507f4176617461722063616e206e6f74206265207a65726f206164647265737300006000830152602082019050919050565b6000613316601583613b23565b91507f4d6f64756c65206e6f7420617574686f72697a656400000000000000000000006000830152602082019050919050565b6000613356602083613b23565b91507f477561726420646f6573206e6f7420696d706c656d656e7420494552433136356000830152602082019050919050565b6000613396602083613b23565b91507f5472616e73616374696f6e206973207374696c6c20696e20636f6f6c646f776e6000830152602082019050919050565b60006133d6601683613b23565b91507f4d6f64756c6520616c726561647920656e61626c6564000000000000000000006000830152602082019050919050565b6000613416602483613b23565b91507f73657455704d6f64756c65732068617320616c7265616479206265656e20636160008301527f6c6c6564000000000000000000000000000000000000000000000000000000006020830152604082019050919050565b600061347c601a83613b23565b91507f5472616e73616374696f6e20717565756520697320656d7074790000000000006000830152602082019050919050565b60006134bc600e83613b23565b91507f496e76616c6964206d6f64756c650000000000000000000000000000000000006000830152602082019050919050565b60006134fc601983613b23565b91507f4d6f64756c65207472616e73616374696f6e206661696c6564000000000000006000830152602082019050919050565b61353881613c57565b82525050565b61354f61354a82613c57565b613d34565b82525050565b60006135618287612e43565b601482019150613571828661353e565b6020820191506135818285612f4b565b915061358d8284612f8b565b60018201915081905095945050505050565b60006020820190506135b46000830184612e34565b92915050565b60006080820190506135cf6000830188612e34565b6135dc602083018761352f565b81810360408301526135ef818587612ee5565b90506135fe6060830184612f7c565b9695505050505050565b600060808201905061361d6000830187612e34565b61362a602083018661352f565b818103604083015261363c8185612f12565b905061364b6060830184612f7c565b95945050505050565b60006101608201905061366a600083018e612e34565b613677602083018d61352f565b8181036040830152613689818c612f12565b9050613698606083018b612f7c565b6136a5608083018a612fa2565b6136b260a0830189612fa2565b6136bf60c0830188612fa2565b6136cc60e0830187612e34565b6136da610100830186612e16565b8181036101208301526136ed8185612f12565b90506136fd610140830184612e34565b9c9b505050505050505050505050565b600060408201905081810360008301526137278185612e5a565b90506137366020830184612e34565b9392505050565b60006020820190506137526000830184612eb8565b92915050565b600060408201905061376d6000830185612eb8565b818103602083015261377f8184612f12565b90509392505050565b600060208201905061379d6000830184612ec7565b92915050565b60006040820190506137b86000830185612ec7565b6137c56020830184612eb8565b9392505050565b60006020820190506137e16000830184612ed6565b92915050565b6000602082019050818103600083015261380081612fb1565b9050919050565b6000602082019050818103600083015261382081612ff1565b9050919050565b6000602082019050818103600083015261384081613057565b9050919050565b6000602082019050818103600083015261386081613097565b9050919050565b60006020820190508181036000830152613880816130d7565b9050919050565b600060208201905081810360008301526138a081613117565b9050919050565b600060208201905081810360008301526138c08161317d565b9050919050565b600060208201905081810360008301526138e0816131e3565b9050919050565b6000602082019050818103600083015261390081613223565b9050919050565b6000602082019050818103600083015261392081613263565b9050919050565b60006020820190508181036000830152613940816132c9565b9050919050565b6000602082019050818103600083015261396081613309565b9050919050565b6000602082019050818103600083015261398081613349565b9050919050565b600060208201905081810360008301526139a081613389565b9050919050565b600060208201905081810360008301526139c0816133c9565b9050919050565b600060208201905081810360008301526139e081613409565b9050919050565b60006020820190508181036000830152613a008161346f565b9050919050565b60006020820190508181036000830152613a20816134af565b9050919050565b60006020820190508181036000830152613a40816134ef565b9050919050565b6000602082019050613a5c600083018461352f565b92915050565b6000604051905081810181811067ffffffffffffffff82111715613a8957613a88613dae565b5b8060405250919050565b600067ffffffffffffffff821115613aae57613aad613dae565b5b601f19601f8301169050602081019050919050565b6000819050602082019050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b600082825260208201905092915050565b600082825260208201905092915050565b600081905092915050565b600082825260208201905092915050565b6000613b3f82613c57565b9150613b4a83613c57565b9250827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff03821115613b7f57613b7e613d50565b5b828201905092915050565b6000613b9582613c57565b9150613ba083613c57565b925082821015613bb357613bb2613d50565b5b828203905092915050565b6000613bc982613c37565b9050919050565b6000613bdb82613c37565b9050919050565b60008115159050919050565b6000819050919050565b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b6000819050613c3282613e08565b919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b6000613c6c82613c24565b9050919050565b6000613c7e82613c57565b9050919050565b82818337600083830152505050565b60005b83811015613cb2578082015181840152602081019050613c97565b83811115613cc1576000848401525b50505050565b6000613cd282613c57565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff821415613d0557613d04613d50565b5b600182019050919050565b6000613d1b82613d22565b9050919050565b6000613d2d82613dfb565b9050919050565b6000819050919050565b6000613d4982613dee565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6000601f19601f8301169050919050565b60008160f81b9050919050565b60008160601b9050919050565b60028110613e1957613e18613d7f565b5b50565b613e2581613bbe565b8114613e3057600080fd5b50565b613e3c81613bd0565b8114613e4757600080fd5b50565b613e5381613be2565b8114613e5e57600080fd5b50565b60028110613e6e57600080fd5b50565b613e7a81613c57565b8114613e8557600080fd5b5056fea26469706673582212206f4de68ccc61e36655459f9fb9c07003c20f8e19b2a434ed1a757de2d8dc3f8e64736f6c63430008000033", "constructorArgs": { @@ -15,8 +20,8 @@ "0x0000000000000000000000000000000000000001", "0x0000000000000000000000000000000000000001", "0x0000000000000000000000000000000000000001", - 1, - 0 + "0x0000000000000000000000000000000000000001", + "0x0000000000000000000000000000000000000000" ] }, "salt": "0x0000000000000000000000000000000000000000000000000000000000000000", @@ -750,6 +755,28 @@ ], "compilerInput": { "language": "Solidity", + "settings": { + "evmVersion": "istanbul", + "libraries": {}, + "metadata": { + "bytecodeHash": "ipfs", + "useLiteralContent": true + }, + "optimizer": { + "enabled": false, + "runs": 200 + }, + "remappings": [], + "outputSelection": { + "*": { + "*": [ + "evm.bytecode", + "evm.deployedBytecode", + "abi" + ] + } + } + }, "sources": { "@gnosis.pm/safe-contracts/contracts/common/Enum.sol": { "content": "// SPDX-License-Identifier: LGPL-3.0-only\npragma solidity >=0.7.0 <0.9.0;\n\n/// @title Enum - Collection of enums\n/// @author Richard Meissner - \ncontract Enum {\n enum Operation {Call, DelegateCall}\n}\n" @@ -790,33 +817,15 @@ "contracts/Delay.sol": { "content": "// SPDX-License-Identifier: LGPL-3.0-only\npragma solidity >=0.8.0;\n\nimport \"@gnosis.pm/zodiac/contracts/core/Modifier.sol\";\n\ncontract Delay is Modifier {\n event DelaySetup(\n address indexed initiator,\n address indexed owner,\n address indexed avatar,\n address target\n );\n event TransactionAdded(\n uint256 indexed queueNonce,\n bytes32 indexed txHash,\n address to,\n uint256 value,\n bytes data,\n Enum.Operation operation\n );\n\n uint256 public txCooldown;\n uint256 public txExpiration;\n uint256 public txNonce;\n uint256 public queueNonce;\n // Mapping of queue nonce to transaction hash.\n mapping(uint256 => bytes32) public txHash;\n // Mapping of queue nonce to creation timestamp.\n mapping(uint256 => uint256) public txCreatedAt;\n\n /// @param _owner Address of the owner\n /// @param _avatar Address of the avatar (e.g. a Gnosis Safe)\n /// @param _target Address of the contract that will call exec function\n /// @param _cooldown Cooldown in seconds that should be required after a transaction is proposed\n /// @param _expiration Duration that a proposed transaction is valid for after the cooldown, in seconds (or 0 if valid forever)\n /// @notice There need to be at least 60 seconds between end of cooldown and expiration\n constructor(\n address _owner,\n address _avatar,\n address _target,\n uint256 _cooldown,\n uint256 _expiration\n ) {\n bytes memory initParams =\n abi.encode(_owner, _avatar, _target, _cooldown, _expiration);\n setUp(initParams);\n }\n\n function setUp(bytes memory initParams) public override {\n (\n address _owner,\n address _avatar,\n address _target,\n uint256 _cooldown,\n uint256 _expiration\n ) =\n abi.decode(\n initParams,\n (address, address, address, uint256, uint256)\n );\n __Ownable_init();\n require(_avatar != address(0), \"Avatar can not be zero address\");\n require(_target != address(0), \"Target can not be zero address\");\n require(\n _expiration == 0 || _expiration >= 60,\n \"Expiratition must be 0 or at least 60 seconds\"\n );\n\n avatar = _avatar;\n target = _target;\n txExpiration = _expiration;\n txCooldown = _cooldown;\n\n transferOwnership(_owner);\n setupModules();\n\n emit DelaySetup(msg.sender, _owner, _avatar, _target);\n }\n\n function setupModules() internal {\n require(\n modules[SENTINEL_MODULES] == address(0),\n \"setUpModules has already been called\"\n );\n modules[SENTINEL_MODULES] = SENTINEL_MODULES;\n }\n\n /// @dev Sets the cooldown before a transaction can be executed.\n /// @param cooldown Cooldown in seconds that should be required before the transaction can be executed\n /// @notice This can only be called by the owner\n function setTxCooldown(uint256 cooldown) public onlyOwner {\n txCooldown = cooldown;\n }\n\n /// @dev Sets the duration for which a transaction is valid.\n /// @param expiration Duration that a transaction is valid in seconds (or 0 if valid forever) after the cooldown\n /// @notice There need to be at least 60 seconds between end of cooldown and expiration\n /// @notice This can only be called by the owner\n function setTxExpiration(uint256 expiration) public onlyOwner {\n require(\n expiration == 0 || expiration >= 60,\n \"Expiratition must be 0 or at least 60 seconds\"\n );\n txExpiration = expiration;\n }\n\n /// @dev Sets transaction nonce. Used to invalidate or skip transactions in queue.\n /// @param _nonce New transaction nonce\n /// @notice This can only be called by the owner\n function setTxNonce(uint256 _nonce) public onlyOwner {\n require(\n _nonce > txNonce,\n \"New nonce must be higher than current txNonce\"\n );\n require(_nonce <= queueNonce, \"Cannot be higher than queueNonce\");\n txNonce = _nonce;\n }\n\n /// @dev Adds a transaction to the queue (same as avatar interface so that this can be placed between other modules and the avatar).\n /// @param to Destination address of module transaction\n /// @param value Ether value of module transaction\n /// @param data Data payload of module transaction\n /// @param operation Operation type of module transaction\n /// @notice Can only be called by enabled modules\n function execTransactionFromModule(\n address to,\n uint256 value,\n bytes calldata data,\n Enum.Operation operation\n ) public override moduleOnly returns (bool success) {\n txHash[queueNonce] = getTransactionHash(to, value, data, operation);\n txCreatedAt[queueNonce] = block.timestamp;\n emit TransactionAdded(\n queueNonce,\n txHash[queueNonce],\n to,\n value,\n data,\n operation\n );\n queueNonce++;\n success = true;\n }\n\n /// @dev Executes the next transaction only if the cooldown has passed and the transaction has not expired\n /// @param to Destination address of module transaction\n /// @param value Ether value of module transaction\n /// @param data Data payload of module transaction\n /// @param operation Operation type of module transaction\n /// @notice The txIndex used by this function is always 0\n function executeNextTx(\n address to,\n uint256 value,\n bytes calldata data,\n Enum.Operation operation\n ) public {\n require(txNonce < queueNonce, \"Transaction queue is empty\");\n require(\n block.timestamp - txCreatedAt[txNonce] >= txCooldown,\n \"Transaction is still in cooldown\"\n );\n if (txExpiration != 0) {\n require(\n txCreatedAt[txNonce] + txCooldown + txExpiration >=\n block.timestamp,\n \"Transaction expired\"\n );\n }\n require(\n txHash[txNonce] == getTransactionHash(to, value, data, operation),\n \"Transaction hashes do not match\"\n );\n txNonce++;\n require(exec(to, value, data, operation), \"Module transaction failed\");\n }\n\n function skipExpired() public {\n while (\n txExpiration != 0 &&\n txCreatedAt[txNonce] + txCooldown + txExpiration <\n block.timestamp &&\n txNonce < queueNonce\n ) {\n txNonce++;\n }\n }\n\n function getTransactionHash(\n address to,\n uint256 value,\n bytes memory data,\n Enum.Operation operation\n ) public pure returns (bytes32) {\n return keccak256(abi.encodePacked(to, value, data, operation));\n }\n\n function getTxHash(uint256 _nonce) public view returns (bytes32) {\n return (txHash[_nonce]);\n }\n\n function getTxCreatedAt(uint256 _nonce) public view returns (uint256) {\n return (txCreatedAt[_nonce]);\n }\n}\n" } - }, - "settings": { - "optimizer": { - "enabled": false, - "runs": 200 - }, - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } } - }, - "contractName": "Delay", - "sourceName": "contracts/Delay.sol", - "compilerVersion": "v0.8.0+commit.c7dfd78e" + } }, "1.0.1": { + "contractName": "Delay", + "sourceName": "contracts/Delay.sol", + "contractVersion": "1.0.1", + "compilerVersion": "v0.8.0+commit.c7dfd78e", + "factory": "0xce0042b868300000d44a59004da54a005ffdcf9f", "address": "0xd54895B1121A2eE3f37b502F507631FA1331BED6", "bytecode": "0x60806040523480156200001157600080fd5b5060405162004f4a38038062004f4a833981810160405281019062000037919062000a30565b600085858585856040516020016200005495949392919062000d57565b604051602081830303815290604052905062000076816200008260201b60201c565b50505050505062000f53565b600080600080600085806020019051810190620000a09190620009ae565b94509450945094509450620000ba6200032a60201b60201c565b600073ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff1614156200012d576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620001249062000e5e565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161415620001a0576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620001979062000dd6565b60405180910390fd5b6000811480620001b15750603c8110155b620001f3576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620001ea9062000e3c565b60405180910390fd5b83606660006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555082606760006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080606a819055508160698190555062000294856200042960201b60201c565b620002a46200053f60201b60201c565b8373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167ffd805e12a6d02f83d7029c03fdfcf3f226ebcd409af51b3095237015eae50300866040516200031a919062000d3a565b60405180910390a4505050505050565b600060019054906101000a900460ff168062000351575060008054906101000a900460ff16155b62000393576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016200038a9062000df8565b60405180910390fd5b60008060019054906101000a900460ff161590508015620003e4576001600060016101000a81548160ff02191690831515021790555060016000806101000a81548160ff0219169083151502179055505b620003f46200069360201b60201c565b620004046200077260201b60201c565b8015620004265760008060016101000a81548160ff0219169083151502179055505b50565b620004396200087160201b60201c565b73ffffffffffffffffffffffffffffffffffffffff166200045f6200087960201b60201c565b73ffffffffffffffffffffffffffffffffffffffff1614620004b8576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620004af9062000e1a565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614156200052b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620005229062000db4565b60405180910390fd5b6200053c81620008a360201b60201c565b50565b600073ffffffffffffffffffffffffffffffffffffffff1660686000600173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161462000611576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620006089062000e80565b60405180910390fd5b600160686000600173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550565b600060019054906101000a900460ff1680620006ba575060008054906101000a900460ff16155b620006fc576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620006f39062000df8565b60405180910390fd5b60008060019054906101000a900460ff1615905080156200074d576001600060016101000a81548160ff02191690831515021790555060016000806101000a81548160ff0219169083151502179055505b80156200076f5760008060016101000a81548160ff0219169083151502179055505b50565b600060019054906101000a900460ff168062000799575060008054906101000a900460ff16155b620007db576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620007d29062000df8565b60405180910390fd5b60008060019054906101000a900460ff1615905080156200082c576001600060016101000a81548160ff02191690831515021790555060016000806101000a81548160ff0219169083151502179055505b6200084c620008406200087160201b60201c565b620008a360201b60201c565b80156200086e5760008060016101000a81548160ff0219169083151502179055505b50565b600033905090565b6000603360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b6000603360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905081603360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508173ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a35050565b6000815190506200097a8162000f05565b92915050565b600081519050620009918162000f1f565b92915050565b600081519050620009a88162000f39565b92915050565b600080600080600060a08688031215620009c757600080fd5b6000620009d78882890162000980565b9550506020620009ea8882890162000980565b9450506040620009fd8882890162000980565b935050606062000a108882890162000997565b925050608062000a238882890162000997565b9150509295509295909350565b600080600080600060a0868803121562000a4957600080fd5b600062000a598882890162000969565b955050602062000a6c8882890162000969565b945050604062000a7f8882890162000969565b935050606062000a928882890162000997565b925050608062000aa58882890162000997565b9150509295509295909350565b62000abd8162000eb3565b82525050565b600062000ad260268362000ea2565b91507f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160008301527f64647265737300000000000000000000000000000000000000000000000000006020830152604082019050919050565b600062000b3a601e8362000ea2565b91507f5461726765742063616e206e6f74206265207a65726f206164647265737300006000830152602082019050919050565b600062000b7c602e8362000ea2565b91507f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160008301527f647920696e697469616c697a65640000000000000000000000000000000000006020830152604082019050919050565b600062000be460208362000ea2565b91507f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726000830152602082019050919050565b600062000c26602d8362000ea2565b91507f457870697261746974696f6e206d7573742062652030206f72206174206c656160008301527f7374203630207365636f6e6473000000000000000000000000000000000000006020830152604082019050919050565b600062000c8e601e8362000ea2565b91507f4176617461722063616e206e6f74206265207a65726f206164647265737300006000830152602082019050919050565b600062000cd060248362000ea2565b91507f73657455704d6f64756c65732068617320616c7265616479206265656e20636160008301527f6c6c6564000000000000000000000000000000000000000000000000000000006020830152604082019050919050565b62000d348162000efb565b82525050565b600060208201905062000d51600083018462000ab2565b92915050565b600060a08201905062000d6e600083018862000ab2565b62000d7d602083018762000ab2565b62000d8c604083018662000ab2565b62000d9b606083018562000d29565b62000daa608083018462000d29565b9695505050505050565b6000602082019050818103600083015262000dcf8162000ac3565b9050919050565b6000602082019050818103600083015262000df18162000b2b565b9050919050565b6000602082019050818103600083015262000e138162000b6d565b9050919050565b6000602082019050818103600083015262000e358162000bd5565b9050919050565b6000602082019050818103600083015262000e578162000c17565b9050919050565b6000602082019050818103600083015262000e798162000c7f565b9050919050565b6000602082019050818103600083015262000e9b8162000cc1565b9050919050565b600082825260208201905092915050565b600062000ec08262000edb565b9050919050565b600062000ed48262000edb565b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b62000f108162000eb3565b811462000f1c57600080fd5b50565b62000f2a8162000ec7565b811462000f3657600080fd5b50565b62000f448162000efb565b811462000f5057600080fd5b50565b613fe78062000f636000396000f3fe608060405234801561001057600080fd5b50600436106101e55760003560e01c80637ceab3b11161010f578063d4b83992116100a2578063e19a9dd911610071578063e19a9dd914610582578063ebb2b4a21461059e578063ee072baf146105ba578063f2fde38b146105d6576101e5565b8063d4b839921461050c578063dcafac091461052a578063de8dd91d14610548578063e009cfde14610566576101e5565b8063b19d4758116100de578063b19d475814610495578063c66323e51461049f578063c9106389146104bd578063cc2f8452146104db576101e5565b80637ceab3b1146104215780638da5cb5b1461043f5780639b56d5be1461045d578063a4f9edbf14610479576101e5565b806346ba230711610187578063610b592511610156578063610b5925146103af5780636b0a4cf6146103cb578063715018a6146103fb578063776d1a0114610405576101e5565b806346ba2307146103265780635229073f146103425780635aef7de614610373578063605df59c14610391576101e5565b8063300c661f116101c3578063300c661f146102665780633aa7690614610296578063427e232f146102c6578063468721a7146102f6576101e5565b8063086cfca8146101ea578063258148cc146102065780632d9ad53d14610236575b600080fd5b61020460048036038101906101ff9190612c4a565b6105f2565b005b610220600480360381019061021b9190612ec7565b610734565b60405161022d9190613b39565b60405180910390f35b610250600480360381019061024b9190612c4a565b61074c565b60405161025d919061382f565b60405180910390f35b610280600480360381019061027b9190612de2565b61081e565b60405161028d919061387a565b60405180910390f35b6102b060048036038101906102ab9190612ec7565b610857565b6040516102bd9190613b39565b60405180910390f35b6102e060048036038101906102db9190612ec7565b610874565b6040516102ed919061387a565b60405180910390f35b610310600480360381019061030b9190612d62565b61088c565b60405161031d919061382f565b60405180910390f35b610340600480360381019061033b9190612ec7565b610a4d565b005b61035c60048036038101906103579190612d62565b610b5c565b60405161036a92919061384a565b60405180910390f35b61037b610d49565b6040516103889190613691565b60405180910390f35b610399610d6f565b6040516103a69190613b39565b60405180910390f35b6103c960048036038101906103c49190612c4a565b610d75565b005b6103e560048036038101906103e09190612ec7565b6110ff565b6040516103f2919061387a565b60405180910390f35b61040361111c565b005b61041f600480360381019061041a9190612c4a565b6111a4565b005b6104296112e6565b6040516104369190613691565b60405180910390f35b61044761130c565b6040516104549190613691565b60405180910390f35b61047760048036038101906104729190612ec7565b611336565b005b610493600480360381019061048e9190612e86565b61140b565b005b61049d61168d565b005b6104a7611702565b6040516104b49190613b39565b60405180910390f35b6104c5611708565b6040516104d29190613691565b60405180910390f35b6104f560048036038101906104f09190612d26565b611732565b6040516105039291906137ff565b60405180910390f35b61051461197f565b6040516105219190613691565b60405180910390f35b6105326119a5565b60405161053f9190613b39565b60405180910390f35b6105506119ab565b60405161055d9190613b39565b60405180910390f35b610580600480360381019061057b9190612cea565b6119b1565b005b61059c60048036038101906105979190612c4a565b611d3a565b005b6105b860048036038101906105b39190612ec7565b611f70565b005b6105d460048036038101906105cf9190612d62565b611ff6565b005b6105f060048036038101906105eb9190612c4a565b612263565b005b6105fa61235b565b73ffffffffffffffffffffffffffffffffffffffff1661061861130c565b73ffffffffffffffffffffffffffffffffffffffff161461066e576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610665906139b9565b60405180910390fd5b6000606660009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905081606660006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508173ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f52ae88b092de36f87fb43fe794eb1381023b9c1bce563a871154022c63dce34260405160405180910390a35050565b606e6020528060005260406000206000915090505481565b60008173ffffffffffffffffffffffffffffffffffffffff16600173ffffffffffffffffffffffffffffffffffffffff16141580156108175750600073ffffffffffffffffffffffffffffffffffffffff16606860008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614155b9050919050565b6000848484846040516020016108379493929190613647565b604051602081830303815290604052805190602001209050949350505050565b6000606e6000838152602001908152602001600020549050919050565b606d6020528060005260406000206000915090505481565b60008073ffffffffffffffffffffffffffffffffffffffff16606860003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141561095c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161095390613a39565b60405180910390fd5b60006109ae878787878080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f820116905080830192505050505050508661081e565b905080606d6000606c5481526020019081526020016000208190555042606e6000606c5481526020019081526020016000208190555080606c547f4c8a9c748e976c17c2eb2c2bc50da76eac9cd90ff529f0fe900e0c10a179f0318989898989604051610a1f9594939291906136ac565b60405180910390a3606c6000815480929190610a3a90613df0565b9190505550600191505095945050505050565b610a5561235b565b73ffffffffffffffffffffffffffffffffffffffff16610a7361130c565b73ffffffffffffffffffffffffffffffffffffffff1614610ac9576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610ac0906139b9565b60405180910390fd5b606b548111610b0d576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610b0490613999565b60405180910390fd5b606c54811115610b52576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610b49906139d9565b60405180910390fd5b80606b8190555050565b60006060600073ffffffffffffffffffffffffffffffffffffffff16606860003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415610c2f576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610c2690613a39565b60405180910390fd5b6000610c81888888888080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f820116905080830192505050505050508761081e565b905080606d6000606c5481526020019081526020016000208190555042606e6000606c5481526020019081526020016000208190555080606c547f4c8a9c748e976c17c2eb2c2bc50da76eac9cd90ff529f0fe900e0c10a179f0318a8a8a8a8a604051610cf29594939291906136ac565b60405180910390a360019250606c548142604051602001610d1593929190613b54565b6040516020818303038152906040529150606c6000815480929190610d3990613df0565b9190505550509550959350505050565b606660009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b606a5481565b610d7d61235b565b73ffffffffffffffffffffffffffffffffffffffff16610d9b61130c565b73ffffffffffffffffffffffffffffffffffffffff1614610df1576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610de8906139b9565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614158015610e5b5750600173ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614155b610e9a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610e9190613af9565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff16606860008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614610f68576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610f5f90613a99565b60405180910390fd5b60686000600173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16606860008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508060686000600173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055507fecdf3a3effea5783a3c4c2140e677577666428d44ed9d474a0b3a4c9943f8440816040516110f49190613691565b60405180910390a150565b6000606d6000838152602001908152602001600020549050919050565b61112461235b565b73ffffffffffffffffffffffffffffffffffffffff1661114261130c565b73ffffffffffffffffffffffffffffffffffffffff1614611198576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161118f906139b9565b60405180910390fd5b6111a26000612363565b565b6111ac61235b565b73ffffffffffffffffffffffffffffffffffffffff166111ca61130c565b73ffffffffffffffffffffffffffffffffffffffff1614611220576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611217906139b9565b60405180910390fd5b6000606760009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905081606760006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508173ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f90cc2f570a6eb594b1580ea3e41247d2d73a55281889e86bd4ec2fc29c7e62d660405160405180910390a35050565b606560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000603360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b61133e61235b565b73ffffffffffffffffffffffffffffffffffffffff1661135c61130c565b73ffffffffffffffffffffffffffffffffffffffff16146113b2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016113a9906139b9565b60405180910390fd5b60008114806113c25750603c8110155b611401576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016113f8906139f9565b60405180910390fd5b80606a8190555050565b6000806000806000858060200190518101906114279190612c73565b94509450945094509450611439612429565b600073ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff1614156114a9576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016114a090613a19565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161415611519576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161151090613959565b60405180910390fd5b60008114806115295750603c8110155b611568576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161155f906139f9565b60405180910390fd5b83606660006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555082606760006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080606a819055508160698190555061160185612263565b611609612512565b8373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167ffd805e12a6d02f83d7029c03fdfcf3f226ebcd409af51b3095237015eae503008660405161167d9190613691565b60405180910390a4505050505050565b5b6000606a54141580156116cf575042606a54606954606e6000606b548152602001908152602001600020546116c39190613c5d565b6116cd9190613c5d565b105b80156116de5750606c54606b54105b1561170057606b60008154809291906116f690613df0565b919050555061168e565b565b606b5481565b6000606560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b606060008267ffffffffffffffff811115611776577f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040519080825280602002602001820160405280156117a45781602001602082028036833780820191505090505b509150600080606860008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690505b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16141580156118775750600173ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614155b801561188257508482105b1561197057808483815181106118c1577f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050606860008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050818061196890613df0565b92505061180d565b80925081845250509250929050565b606760009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60695481565b606c5481565b6119b961235b565b73ffffffffffffffffffffffffffffffffffffffff166119d761130c565b73ffffffffffffffffffffffffffffffffffffffff1614611a2d576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611a24906139b9565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614158015611a975750600173ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614155b611ad6576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611acd90613af9565b60405180910390fd5b8073ffffffffffffffffffffffffffffffffffffffff16606860008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614611ba3576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611b9a906138d9565b60405180910390fd5b606860008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16606860008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000606860008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055507faab4fa2b463f581b2b32cb3b7e3b704b9ce37cc209b5fb4d77e593ace405427681604051611d2e9190613691565b60405180910390a15050565b611d4261235b565b73ffffffffffffffffffffffffffffffffffffffff16611d6061130c565b73ffffffffffffffffffffffffffffffffffffffff1614611db6576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611dad906139b9565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614611ed3578073ffffffffffffffffffffffffffffffffffffffff166301ffc9a77fe6d7a83a000000000000000000000000000000000000000000000000000000006040518263ffffffff1660e01b8152600401611e4391906138be565b60206040518083038186803b158015611e5b57600080fd5b505afa158015611e6f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e939190612e5d565b611ed2576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611ec990613a59565b60405180910390fd5b5b80606560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055507f1151116914515bc0891ff9047a6cb32cf902546f83066499bcf8ba33d2353fa2606560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16604051611f659190613691565b60405180910390a150565b611f7861235b565b73ffffffffffffffffffffffffffffffffffffffff16611f9661130c565b73ffffffffffffffffffffffffffffffffffffffff1614611fec576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611fe3906139b9565b60405180910390fd5b8060698190555050565b606c54606b541061203c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161203390613ad9565b60405180910390fd5b6000606e6000606b54815260200190815260200160002054905060695481426120659190613cb3565b10156120a6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161209d90613a79565b60405180910390fd5b6000606a541461210e5742606a54606954836120c29190613c5d565b6120cc9190613c5d565b101561210d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161210490613919565b60405180910390fd5b5b61215e868686868080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f820116905080830192505050505050508561081e565b606d6000606b54815260200190815260200160002054146121b4576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016121ab90613939565b60405180910390fd5b606b60008154809291906121c790613df0565b919050555061221c868686868080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f8201169050808301925050505050505085612663565b61225b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161225290613b19565b60405180910390fd5b505050505050565b61226b61235b565b73ffffffffffffffffffffffffffffffffffffffff1661228961130c565b73ffffffffffffffffffffffffffffffffffffffff16146122df576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016122d6906139b9565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff16141561234f576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401612346906138f9565b60405180910390fd5b61235881612363565b50565b600033905090565b6000603360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905081603360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508173ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a35050565b600060019054906101000a900460ff168061244f575060008054906101000a900460ff16155b61248e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161248590613979565b60405180910390fd5b60008060019054906101000a900460ff1615905080156124de576001600060016101000a81548160ff02191690831515021790555060016000806101000a81548160ff0219169083151502179055505b6124e6612958565b6124ee612a31565b801561250f5760008060016101000a81548160ff0219169083151502179055505b50565b600073ffffffffffffffffffffffffffffffffffffffff1660686000600173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16146125e1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016125d890613ab9565b60405180910390fd5b600160686000600173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550565b60008073ffffffffffffffffffffffffffffffffffffffff16606560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161461279557606560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166375f0bb528686868660008060008060006040518060400160405280600281526020017f307800000000000000000000000000000000000000000000000000000000000081525060006040518c63ffffffff1660e01b81526004016127629b9a99989796959493929190613746565b600060405180830381600087803b15801561277c57600080fd5b505af1158015612790573d6000803e3d6000fd5b505050505b606760009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663468721a7868686866040518563ffffffff1660e01b81526004016127f694939291906136fa565b602060405180830381600087803b15801561281057600080fd5b505af1158015612824573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906128489190612e5d565b9050600073ffffffffffffffffffffffffffffffffffffffff16606560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161461295057606560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663932713687f3078000000000000000000000000000000000000000000000000000000000000836040518363ffffffff1660e01b815260040161291d929190613895565b600060405180830381600087803b15801561293757600080fd5b505af115801561294b573d6000803e3d6000fd5b505050505b949350505050565b600060019054906101000a900460ff168061297e575060008054906101000a900460ff16155b6129bd576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016129b490613979565b60405180910390fd5b60008060019054906101000a900460ff161590508015612a0d576001600060016101000a81548160ff02191690831515021790555060016000806101000a81548160ff0219169083151502179055505b8015612a2e5760008060016101000a81548160ff0219169083151502179055505b50565b600060019054906101000a900460ff1680612a57575060008054906101000a900460ff16155b612a96576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401612a8d90613979565b60405180910390fd5b60008060019054906101000a900460ff161590508015612ae6576001600060016101000a81548160ff02191690831515021790555060016000806101000a81548160ff0219169083151502179055505b612af6612af161235b565b612363565b8015612b175760008060016101000a81548160ff0219169083151502179055505b50565b6000612b2d612b2884613bbc565b613b8b565b905082815260208101848484011115612b4557600080fd5b612b50848285613dae565b509392505050565b600081359050612b6781613f45565b92915050565b600081519050612b7c81613f5c565b92915050565b600081519050612b9181613f73565b92915050565b60008083601f840112612ba957600080fd5b8235905067ffffffffffffffff811115612bc257600080fd5b602083019150836001820283011115612bda57600080fd5b9250929050565b600082601f830112612bf257600080fd5b8135612c02848260208601612b1a565b91505092915050565b600081359050612c1a81613f8a565b92915050565b600081359050612c2f81613f9a565b92915050565b600081519050612c4481613f9a565b92915050565b600060208284031215612c5c57600080fd5b6000612c6a84828501612b58565b91505092915050565b600080600080600060a08688031215612c8b57600080fd5b6000612c9988828901612b6d565b9550506020612caa88828901612b6d565b9450506040612cbb88828901612b6d565b9350506060612ccc88828901612c35565b9250506080612cdd88828901612c35565b9150509295509295909350565b60008060408385031215612cfd57600080fd5b6000612d0b85828601612b58565b9250506020612d1c85828601612b58565b9150509250929050565b60008060408385031215612d3957600080fd5b6000612d4785828601612b58565b9250506020612d5885828601612c20565b9150509250929050565b600080600080600060808688031215612d7a57600080fd5b6000612d8888828901612b58565b9550506020612d9988828901612c20565b945050604086013567ffffffffffffffff811115612db657600080fd5b612dc288828901612b97565b93509350506060612dd588828901612c0b565b9150509295509295909350565b60008060008060808587031215612df857600080fd5b6000612e0687828801612b58565b9450506020612e1787828801612c20565b935050604085013567ffffffffffffffff811115612e3457600080fd5b612e4087828801612be1565b9250506060612e5187828801612c0b565b91505092959194509250565b600060208284031215612e6f57600080fd5b6000612e7d84828501612b82565b91505092915050565b600060208284031215612e9857600080fd5b600082013567ffffffffffffffff811115612eb257600080fd5b612ebe84828501612be1565b91505092915050565b600060208284031215612ed957600080fd5b6000612ee784828501612c20565b91505092915050565b6000612efc8383612f17565b60208301905092915050565b612f1181613cf9565b82525050565b612f2081613ce7565b82525050565b612f2f81613ce7565b82525050565b612f46612f4182613ce7565b613e39565b82525050565b6000612f5782613bfc565b612f618185613c1f565b9350612f6c83613bec565b8060005b83811015612f9d578151612f848882612ef0565b9750612f8f83613c12565b925050600181019050612f70565b5085935050505092915050565b612fb381613d0b565b82525050565b612fc281613d17565b82525050565b612fd181613d21565b82525050565b6000612fe38385613c30565b9350612ff0838584613dae565b612ff983613f06565b840190509392505050565b600061300f82613c07565b6130198185613c30565b9350613029818560208601613dbd565b61303281613f06565b840191505092915050565b600061304882613c07565b6130528185613c41565b9350613062818560208601613dbd565b80840191505092915050565b61307781613d8a565b82525050565b61308e61308982613d8a565b613e67565b82525050565b61309d81613d9c565b82525050565b60006130b0601783613c4c565b91507f4d6f64756c6520616c72656164792064697361626c65640000000000000000006000830152602082019050919050565b60006130f0602683613c4c565b91507f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160008301527f64647265737300000000000000000000000000000000000000000000000000006020830152604082019050919050565b6000613156601383613c4c565b91507f5472616e73616374696f6e2065787069726564000000000000000000000000006000830152602082019050919050565b6000613196601f83613c4c565b91507f5472616e73616374696f6e2068617368657320646f206e6f74206d61746368006000830152602082019050919050565b60006131d6601e83613c4c565b91507f5461726765742063616e206e6f74206265207a65726f206164647265737300006000830152602082019050919050565b6000613216602e83613c4c565b91507f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160008301527f647920696e697469616c697a65640000000000000000000000000000000000006020830152604082019050919050565b600061327c602d83613c4c565b91507f4e6577206e6f6e6365206d75737420626520686967686572207468616e20637560008301527f7272656e742074784e6f6e6365000000000000000000000000000000000000006020830152604082019050919050565b60006132e2602083613c4c565b91507f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726000830152602082019050919050565b6000613322602083613c4c565b91507f43616e6e6f7420626520686967686572207468616e2071756575654e6f6e63656000830152602082019050919050565b6000613362602d83613c4c565b91507f457870697261746974696f6e206d7573742062652030206f72206174206c656160008301527f7374203630207365636f6e6473000000000000000000000000000000000000006020830152604082019050919050565b60006133c8601e83613c4c565b91507f4176617461722063616e206e6f74206265207a65726f206164647265737300006000830152602082019050919050565b6000613408601583613c4c565b91507f4d6f64756c65206e6f7420617574686f72697a656400000000000000000000006000830152602082019050919050565b6000613448602083613c4c565b91507f477561726420646f6573206e6f7420696d706c656d656e7420494552433136356000830152602082019050919050565b6000613488602083613c4c565b91507f5472616e73616374696f6e206973207374696c6c20696e20636f6f6c646f776e6000830152602082019050919050565b60006134c8601683613c4c565b91507f4d6f64756c6520616c726561647920656e61626c6564000000000000000000006000830152602082019050919050565b6000613508602483613c4c565b91507f73657455704d6f64756c65732068617320616c7265616479206265656e20636160008301527f6c6c6564000000000000000000000000000000000000000000000000000000006020830152604082019050919050565b600061356e601a83613c4c565b91507f5472616e73616374696f6e20717565756520697320656d7074790000000000006000830152602082019050919050565b60006135ae600e83613c4c565b91507f496e76616c6964206d6f64756c650000000000000000000000000000000000006000830152602082019050919050565b60006135ee601983613c4c565b91507f4d6f64756c65207472616e73616374696f6e206661696c6564000000000000006000830152602082019050919050565b61362a81613d80565b82525050565b61364161363c82613d80565b613e5d565b82525050565b60006136538287612f35565b6014820191506136638286613630565b602082019150613673828561303d565b915061367f828461307d565b60018201915081905095945050505050565b60006020820190506136a66000830184612f26565b92915050565b60006080820190506136c16000830188612f26565b6136ce6020830187613621565b81810360408301526136e1818587612fd7565b90506136f0606083018461306e565b9695505050505050565b600060808201905061370f6000830187612f26565b61371c6020830186613621565b818103604083015261372e8185613004565b905061373d606083018461306e565b95945050505050565b60006101608201905061375c600083018e612f26565b613769602083018d613621565b818103604083015261377b818c613004565b905061378a606083018b61306e565b613797608083018a613094565b6137a460a0830189613094565b6137b160c0830188613094565b6137be60e0830187612f26565b6137cc610100830186612f08565b8181036101208301526137df8185613004565b90506137ef610140830184612f26565b9c9b505050505050505050505050565b600060408201905081810360008301526138198185612f4c565b90506138286020830184612f26565b9392505050565b60006020820190506138446000830184612faa565b92915050565b600060408201905061385f6000830185612faa565b81810360208301526138718184613004565b90509392505050565b600060208201905061388f6000830184612fb9565b92915050565b60006040820190506138aa6000830185612fb9565b6138b76020830184612faa565b9392505050565b60006020820190506138d36000830184612fc8565b92915050565b600060208201905081810360008301526138f2816130a3565b9050919050565b60006020820190508181036000830152613912816130e3565b9050919050565b6000602082019050818103600083015261393281613149565b9050919050565b6000602082019050818103600083015261395281613189565b9050919050565b60006020820190508181036000830152613972816131c9565b9050919050565b6000602082019050818103600083015261399281613209565b9050919050565b600060208201905081810360008301526139b28161326f565b9050919050565b600060208201905081810360008301526139d2816132d5565b9050919050565b600060208201905081810360008301526139f281613315565b9050919050565b60006020820190508181036000830152613a1281613355565b9050919050565b60006020820190508181036000830152613a32816133bb565b9050919050565b60006020820190508181036000830152613a52816133fb565b9050919050565b60006020820190508181036000830152613a728161343b565b9050919050565b60006020820190508181036000830152613a928161347b565b9050919050565b60006020820190508181036000830152613ab2816134bb565b9050919050565b60006020820190508181036000830152613ad2816134fb565b9050919050565b60006020820190508181036000830152613af281613561565b9050919050565b60006020820190508181036000830152613b12816135a1565b9050919050565b60006020820190508181036000830152613b32816135e1565b9050919050565b6000602082019050613b4e6000830184613621565b92915050565b6000606082019050613b696000830186613621565b613b766020830185612fb9565b613b836040830184613621565b949350505050565b6000604051905081810181811067ffffffffffffffff82111715613bb257613bb1613ed7565b5b8060405250919050565b600067ffffffffffffffff821115613bd757613bd6613ed7565b5b601f19601f8301169050602081019050919050565b6000819050602082019050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b600082825260208201905092915050565b600082825260208201905092915050565b600081905092915050565b600082825260208201905092915050565b6000613c6882613d80565b9150613c7383613d80565b9250827fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff03821115613ca857613ca7613e79565b5b828201905092915050565b6000613cbe82613d80565b9150613cc983613d80565b925082821015613cdc57613cdb613e79565b5b828203905092915050565b6000613cf282613d60565b9050919050565b6000613d0482613d60565b9050919050565b60008115159050919050565b6000819050919050565b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b6000819050613d5b82613f31565b919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b6000613d9582613d4d565b9050919050565b6000613da782613d80565b9050919050565b82818337600083830152505050565b60005b83811015613ddb578082015181840152602081019050613dc0565b83811115613dea576000848401525b50505050565b6000613dfb82613d80565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff821415613e2e57613e2d613e79565b5b600182019050919050565b6000613e4482613e4b565b9050919050565b6000613e5682613f24565b9050919050565b6000819050919050565b6000613e7282613f17565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6000601f19601f8301169050919050565b60008160f81b9050919050565b60008160601b9050919050565b60028110613f4257613f41613ea8565b5b50565b613f4e81613ce7565b8114613f5957600080fd5b50565b613f6581613cf9565b8114613f7057600080fd5b50565b613f7c81613d0b565b8114613f8757600080fd5b50565b60028110613f9757600080fd5b50565b613fa381613d80565b8114613fae57600080fd5b5056fea26469706673582212208b3a304c932203e860004264f50bdb0a6590ff171440793f5990e271f0f91f9c64736f6c63430008000033", "constructorArgs": { @@ -831,8 +840,8 @@ "0x0000000000000000000000000000000000000001", "0x0000000000000000000000000000000000000001", "0x0000000000000000000000000000000000000001", - 0, - 0 + "0x0000000000000000000000000000000000000000", + "0x0000000000000000000000000000000000000000" ] }, "salt": "0x0000000000000000000000000000000000000000000000000000000000000000", @@ -1567,44 +1576,44 @@ "compilerInput": { "language": "Solidity", "sources": { - "@gnosis.pm/safe-contracts/contracts/common/Enum.sol": { - "content": "// SPDX-License-Identifier: LGPL-3.0-only\npragma solidity >=0.7.0 <0.9.0;\n\n/// @title Enum - Collection of enums\n/// @author Richard Meissner - \ncontract Enum {\n enum Operation {Call, DelegateCall}\n}\n" - }, - "@gnosis.pm/safe-contracts/contracts/interfaces/IERC165.sol": { - "content": "// SPDX-License-Identifier: LGPL-3.0-only\npragma solidity >=0.7.0 <0.9.0;\n\n/// @notice More details at https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/introspection/IERC165.sol\ninterface IERC165 {\n /**\n * @dev Returns true if this contract implements the interface defined by\n * `interfaceId`. See the corresponding\n * https://eips.ethereum.org/EIPS/eip-165#how-interfaces-are-identified[EIP section]\n * to learn more about how these ids are created.\n *\n * This function call must use less than 30 000 gas.\n */\n function supportsInterface(bytes4 interfaceId) external view returns (bool);\n}\n" + "contracts/Delay.sol": { + "content": "// SPDX-License-Identifier: LGPL-3.0-only\npragma solidity >=0.8.0;\n\nimport \"@gnosis.pm/zodiac/contracts/core/Modifier.sol\";\n\ncontract Delay is Modifier {\n event DelaySetup(\n address indexed initiator,\n address indexed owner,\n address indexed avatar,\n address target\n );\n event TransactionAdded(\n uint256 indexed queueNonce,\n bytes32 indexed txHash,\n address to,\n uint256 value,\n bytes data,\n Enum.Operation operation\n );\n\n uint256 public txCooldown;\n uint256 public txExpiration;\n uint256 public txNonce;\n uint256 public queueNonce;\n // Mapping of queue nonce to transaction hash.\n mapping(uint256 => bytes32) public txHash;\n // Mapping of queue nonce to creation timestamp.\n mapping(uint256 => uint256) public txCreatedAt;\n\n /// @param _owner Address of the owner\n /// @param _avatar Address of the avatar (e.g. a Gnosis Safe)\n /// @param _target Address of the contract that will call exec function\n /// @param _cooldown Cooldown in seconds that should be required after a transaction is proposed\n /// @param _expiration Duration that a proposed transaction is valid for after the cooldown, in seconds (or 0 if valid forever)\n /// @notice There need to be at least 60 seconds between end of cooldown and expiration\n constructor(\n address _owner,\n address _avatar,\n address _target,\n uint256 _cooldown,\n uint256 _expiration\n ) {\n bytes memory initParams = abi.encode(\n _owner,\n _avatar,\n _target,\n _cooldown,\n _expiration\n );\n setUp(initParams);\n }\n\n function setUp(bytes memory initParams) public override {\n (\n address _owner,\n address _avatar,\n address _target,\n uint256 _cooldown,\n uint256 _expiration\n ) = abi.decode(\n initParams,\n (address, address, address, uint256, uint256)\n );\n __Ownable_init();\n require(_avatar != address(0), \"Avatar can not be zero address\");\n require(_target != address(0), \"Target can not be zero address\");\n require(\n _expiration == 0 || _expiration >= 60,\n \"Expiratition must be 0 or at least 60 seconds\"\n );\n\n avatar = _avatar;\n target = _target;\n txExpiration = _expiration;\n txCooldown = _cooldown;\n\n transferOwnership(_owner);\n setupModules();\n\n emit DelaySetup(msg.sender, _owner, _avatar, _target);\n }\n\n function setupModules() internal {\n require(\n modules[SENTINEL_MODULES] == address(0),\n \"setUpModules has already been called\"\n );\n modules[SENTINEL_MODULES] = SENTINEL_MODULES;\n }\n\n /// @dev Sets the cooldown before a transaction can be executed.\n /// @param cooldown Cooldown in seconds that should be required before the transaction can be executed\n /// @notice This can only be called by the owner\n function setTxCooldown(uint256 cooldown) public onlyOwner {\n txCooldown = cooldown;\n }\n\n /// @dev Sets the duration for which a transaction is valid.\n /// @param expiration Duration that a transaction is valid in seconds (or 0 if valid forever) after the cooldown\n /// @notice There need to be at least 60 seconds between end of cooldown and expiration\n /// @notice This can only be called by the owner\n function setTxExpiration(uint256 expiration) public onlyOwner {\n require(\n expiration == 0 || expiration >= 60,\n \"Expiratition must be 0 or at least 60 seconds\"\n );\n txExpiration = expiration;\n }\n\n /// @dev Sets transaction nonce. Used to invalidate or skip transactions in queue.\n /// @param _nonce New transaction nonce\n /// @notice This can only be called by the owner\n function setTxNonce(uint256 _nonce) public onlyOwner {\n require(\n _nonce > txNonce,\n \"New nonce must be higher than current txNonce\"\n );\n require(_nonce <= queueNonce, \"Cannot be higher than queueNonce\");\n txNonce = _nonce;\n }\n\n /// @dev Adds a transaction to the queue (same as avatar interface so that this can be placed between other modules and the avatar).\n /// @param to Destination address of module transaction\n /// @param value Ether value of module transaction\n /// @param data Data payload of module transaction\n /// @param operation Operation type of module transaction\n /// @return success Whether or not the call was successfully queued for execution\n /// @notice Can only be called by enabled modules\n function execTransactionFromModule(\n address to,\n uint256 value,\n bytes calldata data,\n Enum.Operation operation\n ) public override moduleOnly returns (bool success) {\n bytes32 hash = getTransactionHash(to, value, data, operation);\n txHash[queueNonce] = hash;\n txCreatedAt[queueNonce] = block.timestamp;\n emit TransactionAdded(queueNonce, hash, to, value, data, operation);\n queueNonce++;\n success = true;\n }\n\n /// @dev Adds a transaction to the queue (same as avatar interface so that this can be placed between other modules and the avatar).\n /// @param to Destination address of module transaction\n /// @param value Ether value of module transaction\n /// @param data Data payload of module transaction\n /// @param operation Operation type of module transaction\n /// @return success Whether or not the call was successfully queued for execution\n /// @return returnData ABI encoded queue nonce (uint256), transaction hash (bytes32), and block.timestamp (uint256)\n /// @notice Can only be called by enabled modules\n function execTransactionFromModuleReturnData(\n address to,\n uint256 value,\n bytes calldata data,\n Enum.Operation operation\n )\n public\n override\n moduleOnly\n returns (bool success, bytes memory returnData)\n {\n bytes32 hash = getTransactionHash(to, value, data, operation);\n txHash[queueNonce] = hash;\n txCreatedAt[queueNonce] = block.timestamp;\n emit TransactionAdded(queueNonce, hash, to, value, data, operation);\n success = true;\n returnData = abi.encode(queueNonce, hash, block.timestamp);\n queueNonce++;\n }\n\n /// @dev Executes the next transaction only if the cooldown has passed and the transaction has not expired\n /// @param to Destination address of module transaction\n /// @param value Ether value of module transaction\n /// @param data Data payload of module transaction\n /// @param operation Operation type of module transaction\n /// @notice The txIndex used by this function is always 0\n function executeNextTx(\n address to,\n uint256 value,\n bytes calldata data,\n Enum.Operation operation\n ) public {\n require(txNonce < queueNonce, \"Transaction queue is empty\");\n uint256 txCreationTimestamp = txCreatedAt[txNonce];\n require(\n block.timestamp - txCreationTimestamp >= txCooldown,\n \"Transaction is still in cooldown\"\n );\n if (txExpiration != 0) {\n require(\n txCreationTimestamp + txCooldown + txExpiration >=\n block.timestamp,\n \"Transaction expired\"\n );\n }\n require(\n txHash[txNonce] == getTransactionHash(to, value, data, operation),\n \"Transaction hashes do not match\"\n );\n txNonce++;\n require(exec(to, value, data, operation), \"Module transaction failed\");\n }\n\n function skipExpired() public {\n while (\n txExpiration != 0 &&\n txCreatedAt[txNonce] + txCooldown + txExpiration <\n block.timestamp &&\n txNonce < queueNonce\n ) {\n txNonce++;\n }\n }\n\n function getTransactionHash(\n address to,\n uint256 value,\n bytes memory data,\n Enum.Operation operation\n ) public pure returns (bytes32) {\n return keccak256(abi.encodePacked(to, value, data, operation));\n }\n\n function getTxHash(uint256 _nonce) public view returns (bytes32) {\n return (txHash[_nonce]);\n }\n\n function getTxCreatedAt(uint256 _nonce) public view returns (uint256) {\n return (txCreatedAt[_nonce]);\n }\n}\n" }, "@gnosis.pm/zodiac/contracts/core/Modifier.sol": { "content": "// SPDX-License-Identifier: LGPL-3.0-only\n\n/// @title Modifier Interface - A contract that sits between a Aodule and an Avatar and enforce some additional logic.\npragma solidity >=0.7.0 <0.9.0;\n\nimport \"../interfaces/IAvatar.sol\";\nimport \"./Module.sol\";\n\nabstract contract Modifier is Module {\n event EnabledModule(address module);\n event DisabledModule(address module);\n\n address internal constant SENTINEL_MODULES = address(0x1);\n\n // Mapping of modules\n mapping(address => address) internal modules;\n\n /*\n --------------------------------------------------\n You must override at least one of following two virtual functions,\n execTransactionFromModule() and execTransactionFromModuleReturnData().\n */\n\n /// @dev Passes a transaction to the modifier.\n /// @param to Destination address of module transaction\n /// @param value Ether value of module transaction\n /// @param data Data payload of module transaction\n /// @param operation Operation type of module transaction\n /// @notice Can only be called by enabled modules\n function execTransactionFromModule(\n address to,\n uint256 value,\n bytes calldata data,\n Enum.Operation operation\n ) public virtual moduleOnly returns (bool success) {}\n\n /// @dev Passes a transaction to the modifier, expects return data.\n /// @param to Destination address of module transaction\n /// @param value Ether value of module transaction\n /// @param data Data payload of module transaction\n /// @param operation Operation type of module transaction\n /// @notice Can only be called by enabled modules\n function execTransactionFromModuleReturnData(\n address to,\n uint256 value,\n bytes calldata data,\n Enum.Operation operation\n )\n public\n virtual\n moduleOnly\n returns (bool success, bytes memory returnData)\n {}\n\n /*\n --------------------------------------------------\n */\n\n modifier moduleOnly() {\n require(modules[msg.sender] != address(0), \"Module not authorized\");\n _;\n }\n\n /// @dev Disables a module on the modifier\n /// @param prevModule Module that pointed to the module to be removed in the linked list\n /// @param module Module to be removed\n /// @notice This can only be called by the owner\n function disableModule(address prevModule, address module)\n public\n onlyOwner\n {\n require(\n module != address(0) && module != SENTINEL_MODULES,\n \"Invalid module\"\n );\n require(modules[prevModule] == module, \"Module already disabled\");\n modules[prevModule] = modules[module];\n modules[module] = address(0);\n emit DisabledModule(module);\n }\n\n /// @dev Enables a module that can add transactions to the queue\n /// @param module Address of the module to be enabled\n /// @notice This can only be called by the owner\n function enableModule(address module) public onlyOwner {\n require(\n module != address(0) && module != SENTINEL_MODULES,\n \"Invalid module\"\n );\n require(modules[module] == address(0), \"Module already enabled\");\n modules[module] = modules[SENTINEL_MODULES];\n modules[SENTINEL_MODULES] = module;\n emit EnabledModule(module);\n }\n\n /// @dev Returns if an module is enabled\n /// @return True if the module is enabled\n function isModuleEnabled(address _module) public view returns (bool) {\n return SENTINEL_MODULES != _module && modules[_module] != address(0);\n }\n\n /// @dev Returns array of modules.\n /// @param start Start of the page.\n /// @param pageSize Maximum number of modules that should be returned.\n /// @return array Array of modules.\n /// @return next Start of the next page.\n function getModulesPaginated(address start, uint256 pageSize)\n external\n view\n returns (address[] memory array, address next)\n {\n // Init array with max page size\n array = new address[](pageSize);\n\n // Populate return array\n uint256 moduleCount = 0;\n address currentModule = modules[start];\n while (\n currentModule != address(0x0) &&\n currentModule != SENTINEL_MODULES &&\n moduleCount < pageSize\n ) {\n array[moduleCount] = currentModule;\n currentModule = modules[currentModule];\n moduleCount++;\n }\n next = currentModule;\n // Set correct size of returned array\n // solhint-disable-next-line no-inline-assembly\n assembly {\n mstore(array, moduleCount)\n }\n }\n}\n" }, + "@gnosis.pm/zodiac/contracts/interfaces/IAvatar.sol": { + "content": "// SPDX-License-Identifier: LGPL-3.0-only\n\n/// @title Zodiac Avatar - A contract that manages modules that can execute transactions via this contract.\npragma solidity >=0.7.0 <0.9.0;\n\nimport \"@gnosis.pm/safe-contracts/contracts/common/Enum.sol\";\n\ninterface IAvatar {\n /// @dev Enables a module on the avatar.\n /// @notice Can only be called by the avatar.\n /// @notice Modules should be stored as a linked list.\n /// @notice Must emit EnabledModule(address module) if successful.\n /// @param module Module to be enabled.\n function enableModule(address module) external;\n\n /// @dev Disables a module on the avatar.\n /// @notice Can only be called by the avatar.\n /// @notice Must emit DisabledModule(address module) if successful.\n /// @param prevModule Address that pointed to the module to be removed in the linked list\n /// @param module Module to be removed.\n function disableModule(address prevModule, address module) external;\n\n /// @dev Allows a Module to execute a transaction.\n /// @notice Can only be called by an enabled module.\n /// @notice Must emit ExecutionFromModuleSuccess(address module) if successful.\n /// @notice Must emit ExecutionFromModuleFailure(address module) if unsuccessful.\n /// @param to Destination address of module transaction.\n /// @param value Ether value of module transaction.\n /// @param data Data payload of module transaction.\n /// @param operation Operation type of module transaction: 0 == call, 1 == delegate call.\n function execTransactionFromModule(\n address to,\n uint256 value,\n bytes memory data,\n Enum.Operation operation\n ) external returns (bool success);\n\n /// @dev Allows a Module to execute a transaction and return data\n /// @notice Can only be called by an enabled module.\n /// @notice Must emit ExecutionFromModuleSuccess(address module) if successful.\n /// @notice Must emit ExecutionFromModuleFailure(address module) if unsuccessful.\n /// @param to Destination address of module transaction.\n /// @param value Ether value of module transaction.\n /// @param data Data payload of module transaction.\n /// @param operation Operation type of module transaction: 0 == call, 1 == delegate call.\n function execTransactionFromModuleReturnData(\n address to,\n uint256 value,\n bytes memory data,\n Enum.Operation operation\n ) external returns (bool success, bytes memory returnData);\n\n /// @dev Returns if an module is enabled\n /// @return True if the module is enabled\n function isModuleEnabled(address module) external view returns (bool);\n\n /// @dev Returns array of modules.\n /// @param start Start of the page.\n /// @param pageSize Maximum number of modules that should be returned.\n /// @return array Array of modules.\n /// @return next Start of the next page.\n function getModulesPaginated(address start, uint256 pageSize)\n external\n view\n returns (address[] memory array, address next);\n}\n" + }, "@gnosis.pm/zodiac/contracts/core/Module.sol": { "content": "// SPDX-License-Identifier: LGPL-3.0-only\n\n/// @title Module Interface - A contract that can pass messages to a Module Manager contract if enabled by that contract.\npragma solidity >=0.7.0 <0.9.0;\n\nimport \"../interfaces/IAvatar.sol\";\nimport \"../factory/FactoryFriendly.sol\";\nimport \"../guard/Guardable.sol\";\n\nabstract contract Module is FactoryFriendly, Guardable {\n /// @dev Emitted each time the avatar is set.\n event AvatarSet(address indexed previousAvatar, address indexed newAvatar);\n /// @dev Emitted each time the Target is set.\n event TargetSet(address indexed previousTarget, address indexed newTarget);\n\n /// @dev Address that will ultimately execute function calls.\n address public avatar;\n /// @dev Address that this module will pass transactions to.\n address public target;\n\n /// @dev Sets the avatar to a new avatar (`newAvatar`).\n /// @notice Can only be called by the current owner.\n function setAvatar(address _avatar) public onlyOwner {\n address previousAvatar = avatar;\n avatar = _avatar;\n emit AvatarSet(previousAvatar, _avatar);\n }\n\n /// @dev Sets the target to a new target (`newTarget`).\n /// @notice Can only be called by the current owner.\n function setTarget(address _target) public onlyOwner {\n address previousTarget = target;\n target = _target;\n emit TargetSet(previousTarget, _target);\n }\n\n /// @dev Passes a transaction to be executed by the avatar.\n /// @notice Can only be called by this contract.\n /// @param to Destination address of module transaction.\n /// @param value Ether value of module transaction.\n /// @param data Data payload of module transaction.\n /// @param operation Operation type of module transaction: 0 == call, 1 == delegate call.\n function exec(\n address to,\n uint256 value,\n bytes memory data,\n Enum.Operation operation\n ) internal returns (bool success) {\n /// check if a transactioon guard is enabled.\n if (guard != address(0)) {\n IGuard(guard).checkTransaction(\n /// Transaction info used by module transactions\n to,\n value,\n data,\n operation,\n /// Zero out the redundant transaction information only used for Safe multisig transctions\n 0,\n 0,\n 0,\n address(0),\n payable(0),\n bytes(\"0x\"),\n address(0)\n );\n }\n success = IAvatar(target).execTransactionFromModule(\n to,\n value,\n data,\n operation\n );\n if (guard != address(0)) {\n IGuard(guard).checkAfterExecution(bytes32(\"0x\"), success);\n }\n return success;\n }\n\n /// @dev Passes a transaction to be executed by the target and returns data.\n /// @notice Can only be called by this contract.\n /// @param to Destination address of module transaction.\n /// @param value Ether value of module transaction.\n /// @param data Data payload of module transaction.\n /// @param operation Operation type of module transaction: 0 == call, 1 == delegate call.\n function execAndReturnData(\n address to,\n uint256 value,\n bytes memory data,\n Enum.Operation operation\n ) internal returns (bool success, bytes memory returnData) {\n /// check if a transactioon guard is enabled.\n if (guard != address(0)) {\n IGuard(guard).checkTransaction(\n /// Transaction info used by module transactions\n to,\n value,\n data,\n operation,\n /// Zero out the redundant transaction information only used for Safe multisig transctions\n 0,\n 0,\n 0,\n address(0),\n payable(0),\n bytes(\"0x\"),\n address(0)\n );\n }\n (success, returnData) = IAvatar(target)\n .execTransactionFromModuleReturnData(to, value, data, operation);\n if (guard != address(0)) {\n IGuard(guard).checkAfterExecution(bytes32(\"0x\"), success);\n }\n return (success, returnData);\n }\n}\n" }, + "@gnosis.pm/safe-contracts/contracts/common/Enum.sol": { + "content": "// SPDX-License-Identifier: LGPL-3.0-only\npragma solidity >=0.7.0 <0.9.0;\n\n/// @title Enum - Collection of enums\n/// @author Richard Meissner - \ncontract Enum {\n enum Operation {Call, DelegateCall}\n}\n" + }, "@gnosis.pm/zodiac/contracts/factory/FactoryFriendly.sol": { "content": "// SPDX-License-Identifier: LGPL-3.0-only\n\n/// @title Zodiac FactoryFriendly - A contract that allows other contracts to be initializable and pass bytes as arguments to define contract state\npragma solidity >=0.7.0 <0.9.0;\n\nimport \"@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol\";\n\nabstract contract FactoryFriendly is OwnableUpgradeable {\n function setUp(bytes memory initializeParams) public virtual;\n}\n" }, - "@gnosis.pm/zodiac/contracts/guard/BaseGuard.sol": { - "content": "// SPDX-License-Identifier: LGPL-3.0-only\npragma solidity >=0.7.0 <0.9.0;\n\nimport \"@gnosis.pm/safe-contracts/contracts/common/Enum.sol\";\nimport \"@gnosis.pm/safe-contracts/contracts/interfaces/IERC165.sol\";\nimport \"../interfaces/IGuard.sol\";\n\nabstract contract BaseGuard is IERC165 {\n function supportsInterface(bytes4 interfaceId)\n external\n pure\n override\n returns (bool)\n {\n return\n interfaceId == type(IGuard).interfaceId || // 0xe6d7a83a\n interfaceId == type(IERC165).interfaceId; // 0x01ffc9a7\n }\n\n /// Module transactions only use the first four parameters: to, value, data, and operation.\n /// Module.sol hardcodes the remaining parameters as 0 since they are not used for module transactions.\n /// This interface is used to maintain compatibilty with Gnosis Safe transaction guards.\n function checkTransaction(\n address to,\n uint256 value,\n bytes memory data,\n Enum.Operation operation,\n uint256 safeTxGas,\n uint256 baseGas,\n uint256 gasPrice,\n address gasToken,\n address payable refundReceiver,\n bytes memory signatures,\n address msgSender\n ) external virtual;\n\n function checkAfterExecution(bytes32 txHash, bool success) external virtual;\n}\n" - }, "@gnosis.pm/zodiac/contracts/guard/Guardable.sol": { "content": "// SPDX-License-Identifier: LGPL-3.0-only\npragma solidity >=0.7.0 <0.9.0;\n\nimport \"@gnosis.pm/safe-contracts/contracts/common/Enum.sol\";\nimport \"@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol\";\nimport \"@gnosis.pm/safe-contracts/contracts/interfaces/IERC165.sol\";\nimport \"./BaseGuard.sol\";\n\n/// @title Guardable - A contract that manages fallback calls made to this contract\ncontract Guardable is OwnableUpgradeable {\n event ChangedGuard(address guard);\n\n address public guard;\n\n /// @dev Set a guard that checks transactions before execution\n /// @param _guard The address of the guard to be used or the 0 address to disable the guard\n function setGuard(address _guard) external onlyOwner {\n if (_guard != address(0)) {\n require(\n BaseGuard(_guard).supportsInterface(type(IGuard).interfaceId),\n \"Guard does not implement IERC165\"\n );\n }\n guard = _guard;\n emit ChangedGuard(guard);\n }\n\n function getGuard() external view returns (address _guard) {\n return guard;\n }\n}\n" }, - "@gnosis.pm/zodiac/contracts/interfaces/IAvatar.sol": { - "content": "// SPDX-License-Identifier: LGPL-3.0-only\n\n/// @title Zodiac Avatar - A contract that manages modules that can execute transactions via this contract.\npragma solidity >=0.7.0 <0.9.0;\n\nimport \"@gnosis.pm/safe-contracts/contracts/common/Enum.sol\";\n\ninterface IAvatar {\n /// @dev Enables a module on the avatar.\n /// @notice Can only be called by the avatar.\n /// @notice Modules should be stored as a linked list.\n /// @notice Must emit EnabledModule(address module) if successful.\n /// @param module Module to be enabled.\n function enableModule(address module) external;\n\n /// @dev Disables a module on the avatar.\n /// @notice Can only be called by the avatar.\n /// @notice Must emit DisabledModule(address module) if successful.\n /// @param prevModule Address that pointed to the module to be removed in the linked list\n /// @param module Module to be removed.\n function disableModule(address prevModule, address module) external;\n\n /// @dev Allows a Module to execute a transaction.\n /// @notice Can only be called by an enabled module.\n /// @notice Must emit ExecutionFromModuleSuccess(address module) if successful.\n /// @notice Must emit ExecutionFromModuleFailure(address module) if unsuccessful.\n /// @param to Destination address of module transaction.\n /// @param value Ether value of module transaction.\n /// @param data Data payload of module transaction.\n /// @param operation Operation type of module transaction: 0 == call, 1 == delegate call.\n function execTransactionFromModule(\n address to,\n uint256 value,\n bytes memory data,\n Enum.Operation operation\n ) external returns (bool success);\n\n /// @dev Allows a Module to execute a transaction and return data\n /// @notice Can only be called by an enabled module.\n /// @notice Must emit ExecutionFromModuleSuccess(address module) if successful.\n /// @notice Must emit ExecutionFromModuleFailure(address module) if unsuccessful.\n /// @param to Destination address of module transaction.\n /// @param value Ether value of module transaction.\n /// @param data Data payload of module transaction.\n /// @param operation Operation type of module transaction: 0 == call, 1 == delegate call.\n function execTransactionFromModuleReturnData(\n address to,\n uint256 value,\n bytes memory data,\n Enum.Operation operation\n ) external returns (bool success, bytes memory returnData);\n\n /// @dev Returns if an module is enabled\n /// @return True if the module is enabled\n function isModuleEnabled(address module) external view returns (bool);\n\n /// @dev Returns array of modules.\n /// @param start Start of the page.\n /// @param pageSize Maximum number of modules that should be returned.\n /// @return array Array of modules.\n /// @return next Start of the next page.\n function getModulesPaginated(address start, uint256 pageSize)\n external\n view\n returns (address[] memory array, address next);\n}\n" - }, - "@gnosis.pm/zodiac/contracts/interfaces/IGuard.sol": { - "content": "// SPDX-License-Identifier: LGPL-3.0-only\npragma solidity >=0.7.0 <0.9.0;\n\nimport \"@gnosis.pm/safe-contracts/contracts/common/Enum.sol\";\n\ninterface IGuard {\n function checkTransaction(\n address to,\n uint256 value,\n bytes memory data,\n Enum.Operation operation,\n uint256 safeTxGas,\n uint256 baseGas,\n uint256 gasPrice,\n address gasToken,\n address payable refundReceiver,\n bytes memory signatures,\n address msgSender\n ) external;\n\n function checkAfterExecution(bytes32 txHash, bool success) external;\n}\n" - }, "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol": { "content": "// SPDX-License-Identifier: MIT\n\npragma solidity ^0.8.0;\n\nimport \"../utils/ContextUpgradeable.sol\";\nimport \"../proxy/utils/Initializable.sol\";\n\n/**\n * @dev Contract module which provides a basic access control mechanism, where\n * there is an account (an owner) that can be granted exclusive access to\n * specific functions.\n *\n * By default, the owner account will be the one that deploys the contract. This\n * can later be changed with {transferOwnership}.\n *\n * This module is used through inheritance. It will make available the modifier\n * `onlyOwner`, which can be applied to your functions to restrict their use to\n * the owner.\n */\nabstract contract OwnableUpgradeable is Initializable, ContextUpgradeable {\n address private _owner;\n\n event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);\n\n /**\n * @dev Initializes the contract setting the deployer as the initial owner.\n */\n function __Ownable_init() internal initializer {\n __Context_init_unchained();\n __Ownable_init_unchained();\n }\n\n function __Ownable_init_unchained() internal initializer {\n _setOwner(_msgSender());\n }\n\n /**\n * @dev Returns the address of the current owner.\n */\n function owner() public view virtual returns (address) {\n return _owner;\n }\n\n /**\n * @dev Throws if called by any account other than the owner.\n */\n modifier onlyOwner() {\n require(owner() == _msgSender(), \"Ownable: caller is not the owner\");\n _;\n }\n\n /**\n * @dev Leaves the contract without owner. It will not be possible to call\n * `onlyOwner` functions anymore. Can only be called by the current owner.\n *\n * NOTE: Renouncing ownership will leave the contract without an owner,\n * thereby removing any functionality that is only available to the owner.\n */\n function renounceOwnership() public virtual onlyOwner {\n _setOwner(address(0));\n }\n\n /**\n * @dev Transfers ownership of the contract to a new account (`newOwner`).\n * Can only be called by the current owner.\n */\n function transferOwnership(address newOwner) public virtual onlyOwner {\n require(newOwner != address(0), \"Ownable: new owner is the zero address\");\n _setOwner(newOwner);\n }\n\n function _setOwner(address newOwner) private {\n address oldOwner = _owner;\n _owner = newOwner;\n emit OwnershipTransferred(oldOwner, newOwner);\n }\n uint256[49] private __gap;\n}\n" }, + "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol": { + "content": "// SPDX-License-Identifier: MIT\n\npragma solidity ^0.8.0;\nimport \"../proxy/utils/Initializable.sol\";\n\n/**\n * @dev Provides information about the current execution context, including the\n * sender of the transaction and its data. While these are generally available\n * via msg.sender and msg.data, they should not be accessed in such a direct\n * manner, since when dealing with meta-transactions the account sending and\n * paying for execution may not be the actual sender (as far as an application\n * is concerned).\n *\n * This contract is only required for intermediate, library-like contracts.\n */\nabstract contract ContextUpgradeable is Initializable {\n function __Context_init() internal initializer {\n __Context_init_unchained();\n }\n\n function __Context_init_unchained() internal initializer {\n }\n function _msgSender() internal view virtual returns (address) {\n return msg.sender;\n }\n\n function _msgData() internal view virtual returns (bytes calldata) {\n return msg.data;\n }\n uint256[50] private __gap;\n}\n" + }, "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol": { "content": "// SPDX-License-Identifier: MIT\n\npragma solidity ^0.8.0;\n\n/**\n * @dev This is a base contract to aid in writing upgradeable contracts, or any kind of contract that will be deployed\n * behind a proxy. Since a proxied contract can't have a constructor, it's common to move constructor logic to an\n * external initializer function, usually called `initialize`. It then becomes necessary to protect this initializer\n * function so it can only be called once. The {initializer} modifier provided by this contract will have this effect.\n *\n * TIP: To avoid leaving the proxy in an uninitialized state, the initializer function should be called as early as\n * possible by providing the encoded function call as the `_data` argument to {ERC1967Proxy-constructor}.\n *\n * CAUTION: When used with inheritance, manual care must be taken to not invoke a parent initializer twice, or to ensure\n * that all initializers are idempotent. This is not verified automatically as constructors are by Solidity.\n */\nabstract contract Initializable {\n /**\n * @dev Indicates that the contract has been initialized.\n */\n bool private _initialized;\n\n /**\n * @dev Indicates that the contract is in the process of being initialized.\n */\n bool private _initializing;\n\n /**\n * @dev Modifier to protect an initializer function from being invoked twice.\n */\n modifier initializer() {\n require(_initializing || !_initialized, \"Initializable: contract is already initialized\");\n\n bool isTopLevelCall = !_initializing;\n if (isTopLevelCall) {\n _initializing = true;\n _initialized = true;\n }\n\n _;\n\n if (isTopLevelCall) {\n _initializing = false;\n }\n }\n}\n" }, - "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol": { - "content": "// SPDX-License-Identifier: MIT\n\npragma solidity ^0.8.0;\nimport \"../proxy/utils/Initializable.sol\";\n\n/**\n * @dev Provides information about the current execution context, including the\n * sender of the transaction and its data. While these are generally available\n * via msg.sender and msg.data, they should not be accessed in such a direct\n * manner, since when dealing with meta-transactions the account sending and\n * paying for execution may not be the actual sender (as far as an application\n * is concerned).\n *\n * This contract is only required for intermediate, library-like contracts.\n */\nabstract contract ContextUpgradeable is Initializable {\n function __Context_init() internal initializer {\n __Context_init_unchained();\n }\n\n function __Context_init_unchained() internal initializer {\n }\n function _msgSender() internal view virtual returns (address) {\n return msg.sender;\n }\n\n function _msgData() internal view virtual returns (bytes calldata) {\n return msg.data;\n }\n uint256[50] private __gap;\n}\n" + "@gnosis.pm/safe-contracts/contracts/interfaces/IERC165.sol": { + "content": "// SPDX-License-Identifier: LGPL-3.0-only\npragma solidity >=0.7.0 <0.9.0;\n\n/// @notice More details at https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/introspection/IERC165.sol\ninterface IERC165 {\n /**\n * @dev Returns true if this contract implements the interface defined by\n * `interfaceId`. See the corresponding\n * https://eips.ethereum.org/EIPS/eip-165#how-interfaces-are-identified[EIP section]\n * to learn more about how these ids are created.\n *\n * This function call must use less than 30 000 gas.\n */\n function supportsInterface(bytes4 interfaceId) external view returns (bool);\n}\n" }, - "contracts/Delay.sol": { - "content": "// SPDX-License-Identifier: LGPL-3.0-only\npragma solidity >=0.8.0;\n\nimport \"@gnosis.pm/zodiac/contracts/core/Modifier.sol\";\n\ncontract Delay is Modifier {\n event DelaySetup(\n address indexed initiator,\n address indexed owner,\n address indexed avatar,\n address target\n );\n event TransactionAdded(\n uint256 indexed queueNonce,\n bytes32 indexed txHash,\n address to,\n uint256 value,\n bytes data,\n Enum.Operation operation\n );\n\n uint256 public txCooldown;\n uint256 public txExpiration;\n uint256 public txNonce;\n uint256 public queueNonce;\n // Mapping of queue nonce to transaction hash.\n mapping(uint256 => bytes32) public txHash;\n // Mapping of queue nonce to creation timestamp.\n mapping(uint256 => uint256) public txCreatedAt;\n\n /// @param _owner Address of the owner\n /// @param _avatar Address of the avatar (e.g. a Gnosis Safe)\n /// @param _target Address of the contract that will call exec function\n /// @param _cooldown Cooldown in seconds that should be required after a transaction is proposed\n /// @param _expiration Duration that a proposed transaction is valid for after the cooldown, in seconds (or 0 if valid forever)\n /// @notice There need to be at least 60 seconds between end of cooldown and expiration\n constructor(\n address _owner,\n address _avatar,\n address _target,\n uint256 _cooldown,\n uint256 _expiration\n ) {\n bytes memory initParams = abi.encode(\n _owner,\n _avatar,\n _target,\n _cooldown,\n _expiration\n );\n setUp(initParams);\n }\n\n function setUp(bytes memory initParams) public override {\n (\n address _owner,\n address _avatar,\n address _target,\n uint256 _cooldown,\n uint256 _expiration\n ) = abi.decode(\n initParams,\n (address, address, address, uint256, uint256)\n );\n __Ownable_init();\n require(_avatar != address(0), \"Avatar can not be zero address\");\n require(_target != address(0), \"Target can not be zero address\");\n require(\n _expiration == 0 || _expiration >= 60,\n \"Expiratition must be 0 or at least 60 seconds\"\n );\n\n avatar = _avatar;\n target = _target;\n txExpiration = _expiration;\n txCooldown = _cooldown;\n\n transferOwnership(_owner);\n setupModules();\n\n emit DelaySetup(msg.sender, _owner, _avatar, _target);\n }\n\n function setupModules() internal {\n require(\n modules[SENTINEL_MODULES] == address(0),\n \"setUpModules has already been called\"\n );\n modules[SENTINEL_MODULES] = SENTINEL_MODULES;\n }\n\n /// @dev Sets the cooldown before a transaction can be executed.\n /// @param cooldown Cooldown in seconds that should be required before the transaction can be executed\n /// @notice This can only be called by the owner\n function setTxCooldown(uint256 cooldown) public onlyOwner {\n txCooldown = cooldown;\n }\n\n /// @dev Sets the duration for which a transaction is valid.\n /// @param expiration Duration that a transaction is valid in seconds (or 0 if valid forever) after the cooldown\n /// @notice There need to be at least 60 seconds between end of cooldown and expiration\n /// @notice This can only be called by the owner\n function setTxExpiration(uint256 expiration) public onlyOwner {\n require(\n expiration == 0 || expiration >= 60,\n \"Expiratition must be 0 or at least 60 seconds\"\n );\n txExpiration = expiration;\n }\n\n /// @dev Sets transaction nonce. Used to invalidate or skip transactions in queue.\n /// @param _nonce New transaction nonce\n /// @notice This can only be called by the owner\n function setTxNonce(uint256 _nonce) public onlyOwner {\n require(\n _nonce > txNonce,\n \"New nonce must be higher than current txNonce\"\n );\n require(_nonce <= queueNonce, \"Cannot be higher than queueNonce\");\n txNonce = _nonce;\n }\n\n /// @dev Adds a transaction to the queue (same as avatar interface so that this can be placed between other modules and the avatar).\n /// @param to Destination address of module transaction\n /// @param value Ether value of module transaction\n /// @param data Data payload of module transaction\n /// @param operation Operation type of module transaction\n /// @return success Whether or not the call was successfully queued for execution\n /// @notice Can only be called by enabled modules\n function execTransactionFromModule(\n address to,\n uint256 value,\n bytes calldata data,\n Enum.Operation operation\n ) public override moduleOnly returns (bool success) {\n bytes32 hash = getTransactionHash(to, value, data, operation);\n txHash[queueNonce] = hash;\n txCreatedAt[queueNonce] = block.timestamp;\n emit TransactionAdded(queueNonce, hash, to, value, data, operation);\n queueNonce++;\n success = true;\n }\n\n /// @dev Adds a transaction to the queue (same as avatar interface so that this can be placed between other modules and the avatar).\n /// @param to Destination address of module transaction\n /// @param value Ether value of module transaction\n /// @param data Data payload of module transaction\n /// @param operation Operation type of module transaction\n /// @return success Whether or not the call was successfully queued for execution\n /// @return returnData ABI encoded queue nonce (uint256), transaction hash (bytes32), and block.timestamp (uint256)\n /// @notice Can only be called by enabled modules\n function execTransactionFromModuleReturnData(\n address to,\n uint256 value,\n bytes calldata data,\n Enum.Operation operation\n )\n public\n override\n moduleOnly\n returns (bool success, bytes memory returnData)\n {\n bytes32 hash = getTransactionHash(to, value, data, operation);\n txHash[queueNonce] = hash;\n txCreatedAt[queueNonce] = block.timestamp;\n emit TransactionAdded(queueNonce, hash, to, value, data, operation);\n success = true;\n returnData = abi.encode(queueNonce, hash, block.timestamp);\n queueNonce++;\n }\n\n /// @dev Executes the next transaction only if the cooldown has passed and the transaction has not expired\n /// @param to Destination address of module transaction\n /// @param value Ether value of module transaction\n /// @param data Data payload of module transaction\n /// @param operation Operation type of module transaction\n /// @notice The txIndex used by this function is always 0\n function executeNextTx(\n address to,\n uint256 value,\n bytes calldata data,\n Enum.Operation operation\n ) public {\n require(txNonce < queueNonce, \"Transaction queue is empty\");\n uint256 txCreationTimestamp = txCreatedAt[txNonce];\n require(\n block.timestamp - txCreationTimestamp >= txCooldown,\n \"Transaction is still in cooldown\"\n );\n if (txExpiration != 0) {\n require(\n txCreationTimestamp + txCooldown + txExpiration >=\n block.timestamp,\n \"Transaction expired\"\n );\n }\n require(\n txHash[txNonce] == getTransactionHash(to, value, data, operation),\n \"Transaction hashes do not match\"\n );\n txNonce++;\n require(exec(to, value, data, operation), \"Module transaction failed\");\n }\n\n function skipExpired() public {\n while (\n txExpiration != 0 &&\n txCreatedAt[txNonce] + txCooldown + txExpiration <\n block.timestamp &&\n txNonce < queueNonce\n ) {\n txNonce++;\n }\n }\n\n function getTransactionHash(\n address to,\n uint256 value,\n bytes memory data,\n Enum.Operation operation\n ) public pure returns (bytes32) {\n return keccak256(abi.encodePacked(to, value, data, operation));\n }\n\n function getTxHash(uint256 _nonce) public view returns (bytes32) {\n return (txHash[_nonce]);\n }\n\n function getTxCreatedAt(uint256 _nonce) public view returns (uint256) {\n return (txCreatedAt[_nonce]);\n }\n}\n" + "@gnosis.pm/zodiac/contracts/guard/BaseGuard.sol": { + "content": "// SPDX-License-Identifier: LGPL-3.0-only\npragma solidity >=0.7.0 <0.9.0;\n\nimport \"@gnosis.pm/safe-contracts/contracts/common/Enum.sol\";\nimport \"@gnosis.pm/safe-contracts/contracts/interfaces/IERC165.sol\";\nimport \"../interfaces/IGuard.sol\";\n\nabstract contract BaseGuard is IERC165 {\n function supportsInterface(bytes4 interfaceId)\n external\n pure\n override\n returns (bool)\n {\n return\n interfaceId == type(IGuard).interfaceId || // 0xe6d7a83a\n interfaceId == type(IERC165).interfaceId; // 0x01ffc9a7\n }\n\n /// Module transactions only use the first four parameters: to, value, data, and operation.\n /// Module.sol hardcodes the remaining parameters as 0 since they are not used for module transactions.\n /// This interface is used to maintain compatibilty with Gnosis Safe transaction guards.\n function checkTransaction(\n address to,\n uint256 value,\n bytes memory data,\n Enum.Operation operation,\n uint256 safeTxGas,\n uint256 baseGas,\n uint256 gasPrice,\n address gasToken,\n address payable refundReceiver,\n bytes memory signatures,\n address msgSender\n ) external virtual;\n\n function checkAfterExecution(bytes32 txHash, bool success) external virtual;\n}\n" + }, + "@gnosis.pm/zodiac/contracts/interfaces/IGuard.sol": { + "content": "// SPDX-License-Identifier: LGPL-3.0-only\npragma solidity >=0.7.0 <0.9.0;\n\nimport \"@gnosis.pm/safe-contracts/contracts/common/Enum.sol\";\n\ninterface IGuard {\n function checkTransaction(\n address to,\n uint256 value,\n bytes memory data,\n Enum.Operation operation,\n uint256 safeTxGas,\n uint256 baseGas,\n uint256 gasPrice,\n address gasToken,\n address payable refundReceiver,\n bytes memory signatures,\n address msgSender\n ) external;\n\n function checkAfterExecution(bytes32 txHash, bool success) external;\n}\n" } }, "settings": { @@ -1615,22 +1624,21 @@ "outputSelection": { "*": { "*": [ - "abi", "evm.bytecode", "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" + "devdoc", + "userdoc", + "metadata", + "abi" ] } - } + }, + "metadata": { + "useLiteralContent": true + }, + "libraries": {} } - }, - "contractName": "Delay", - "sourceName": "contracts/Delay.sol", - "compilerVersion": "v0.8.0+commit.c7dfd78e" + } }, "1.1.0": { "contractName": "Delay", diff --git a/package.json b/package.json index 821cfbc..ed73430 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "author": "auryn.macmillan@gnosis.io", "license": "MIT", "devDependencies": { - "@gnosis-guild/zodiac-core": "^1.1.0", + "@gnosis-guild/zodiac-core": "2.0.0", "@gnosis.pm/safe-contracts": "1.3.0", "@nomicfoundation/hardhat-chai-matchers": "^2.0.7", "@nomicfoundation/hardhat-ethers": "^3.0.6", diff --git a/tasks/create-EIP1193.ts b/tasks/create-EIP1193.ts index f3875d0..db4293f 100644 --- a/tasks/create-EIP1193.ts +++ b/tasks/create-EIP1193.ts @@ -1,6 +1,6 @@ -import { EIP1193Provider } from "@gnosis-guild/zodiac-core"; -import { Signer } from "ethers"; -import { EthereumProvider } from "hardhat/types"; +import { EIP1193Provider } from '@gnosis-guild/zodiac-core' +import { Signer } from 'ethers' +import { EthereumProvider } from 'hardhat/types' export function createEIP1193( provider: EthereumProvider, @@ -8,12 +8,12 @@ export function createEIP1193( ): EIP1193Provider { return { request: async ({ method, params }) => { - if (method == "eth_sendTransaction") { - const { hash } = await signer.sendTransaction((params as any[])[0]); - return hash; + if (method == 'eth_sendTransaction') { + const { hash } = await signer.sendTransaction((params as any[])[0]) + return hash } - return provider.request({ method, params }); + return provider.request({ method, params }) }, - }; + } } diff --git a/tasks/deploy-mastercopies.ts b/tasks/deploy-mastercopies.ts index 95b4533..3f322c5 100644 --- a/tasks/deploy-mastercopies.ts +++ b/tasks/deploy-mastercopies.ts @@ -1,6 +1,6 @@ import { task } from 'hardhat/config' -import { deployAllMastercopies } from '@gnosis-guild/zodiac-core' +import { readMastercopies, deployMastercopy } from '@gnosis-guild/zodiac-core' import { createEIP1193 } from './create-EIP1193' task( @@ -9,8 +9,36 @@ task( ).setAction(async (_, hre) => { const [signer] = await hre.ethers.getSigners() const provider = createEIP1193(hre.network.provider, signer) + for (const mastercopy of readMastercopies()) { + const { + contractName, + contractVersion, + factory, + bytecode, + constructorArgs, + salt, + } = mastercopy - await deployAllMastercopies({ - provider, - }) + const { address, noop } = await deployMastercopy({ + factory, + bytecode, + constructorArgs, + salt, + provider, + onStart: () => { + console.log( + `⏳ ${contractName}@${contractVersion}: Deployment starting...` + ) + }, + }) + if (noop) { + console.log( + `🔄 ${contractName}@${contractVersion}: Already deployed at ${address}` + ) + } else { + console.log( + `🚀 ${contractName}@${contractVersion}: Successfully deployed at ${address}` + ) + } + } }) diff --git a/tasks/deploy-mastercopy.ts b/tasks/deploy-mastercopy.ts index 50a3c99..952c38d 100644 --- a/tasks/deploy-mastercopy.ts +++ b/tasks/deploy-mastercopy.ts @@ -1,10 +1,6 @@ import { task, types } from 'hardhat/config' -import { - EIP1193Provider, - deployMastercopy, - readMastercopy, -} from '@gnosis-guild/zodiac-core' +import { deployMastercopy, readMastercopies } from '@gnosis-guild/zodiac-core' import { createEIP1193 } from './create-EIP1193' task( @@ -21,39 +17,31 @@ task( const [signer] = await hre.ethers.getSigners() const provider = createEIP1193(hre.network.provider, signer) - // Deploy the contracts based on the provided version - await deployLatestMastercopyFromDisk(provider, contractVersion) - }) - -async function deployLatestMastercopyFromDisk( - provider: EIP1193Provider, - version?: string -) { - const contract = 'Delay' - try { - // Read the artifact for the specific contract and version - const artifact = readMastercopy({ - contractName: contract, - contractVersion: version === 'latest' ? undefined : version, - }) - - const { address, noop } = await deployMastercopy({ - ...artifact, - provider, - }) - - if (noop) { - console.log( - `🔄 ${artifact.contractName}@${version}: Already deployed at ${address}` - ) - } else { - console.log( - `🚀 ${artifact.contractName}@${version}: Successfully deployed at ${address}` - ) + for (const mastercopy of readMastercopies({ contractVersion })) { + const { + contractName, + contractVersion, + factory, + bytecode, + constructorArgs, + salt, + } = mastercopy + const { address, noop } = await deployMastercopy({ + factory, + bytecode, + constructorArgs, + salt, + provider, + onStart: () => { + console.log( + `⏳ ${contractName}@${contractVersion}: Deployment starting...` + ) + }, + }) + if (noop) { + console.log( + `🔄 ${contractName}@${contractVersion}: Already deployed at ${address}` + ) + } } - } catch (error) { - console.error( - `⏭️ Skipping deployment of ${contract}@${version}: Version not found.` - ) - } -} + }) diff --git a/tasks/verify-mastercopies.ts b/tasks/verify-mastercopies.ts index bd05a9c..93933ce 100644 --- a/tasks/verify-mastercopies.ts +++ b/tasks/verify-mastercopies.ts @@ -1,5 +1,5 @@ import { task } from 'hardhat/config' -import { verifyAllMastercopies } from '@gnosis-guild/zodiac-core' +import { readMastercopies, verifyMastercopy } from '@gnosis-guild/zodiac-core' const { ETHERSCAN_API_KEY } = process.env @@ -12,8 +12,24 @@ task( } const chainId = String((await hre.ethers.provider.getNetwork()).chainId) - await verifyAllMastercopies({ - apiUrlOrChainId: chainId, - apiKey: ETHERSCAN_API_KEY, - }) + + for (const artifact of readMastercopies()) { + const { noop } = await verifyMastercopy({ + artifact, + apiUrlOrChainId: chainId, + apiKey: ETHERSCAN_API_KEY, + }) + + const { contractName, contractVersion, address } = artifact + + if (noop) { + console.log( + `🔄 ${contractName}@${contractVersion}: Already verified at ${address}` + ) + } else { + console.log( + `🚀 ${contractName}@${contractVersion}: Successfully verified at ${address}` + ) + } + } }) diff --git a/tasks/verify-mastercopy.ts b/tasks/verify-mastercopy.ts index 02a613c..b38ca9f 100644 --- a/tasks/verify-mastercopy.ts +++ b/tasks/verify-mastercopy.ts @@ -1,30 +1,15 @@ import { task, types } from 'hardhat/config' -import { - readMastercopy, - verifyAllMastercopies, -} from '@gnosis-guild/zodiac-core' -import path from 'path' -import fs from 'fs' -import { cwd } from 'process' +import { readMastercopies, verifyMastercopy } from '@gnosis-guild/zodiac-core' const { ETHERSCAN_API_KEY } = process.env -/** - * Simulates the SDK's `defaultMastercopyArtifactsFile`, pointing to the mastercopies.json file. - * - * @returns {string} The absolute path to the mastercopy artifacts file. - */ -function getMastercopyArtifactsFile(): string { - return path.join(cwd(), 'temp-mastercopies.json') -} - task( 'verify:mastercopy', 'Verifies all mastercopies from the artifacts file in the block explorer corresponding to the current network' ) .addOptionalParam( 'contractVersion', - 'The specific version of the contract to deploy', + 'Filters by a specific version or lateat', 'latest', // Default value types.string ) @@ -34,60 +19,24 @@ task( } const chainId = String((await hre.ethers.provider.getNetwork()).chainId) - await verifyLatestMastercopyFromDisk(chainId, contractVersion) - }) - -/** - * Verifies the latest mastercopy from disk, handling multiple contracts and versions. - * - * @param {string} chainId - The chain ID of the network. - * @param {string} [version] - The specific version of the contract to verify. - */ -async function verifyLatestMastercopyFromDisk( - chainId: string, - version?: string -) { - const verifyDir = path.dirname(getMastercopyArtifactsFile()) - - // Ensure the directory exists - if (!fs.existsSync(verifyDir)) { - fs.mkdirSync(verifyDir, { recursive: true }) - } - - // Define the mastercopyObject with the appropriate type - const mastercopyObject: { [key: string]: { [version: string]: any } } = {} - const contract = 'Delay' - try { - // Read the artifact for the specific contract and version - const latestArtifact = readMastercopy({ - contractName: contract, - contractVersion: version === 'latest' ? undefined : version, - }) - if (!latestArtifact) { - console.error( - `⏭️ Skipping verify of ${contract}@${version}: Artifact not found.` - ) + for (const artifact of readMastercopies({ contractVersion })) { + const { noop } = await verifyMastercopy({ + artifact, + apiUrlOrChainId: chainId, + apiKey: ETHERSCAN_API_KEY, + }) + + const { contractName, contractVersion, address } = artifact + + if (noop) { + console.log( + `🔄 ${contractName}@${contractVersion}: Already verified at ${address}` + ) + } else { + console.log( + `🚀 ${contractName}@${contractVersion}: Successfully verified at ${address}` + ) + } } - - // Add the contract to the expected structure - mastercopyObject[contract] = { - [latestArtifact.contractVersion]: latestArtifact, - } - } catch (error) { - console.error( - `⏭️ Skipping deployment of ${contract}@${version}: Version not found.` - ) - } - - const tempFilePath = getMastercopyArtifactsFile() - fs.writeFileSync(tempFilePath, JSON.stringify(mastercopyObject, null, 2)) - - await verifyAllMastercopies({ - apiUrlOrChainId: chainId, - apiKey: ETHERSCAN_API_KEY as string, - mastercopyArtifactsFile: tempFilePath, }) - - fs.unlinkSync(tempFilePath) -} diff --git a/yarn.lock b/yarn.lock index 6a5b516..0802e41 100644 --- a/yarn.lock +++ b/yarn.lock @@ -309,10 +309,10 @@ resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.1.tgz#b9da6a878a371829a0502c9b6c1c143ef6663f4d" integrity sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA== -"@gnosis-guild/zodiac-core@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@gnosis-guild/zodiac-core/-/zodiac-core-1.1.0.tgz#a15c4ec9bd6a860f732383cc3b65b7e3cac5deab" - integrity sha512-KrNYNEqFv18SU6OSDPOYS5ckzx7U472wiY9S1U6mBYnkvAj2rLODhOT/NlPMdWDlSfix1PT4UWL9GDChaOe4YQ== +"@gnosis-guild/zodiac-core@2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@gnosis-guild/zodiac-core/-/zodiac-core-2.0.0.tgz#eed83229414b47a1656c1deebfe635beda24786c" + integrity sha512-R3ggh7fv+kS5meN89k/PTCOrTgw73LP3yOykbyBNVzgivXkX8uoaUwJ4anzj5Z18E+Ufbw99fLBvxn9jPTSpqg== dependencies: "@gnosis.pm/safe-contracts" "1.3.0" "@openzeppelin/contracts" "5.0.2"