diff --git a/artifacts/1.json b/artifacts/1.json index ea5e8c16..b1bbfa17 100644 --- a/artifacts/1.json +++ b/artifacts/1.json @@ -1043,6 +1043,11 @@ "name": "poolAddressProvider_", "type": "address", "internalType": "address" + }, + { + "name": "bridger_", + "type": "address", + "internalType": "address" } ], "stateMutability": "nonpayable" @@ -1065,6 +1070,85 @@ "outputs": [], "stateMutability": "nonpayable" }, + { + "type": "function", + "name": "borrowAndBridge", + "inputs": [ + { + "name": "asset", + "type": "address", + "internalType": "address" + }, + { + "name": "amount", + "type": "uint256", + "internalType": "uint256" + }, + { + "name": "kintoWallet", + "type": "address", + "internalType": "address" + }, + { + "name": "bridgeData", + "type": "tuple", + "internalType": "struct IBridger.BridgeData", + "components": [ + { + "name": "vault", + "type": "address", + "internalType": "address" + }, + { + "name": "gasFee", + "type": "uint256", + "internalType": "uint256" + }, + { + "name": "msgGasLimit", + "type": "uint256", + "internalType": "uint256" + }, + { + "name": "connector", + "type": "address", + "internalType": "address" + }, + { + "name": "execPayload", + "type": "bytes", + "internalType": "bytes" + }, + { + "name": "options", + "type": "bytes", + "internalType": "bytes" + } + ] + } + ], + "outputs": [ + { + "name": "amountOut", + "type": "uint256", + "internalType": "uint256" + } + ], + "stateMutability": "payable" + }, + { + "type": "function", + "name": "bridger", + "inputs": [], + "outputs": [ + { + "name": "", + "type": "address", + "internalType": "contract IBridger" + } + ], + "stateMutability": "view" + }, { "type": "function", "name": "poolAddressProvider", @@ -1077,9 +1161,47 @@ } ], "stateMutability": "view" + }, + { + "type": "error", + "name": "AddressEmptyCode", + "inputs": [ + { + "name": "target", + "type": "address", + "internalType": "address" + } + ] + }, + { + "type": "error", + "name": "AddressInsufficientBalance", + "inputs": [ + { + "name": "account", + "type": "address", + "internalType": "address" + } + ] + }, + { + "type": "error", + "name": "FailedInnerCall", + "inputs": [] + }, + { + "type": "error", + "name": "SafeERC20FailedOperation", + "inputs": [ + { + "name": "token", + "type": "address", + "internalType": "address" + } + ] } ], - "address": "0x5bcA84441bfA911b1637A1b2344198dFaCbdCaA1" + "address": "0x8c13D7aDD034A9E1bD8280225Efab7584c5E85A6" }, "AaveLendWorkflow": { "abi": [ @@ -1205,11 +1327,6 @@ "name": "amount", "type": "uint256", "internalType": "uint256" - }, - { - "name": "onBehalfOf", - "type": "address", - "internalType": "address" } ], "outputs": [ @@ -1260,7 +1377,7 @@ ] } ], - "address": "0x5e4cB8F8E70FBe315EA76323f16410B40151fe3b" + "address": "0x5aAdFB43eF8dAF45DD80F4676345b7676f1D70e3" }, "AaveWithdrawWorkflow": { "abi": [ diff --git a/artifacts/42161.json b/artifacts/42161.json index 75c9ad1c..50ba2b66 100644 --- a/artifacts/42161.json +++ b/artifacts/42161.json @@ -1043,6 +1043,11 @@ "name": "poolAddressProvider_", "type": "address", "internalType": "address" + }, + { + "name": "bridger_", + "type": "address", + "internalType": "address" } ], "stateMutability": "nonpayable" @@ -1065,6 +1070,85 @@ "outputs": [], "stateMutability": "nonpayable" }, + { + "type": "function", + "name": "borrowAndBridge", + "inputs": [ + { + "name": "asset", + "type": "address", + "internalType": "address" + }, + { + "name": "amount", + "type": "uint256", + "internalType": "uint256" + }, + { + "name": "kintoWallet", + "type": "address", + "internalType": "address" + }, + { + "name": "bridgeData", + "type": "tuple", + "internalType": "struct IBridger.BridgeData", + "components": [ + { + "name": "vault", + "type": "address", + "internalType": "address" + }, + { + "name": "gasFee", + "type": "uint256", + "internalType": "uint256" + }, + { + "name": "msgGasLimit", + "type": "uint256", + "internalType": "uint256" + }, + { + "name": "connector", + "type": "address", + "internalType": "address" + }, + { + "name": "execPayload", + "type": "bytes", + "internalType": "bytes" + }, + { + "name": "options", + "type": "bytes", + "internalType": "bytes" + } + ] + } + ], + "outputs": [ + { + "name": "amountOut", + "type": "uint256", + "internalType": "uint256" + } + ], + "stateMutability": "payable" + }, + { + "type": "function", + "name": "bridger", + "inputs": [], + "outputs": [ + { + "name": "", + "type": "address", + "internalType": "contract IBridger" + } + ], + "stateMutability": "view" + }, { "type": "function", "name": "poolAddressProvider", @@ -1077,9 +1161,47 @@ } ], "stateMutability": "view" + }, + { + "type": "error", + "name": "AddressEmptyCode", + "inputs": [ + { + "name": "target", + "type": "address", + "internalType": "address" + } + ] + }, + { + "type": "error", + "name": "AddressInsufficientBalance", + "inputs": [ + { + "name": "account", + "type": "address", + "internalType": "address" + } + ] + }, + { + "type": "error", + "name": "FailedInnerCall", + "inputs": [] + }, + { + "type": "error", + "name": "SafeERC20FailedOperation", + "inputs": [ + { + "name": "token", + "type": "address", + "internalType": "address" + } + ] } ], - "address": "0xAa6a97b31D38892E4Edb183588df6b9b633a71b7" + "address": "0xD0187Ca378f7B26D53e0A91fBe8D7ba80498EF10" }, "AaveLendWorkflow": { "abi": [ @@ -1205,11 +1327,6 @@ "name": "amount", "type": "uint256", "internalType": "uint256" - }, - { - "name": "onBehalfOf", - "type": "address", - "internalType": "address" } ], "outputs": [ @@ -1260,7 +1377,7 @@ ] } ], - "address": "0x5cC25cc25bE29d18472E76b2a19975aA1a37Bd5C" + "address": "0x5aAdFB43eF8dAF45DD80F4676345b7676f1D70e3" }, "AaveWithdrawWorkflow": { "abi": [ diff --git a/artifacts/8453.json b/artifacts/8453.json index 8b0d8802..508487b0 100644 --- a/artifacts/8453.json +++ b/artifacts/8453.json @@ -1043,6 +1043,11 @@ "name": "poolAddressProvider_", "type": "address", "internalType": "address" + }, + { + "name": "bridger_", + "type": "address", + "internalType": "address" } ], "stateMutability": "nonpayable" @@ -1065,6 +1070,85 @@ "outputs": [], "stateMutability": "nonpayable" }, + { + "type": "function", + "name": "borrowAndBridge", + "inputs": [ + { + "name": "asset", + "type": "address", + "internalType": "address" + }, + { + "name": "amount", + "type": "uint256", + "internalType": "uint256" + }, + { + "name": "kintoWallet", + "type": "address", + "internalType": "address" + }, + { + "name": "bridgeData", + "type": "tuple", + "internalType": "struct IBridger.BridgeData", + "components": [ + { + "name": "vault", + "type": "address", + "internalType": "address" + }, + { + "name": "gasFee", + "type": "uint256", + "internalType": "uint256" + }, + { + "name": "msgGasLimit", + "type": "uint256", + "internalType": "uint256" + }, + { + "name": "connector", + "type": "address", + "internalType": "address" + }, + { + "name": "execPayload", + "type": "bytes", + "internalType": "bytes" + }, + { + "name": "options", + "type": "bytes", + "internalType": "bytes" + } + ] + } + ], + "outputs": [ + { + "name": "amountOut", + "type": "uint256", + "internalType": "uint256" + } + ], + "stateMutability": "payable" + }, + { + "type": "function", + "name": "bridger", + "inputs": [], + "outputs": [ + { + "name": "", + "type": "address", + "internalType": "contract IBridger" + } + ], + "stateMutability": "view" + }, { "type": "function", "name": "poolAddressProvider", @@ -1077,9 +1161,47 @@ } ], "stateMutability": "view" + }, + { + "type": "error", + "name": "AddressEmptyCode", + "inputs": [ + { + "name": "target", + "type": "address", + "internalType": "address" + } + ] + }, + { + "type": "error", + "name": "AddressInsufficientBalance", + "inputs": [ + { + "name": "account", + "type": "address", + "internalType": "address" + } + ] + }, + { + "type": "error", + "name": "FailedInnerCall", + "inputs": [] + }, + { + "type": "error", + "name": "SafeERC20FailedOperation", + "inputs": [ + { + "name": "token", + "type": "address", + "internalType": "address" + } + ] } ], - "address": "0x4324Fd882507A065FD99E0C6B9332cA2912658A0" + "address": "0x8447861eF3F3b390E7e090B5eFaac0133cD0bCEe" }, "AaveLendWorkflow": { "abi": [ @@ -1205,11 +1327,6 @@ "name": "amount", "type": "uint256", "internalType": "uint256" - }, - { - "name": "onBehalfOf", - "type": "address", - "internalType": "address" } ], "outputs": [ @@ -1260,7 +1377,7 @@ ] } ], - "address": "0xCbA916cbcC56E911C422C1091d9035362AA7B0EE" + "address": "0x5aAdFB43eF8dAF45DD80F4676345b7676f1D70e3" }, "AaveWithdrawWorkflow": { "abi": [ diff --git a/broadcast/145-upgrade_access_protocol.s.sol/1/run-1731955928.json b/broadcast/145-upgrade_access_protocol.s.sol/1/run-1731955928.json new file mode 100644 index 00000000..32997c21 --- /dev/null +++ b/broadcast/145-upgrade_access_protocol.s.sol/1/run-1731955928.json @@ -0,0 +1,151 @@ +{ + "transactions": [ + { + "hash": "0x4c4a492f80690ac4ed15198d394ec14c20d62765e83e3d69faeb35d86e38f0e9", + "transactionType": "CALL", + "contractName": "UUPSProxy", + "contractAddress": "0xa000000eaa652c7023530b603844471294b811c4", + "function": null, + "arguments": null, + "transaction": { + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0xa000000eaa652c7023530b603844471294b811c4", + "gas": "0x11cf1", + "value": "0x0", + "input": "0x0bf919fc0000000000000000000000005aadfb43ef8daf45dd80f4676345b7676f1d70e3", + "nonce": "0x309", + "chainId": "0x1" + }, + "additionalContracts": [], + "isFixedGasLimit": false + }, + { + "hash": "0x340a937fd690cea5d9083586a5d510bb87fb4fbd74d29225f5aaa4358e78ccf1", + "transactionType": "CREATE", + "contractName": "AaveBorrowWorkflow", + "contractAddress": "0x8c13d7add034a9e1bd8280225efab7584c5e85a6", + "function": null, + "arguments": [ + "0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e", + "0x0f1b7bd7762662B23486320AA91F30312184f70C" + ], + "transaction": { + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "gas": "0xb8e39", + "value": "0x0", + "input": "0x60c060405234801561001057600080fd5b50604051610a60380380610a6083398101604081905261002f91610062565b6001600160a01b039182166080521660a052610095565b80516001600160a01b038116811461005d57600080fd5b919050565b6000806040838503121561007557600080fd5b61007e83610046565b915061008c60208401610046565b90509250929050565b60805160a05161098c6100d460003960008181609e01528181610135015281816101c0015261020b01526000818160ea0152610298015261098c6000f3fe60806040526004361061003f5760003560e01c806316452c26146100445780634b8a35291461006a5780634d47fc851461008c57806362684616146100d8575b600080fd5b6100576100523660046106ad565b61010c565b6040519081526020015b60405180910390f35b34801561007657600080fd5b5061008a61008536600461071e565b610296565b005b34801561009857600080fd5b506100c07f000000000000000000000000000000000000000000000000000000000000000081565b6040516001600160a01b039091168152602001610061565b3480156100e457600080fd5b506100c07f000000000000000000000000000000000000000000000000000000000000000081565b60006101188585610296565b604051636eb1769f60e11b81523060048201526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000008116602483015285919087169063dd62ed3e90604401602060405180830381865afa158015610187573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ab919061074a565b10156101e7576101e76001600160a01b0386167f0000000000000000000000000000000000000000000000000000000000000000600019610394565b6040805160208101825260008152905163e48e2d8f60e01b81526001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169163e48e2d8f9161024a91899189918991849184918b906004016107fd565b6020604051808303816000875af1158015610269573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028d919061074a565b95945050505050565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663026b1d5f6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156102f4573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061031891906108fb565b60405163a415bcad60e01b81526001600160a01b038481166004830152602482018490526002604483015260006064830152306084830152919091169063a415bcad9060a401600060405180830381600087803b15801561037857600080fd5b505af115801561038c573d6000803e3d6000fd5b505050505050565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b1790526103e5848261044e565b61044857604080516001600160a01b038516602482015260006044808301919091528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b17905261043e9085906104f1565b61044884826104f1565b50505050565b6000806000846001600160a01b03168460405161046b9190610918565b6000604051808303816000865af19150503d80600081146104a8576040519150601f19603f3d011682016040523d82523d6000602084013e6104ad565b606091505b50915091508180156104d75750805115806104d75750808060200190518101906104d79190610934565b801561028d5750505050506001600160a01b03163b151590565b60006105066001600160a01b0384168361055e565b9050805160001415801561052b5750808060200190518101906105299190610934565b155b1561055957604051635274afe760e01b81526001600160a01b03841660048201526024015b60405180910390fd5b505050565b606061056c83836000610573565b9392505050565b6060814710156105985760405163cd78605960e01b8152306004820152602401610550565b600080856001600160a01b031684866040516105b49190610918565b60006040518083038185875af1925050503d80600081146105f1576040519150601f19603f3d011682016040523d82523d6000602084013e6105f6565b606091505b5091509150610606868383610610565b9695505050505050565b606082610625576106208261066c565b61056c565b815115801561063c57506001600160a01b0384163b155b1561066557604051639996b31560e01b81526001600160a01b0385166004820152602401610550565b508061056c565b80511561067c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b50565b6001600160a01b038116811461069557600080fd5b600080600080608085870312156106c357600080fd5b84356106ce81610698565b93506020850135925060408501356106e581610698565b9150606085013567ffffffffffffffff81111561070157600080fd5b850160c0818803121561071357600080fd5b939692955090935050565b6000806040838503121561073157600080fd5b823561073c81610698565b946020939093013593505050565b60006020828403121561075c57600080fd5b5051919050565b60005b8381101561077e578181015183820152602001610766565b50506000910152565b6000808335601e1984360301811261079e57600080fd5b830160208101925035905067ffffffffffffffff8111156107be57600080fd5b8036038213156107cd57600080fd5b9250929050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b600060018060a01b03808a1683528860208401528088166040840152808716606084015285608084015260e060a084015284518060e08501526101006108498282870160208a01610763565b601f19601f83011685019150808583030160c0860152853561086a81610698565b83169082015260208501356101208201526040850135610140820152606085013561089481610698565b82166101608201526108a96080860186610787565b925060c06101808301526108c26101c0830184836107d4565b9250506108d260a0860186610787565b82840360ff19016101a08401526108ea8482846107d4565b9d9c50505050505050505050505050565b60006020828403121561090d57600080fd5b815161056c81610698565b6000825161092a818460208701610763565b9190910192915050565b60006020828403121561094657600080fd5b8151801515811461056c57600080fdfea26469706673582212206813f75d027189c2c6cd6f9856bdf4ef085cef910ced1304279337ffe324d0f464736f6c634300081800330000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e0000000000000000000000000f1b7bd7762662b23486320aa91f30312184f70c", + "nonce": "0x30a", + "chainId": "0x1" + }, + "additionalContracts": [], + "isFixedGasLimit": false + }, + { + "hash": "0x2640a89c4043e38eb5005408e40bd0d713038538a7255bbc3dad2557b61ba608", + "transactionType": "CALL", + "contractName": "UUPSProxy", + "contractAddress": "0xa000000eaa652c7023530b603844471294b811c4", + "function": null, + "arguments": null, + "transaction": { + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0xa000000eaa652c7023530b603844471294b811c4", + "gas": "0x11cf1", + "value": "0x0", + "input": "0x0bf919fc0000000000000000000000008c13d7add034a9e1bd8280225efab7584c5e85a6", + "nonce": "0x30b", + "chainId": "0x1" + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [ + { + "status": "0x1", + "cumulativeGasUsed": "0xa6ef52", + "logs": [ + { + "address": "0xa000000eaa652c7023530b603844471294b811c4", + "topics": [ + "0x4330c9a27379ee1ae26d7ba186fb3420ab2fde5cb4f1937298b69228b4787058", + "0x0000000000000000000000005aadfb43ef8daf45dd80f4676345b7676f1d70e3", + "0x0000000000000000000000000000000000000000000000000000000000000001" + ], + "data": "0x", + "blockHash": "0xc3fe71da992fb26d7780866194d190597ccd2959108c72f1efe33a9f87637328", + "blockNumber": "0x143bcff", + "transactionHash": "0x4c4a492f80690ac4ed15198d394ec14c20d62765e83e3d69faeb35d86e38f0e9", + "transactionIndex": "0x4b", + "logIndex": "0xd0", + "removed": false + } + ], + "logsBloom": "0x00000000000000000001000000000000000000000000400000000002000000000000000000000000000000000000000000000000000000000000000000040000040001000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000200000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0x4c4a492f80690ac4ed15198d394ec14c20d62765e83e3d69faeb35d86e38f0e9", + "transactionIndex": "0x4b", + "blockHash": "0xc3fe71da992fb26d7780866194d190597ccd2959108c72f1efe33a9f87637328", + "blockNumber": "0x143bcff", + "gasUsed": "0xce4c", + "effectiveGasPrice": "0x44a3af59e", + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0xa000000eaa652c7023530b603844471294b811c4", + "contractAddress": null + }, + { + "status": "0x1", + "cumulativeGasUsed": "0x9225b6", + "logs": [], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0x340a937fd690cea5d9083586a5d510bb87fb4fbd74d29225f5aaa4358e78ccf1", + "transactionIndex": "0x44", + "blockHash": "0xf7a2318cd91e340d2d395a8d88ae2a39c04183df977ca225fd8ae6ff251941ff", + "blockNumber": "0x143bd00", + "gasUsed": "0x8e439", + "effectiveGasPrice": "0x4538edd7e", + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": null, + "contractAddress": "0x8c13d7add034a9e1bd8280225efab7584c5e85a6" + }, + { + "status": "0x1", + "cumulativeGasUsed": "0xe58e79", + "logs": [ + { + "address": "0xa000000eaa652c7023530b603844471294b811c4", + "topics": [ + "0x4330c9a27379ee1ae26d7ba186fb3420ab2fde5cb4f1937298b69228b4787058", + "0x0000000000000000000000008c13d7add034a9e1bd8280225efab7584c5e85a6", + "0x0000000000000000000000000000000000000000000000000000000000000001" + ], + "data": "0x", + "blockHash": "0x6c5177aad37652ac0dc3a24734e657acf95626305ad47e9ef9468550e151cc5d", + "blockNumber": "0x143bd01", + "transactionHash": "0x2640a89c4043e38eb5005408e40bd0d713038538a7255bbc3dad2557b61ba608", + "transactionIndex": "0x86", + "logIndex": "0x1cd", + "removed": false + } + ], + "logsBloom": "0x00000000000000000001000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000040000040001000000040000000000000000000000000000040000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000200000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0x2640a89c4043e38eb5005408e40bd0d713038538a7255bbc3dad2557b61ba608", + "transactionIndex": "0x86", + "blockHash": "0x6c5177aad37652ac0dc3a24734e657acf95626305ad47e9ef9468550e151cc5d", + "blockNumber": "0x143bd01", + "gasUsed": "0xce4c", + "effectiveGasPrice": "0x45fc3feaa", + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0xa000000eaa652c7023530b603844471294b811c4", + "contractAddress": null + } + ], + "libraries": [], + "pending": [], + "returns": {}, + "timestamp": 1731955928, + "chain": 1, + "commit": "076a1a2" +} \ No newline at end of file diff --git a/broadcast/145-upgrade_access_protocol.s.sol/1/run-latest.json b/broadcast/145-upgrade_access_protocol.s.sol/1/run-latest.json index 4b3e766d..32997c21 100644 --- a/broadcast/145-upgrade_access_protocol.s.sol/1/run-latest.json +++ b/broadcast/145-upgrade_access_protocol.s.sol/1/run-latest.json @@ -1,10 +1,29 @@ { "transactions": [ { - "hash": "0xfdcfad133497182cf783a257afef2227cb7e8f1ba208f1989f087e0e8eacc000", + "hash": "0x4c4a492f80690ac4ed15198d394ec14c20d62765e83e3d69faeb35d86e38f0e9", + "transactionType": "CALL", + "contractName": "UUPSProxy", + "contractAddress": "0xa000000eaa652c7023530b603844471294b811c4", + "function": null, + "arguments": null, + "transaction": { + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0xa000000eaa652c7023530b603844471294b811c4", + "gas": "0x11cf1", + "value": "0x0", + "input": "0x0bf919fc0000000000000000000000005aadfb43ef8daf45dd80f4676345b7676f1d70e3", + "nonce": "0x309", + "chainId": "0x1" + }, + "additionalContracts": [], + "isFixedGasLimit": false + }, + { + "hash": "0x340a937fd690cea5d9083586a5d510bb87fb4fbd74d29225f5aaa4358e78ccf1", "transactionType": "CREATE", - "contractName": "AaveWithdrawWorkflow", - "contractAddress": "0xb4d3004b5e56d236977e9153f4689cf10e4ff723", + "contractName": "AaveBorrowWorkflow", + "contractAddress": "0x8c13d7add034a9e1bd8280225efab7584c5e85a6", "function": null, "arguments": [ "0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e", @@ -12,17 +31,17 @@ ], "transaction": { "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", - "gas": "0xebe11", + "gas": "0xb8e39", "value": "0x0", - "input": "0x60c060405234801561001057600080fd5b50604051610d48380380610d4883398101604081905261002f91610062565b6001600160a01b039182166080521660a052610095565b80516001600160a01b038116811461005d57600080fd5b919050565b6000806040838503121561007557600080fd5b61007e83610046565b915061008c60208401610046565b90509250929050565b60805160a051610c746100d460003960008181605601528181610135015281816101c0015261020b01526000818160a7015261029a0152610c746000f3fe60806040526004361061003f5760003560e01c80634d47fc85146100445780636268461614610095578063dbb4e148146100c9578063f3fef3a3146100ea575b600080fd5b34801561005057600080fd5b506100787f000000000000000000000000000000000000000000000000000000000000000081565b6040516001600160a01b0390911681526020015b60405180910390f35b3480156100a157600080fd5b506100787f000000000000000000000000000000000000000000000000000000000000000081565b6100dc6100d7366004610793565b61010c565b60405190815260200161008c565b3480156100f657600080fd5b5061010a610105366004610804565b610296565b005b60006101188585610296565b604051636eb1769f60e11b81523060048201526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000008116602483015285919087169063dd62ed3e90604401602060405180830381865afa158015610187573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ab9190610830565b10156101e7576101e76001600160a01b0386167f0000000000000000000000000000000000000000000000000000000000000000600019610480565b6040805160208101825260008152905163e48e2d8f60e01b81526001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169163e48e2d8f9161024a91899189918991849184918b906004016108e3565b6020604051808303816000875af1158015610269573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028d9190610830565b95945050505050565b60007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663026b1d5f6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156102f6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061031a91906109f1565b90506000198203610401576040516335ea6a7560e01b81526001600160a01b0384811660048301528216906335ea6a75906024016101e060405180830381865afa15801561036c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103909190610add565b61010001516040516370a0823160e01b81523060048201526001600160a01b03909116906370a0823190602401602060405180830381865afa1580156103da573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103fe9190610830565b91505b604051631a4ca37b60e21b81526001600160a01b038481166004830152602482018490523060448301528216906369328dec906064016020604051808303816000875af1158015610456573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061047a9190610830565b50505050565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b1790526104d18482610534565b61047a57604080516001600160a01b038516602482015260006044808301919091528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b17905261052a9085906105d7565b61047a84826105d7565b6000806000846001600160a01b0316846040516105519190610c00565b6000604051808303816000865af19150503d806000811461058e576040519150601f19603f3d011682016040523d82523d6000602084013e610593565b606091505b50915091508180156105bd5750805115806105bd5750808060200190518101906105bd9190610c1c565b801561028d5750505050506001600160a01b03163b151590565b60006105ec6001600160a01b03841683610644565b9050805160001415801561061157508080602001905181019061060f9190610c1c565b155b1561063f57604051635274afe760e01b81526001600160a01b03841660048201526024015b60405180910390fd5b505050565b606061065283836000610659565b9392505050565b60608147101561067e5760405163cd78605960e01b8152306004820152602401610636565b600080856001600160a01b0316848660405161069a9190610c00565b60006040518083038185875af1925050503d80600081146106d7576040519150601f19603f3d011682016040523d82523d6000602084013e6106dc565b606091505b50915091506106ec8683836106f6565b9695505050505050565b60608261070b5761070682610752565b610652565b815115801561072257506001600160a01b0384163b155b1561074b57604051639996b31560e01b81526001600160a01b0385166004820152602401610636565b5080610652565b8051156107625780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b50565b6001600160a01b038116811461077b57600080fd5b600080600080608085870312156107a957600080fd5b84356107b48161077e565b93506020850135925060408501356107cb8161077e565b9150606085013567ffffffffffffffff8111156107e757600080fd5b850160c081880312156107f957600080fd5b939692955090935050565b6000806040838503121561081757600080fd5b82356108228161077e565b946020939093013593505050565b60006020828403121561084257600080fd5b5051919050565b60005b8381101561086457818101518382015260200161084c565b50506000910152565b6000808335601e1984360301811261088457600080fd5b830160208101925035905067ffffffffffffffff8111156108a457600080fd5b8036038213156108b357600080fd5b9250929050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b600060018060a01b03808a1683528860208401528088166040840152808716606084015285608084015260e060a084015284518060e085015261010061092f8282870160208a01610849565b601f19601f83011685019150808583030160c086015285356109508161077e565b83169082015260208501356101208201526040850135610140820152606085013561097a8161077e565b821661016082015261098f608086018661086d565b925060c06101808301526109a86101c0830184836108ba565b9250506109b860a086018661086d565b82840360ff19016101a08401526109d08482846108ba565b9d9c50505050505050505050505050565b80516109ec8161077e565b919050565b600060208284031215610a0357600080fd5b81516106528161077e565b6040516101e0810167ffffffffffffffff81118282101715610a4057634e487b7160e01b600052604160045260246000fd5b60405290565b600060208284031215610a5857600080fd5b6040516020810181811067ffffffffffffffff82111715610a8957634e487b7160e01b600052604160045260246000fd5b6040529151825250919050565b80516fffffffffffffffffffffffffffffffff811681146109ec57600080fd5b805164ffffffffff811681146109ec57600080fd5b805161ffff811681146109ec57600080fd5b60006101e08284031215610af057600080fd5b610af8610a0e565b610b028484610a46565b8152610b1060208401610a96565b6020820152610b2160408401610a96565b6040820152610b3260608401610a96565b6060820152610b4360808401610a96565b6080820152610b5460a08401610a96565b60a0820152610b6560c08401610ab6565b60c0820152610b7660e08401610acb565b60e0820152610100610b898185016109e1565b90820152610120610b9b8482016109e1565b90820152610140610bad8482016109e1565b90820152610160610bbf8482016109e1565b90820152610180610bd1848201610a96565b908201526101a0610be3848201610a96565b908201526101c0610bf5848201610a96565b908201529392505050565b60008251610c12818460208701610849565b9190910192915050565b600060208284031215610c2e57600080fd5b8151801515811461065257600080fdfea2646970667358221220d5ae2937a849a1bb129d49d213f210b198cf5930255eb59a7f30fe1c91351db764736f6c634300081800330000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e0000000000000000000000000f1b7bd7762662b23486320aa91f30312184f70c", - "nonce": "0x306", + "input": "0x60c060405234801561001057600080fd5b50604051610a60380380610a6083398101604081905261002f91610062565b6001600160a01b039182166080521660a052610095565b80516001600160a01b038116811461005d57600080fd5b919050565b6000806040838503121561007557600080fd5b61007e83610046565b915061008c60208401610046565b90509250929050565b60805160a05161098c6100d460003960008181609e01528181610135015281816101c0015261020b01526000818160ea0152610298015261098c6000f3fe60806040526004361061003f5760003560e01c806316452c26146100445780634b8a35291461006a5780634d47fc851461008c57806362684616146100d8575b600080fd5b6100576100523660046106ad565b61010c565b6040519081526020015b60405180910390f35b34801561007657600080fd5b5061008a61008536600461071e565b610296565b005b34801561009857600080fd5b506100c07f000000000000000000000000000000000000000000000000000000000000000081565b6040516001600160a01b039091168152602001610061565b3480156100e457600080fd5b506100c07f000000000000000000000000000000000000000000000000000000000000000081565b60006101188585610296565b604051636eb1769f60e11b81523060048201526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000008116602483015285919087169063dd62ed3e90604401602060405180830381865afa158015610187573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ab919061074a565b10156101e7576101e76001600160a01b0386167f0000000000000000000000000000000000000000000000000000000000000000600019610394565b6040805160208101825260008152905163e48e2d8f60e01b81526001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169163e48e2d8f9161024a91899189918991849184918b906004016107fd565b6020604051808303816000875af1158015610269573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028d919061074a565b95945050505050565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663026b1d5f6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156102f4573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061031891906108fb565b60405163a415bcad60e01b81526001600160a01b038481166004830152602482018490526002604483015260006064830152306084830152919091169063a415bcad9060a401600060405180830381600087803b15801561037857600080fd5b505af115801561038c573d6000803e3d6000fd5b505050505050565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b1790526103e5848261044e565b61044857604080516001600160a01b038516602482015260006044808301919091528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b17905261043e9085906104f1565b61044884826104f1565b50505050565b6000806000846001600160a01b03168460405161046b9190610918565b6000604051808303816000865af19150503d80600081146104a8576040519150601f19603f3d011682016040523d82523d6000602084013e6104ad565b606091505b50915091508180156104d75750805115806104d75750808060200190518101906104d79190610934565b801561028d5750505050506001600160a01b03163b151590565b60006105066001600160a01b0384168361055e565b9050805160001415801561052b5750808060200190518101906105299190610934565b155b1561055957604051635274afe760e01b81526001600160a01b03841660048201526024015b60405180910390fd5b505050565b606061056c83836000610573565b9392505050565b6060814710156105985760405163cd78605960e01b8152306004820152602401610550565b600080856001600160a01b031684866040516105b49190610918565b60006040518083038185875af1925050503d80600081146105f1576040519150601f19603f3d011682016040523d82523d6000602084013e6105f6565b606091505b5091509150610606868383610610565b9695505050505050565b606082610625576106208261066c565b61056c565b815115801561063c57506001600160a01b0384163b155b1561066557604051639996b31560e01b81526001600160a01b0385166004820152602401610550565b508061056c565b80511561067c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b50565b6001600160a01b038116811461069557600080fd5b600080600080608085870312156106c357600080fd5b84356106ce81610698565b93506020850135925060408501356106e581610698565b9150606085013567ffffffffffffffff81111561070157600080fd5b850160c0818803121561071357600080fd5b939692955090935050565b6000806040838503121561073157600080fd5b823561073c81610698565b946020939093013593505050565b60006020828403121561075c57600080fd5b5051919050565b60005b8381101561077e578181015183820152602001610766565b50506000910152565b6000808335601e1984360301811261079e57600080fd5b830160208101925035905067ffffffffffffffff8111156107be57600080fd5b8036038213156107cd57600080fd5b9250929050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b600060018060a01b03808a1683528860208401528088166040840152808716606084015285608084015260e060a084015284518060e08501526101006108498282870160208a01610763565b601f19601f83011685019150808583030160c0860152853561086a81610698565b83169082015260208501356101208201526040850135610140820152606085013561089481610698565b82166101608201526108a96080860186610787565b925060c06101808301526108c26101c0830184836107d4565b9250506108d260a0860186610787565b82840360ff19016101a08401526108ea8482846107d4565b9d9c50505050505050505050505050565b60006020828403121561090d57600080fd5b815161056c81610698565b6000825161092a818460208701610763565b9190910192915050565b60006020828403121561094657600080fd5b8151801515811461056c57600080fdfea26469706673582212206813f75d027189c2c6cd6f9856bdf4ef085cef910ced1304279337ffe324d0f464736f6c634300081800330000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e0000000000000000000000000f1b7bd7762662b23486320aa91f30312184f70c", + "nonce": "0x30a", "chainId": "0x1" }, "additionalContracts": [], "isFixedGasLimit": false }, { - "hash": "0xd813eea4fddcd0eb8763bec8bc9261892bd18fd8e4921a85f45890920fd148fb", + "hash": "0x2640a89c4043e38eb5005408e40bd0d713038538a7255bbc3dad2557b61ba608", "transactionType": "CALL", "contractName": "UUPSProxy", "contractAddress": "0xa000000eaa652c7023530b603844471294b811c4", @@ -31,10 +50,10 @@ "transaction": { "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", "to": "0xa000000eaa652c7023530b603844471294b811c4", - "gas": "0x11ce2", + "gas": "0x11cf1", "value": "0x0", - "input": "0x0bf919fc000000000000000000000000b4d3004b5e56d236977e9153f4689cf10e4ff723", - "nonce": "0x307", + "input": "0x0bf919fc0000000000000000000000008c13d7add034a9e1bd8280225efab7584c5e85a6", + "nonce": "0x30b", "chainId": "0x1" }, "additionalContracts": [], @@ -44,48 +63,80 @@ "receipts": [ { "status": "0x1", - "cumulativeGasUsed": "0xc45035", + "cumulativeGasUsed": "0xa6ef52", + "logs": [ + { + "address": "0xa000000eaa652c7023530b603844471294b811c4", + "topics": [ + "0x4330c9a27379ee1ae26d7ba186fb3420ab2fde5cb4f1937298b69228b4787058", + "0x0000000000000000000000005aadfb43ef8daf45dd80f4676345b7676f1d70e3", + "0x0000000000000000000000000000000000000000000000000000000000000001" + ], + "data": "0x", + "blockHash": "0xc3fe71da992fb26d7780866194d190597ccd2959108c72f1efe33a9f87637328", + "blockNumber": "0x143bcff", + "transactionHash": "0x4c4a492f80690ac4ed15198d394ec14c20d62765e83e3d69faeb35d86e38f0e9", + "transactionIndex": "0x4b", + "logIndex": "0xd0", + "removed": false + } + ], + "logsBloom": "0x00000000000000000001000000000000000000000000400000000002000000000000000000000000000000000000000000000000000000000000000000040000040001000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000200000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0x4c4a492f80690ac4ed15198d394ec14c20d62765e83e3d69faeb35d86e38f0e9", + "transactionIndex": "0x4b", + "blockHash": "0xc3fe71da992fb26d7780866194d190597ccd2959108c72f1efe33a9f87637328", + "blockNumber": "0x143bcff", + "gasUsed": "0xce4c", + "effectiveGasPrice": "0x44a3af59e", + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0xa000000eaa652c7023530b603844471294b811c4", + "contractAddress": null + }, + { + "status": "0x1", + "cumulativeGasUsed": "0x9225b6", "logs": [], "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "type": "0x2", - "transactionHash": "0xfdcfad133497182cf783a257afef2227cb7e8f1ba208f1989f087e0e8eacc000", - "transactionIndex": "0x8c", - "blockHash": "0x00b90d46c7a757b2369c6f7887a8f5fc3a074ad36f9b5ce979df0c129fc2568a", - "blockNumber": "0x1436ec6", - "gasUsed": "0xb57fb", - "effectiveGasPrice": "0x38a673401", + "transactionHash": "0x340a937fd690cea5d9083586a5d510bb87fb4fbd74d29225f5aaa4358e78ccf1", + "transactionIndex": "0x44", + "blockHash": "0xf7a2318cd91e340d2d395a8d88ae2a39c04183df977ca225fd8ae6ff251941ff", + "blockNumber": "0x143bd00", + "gasUsed": "0x8e439", + "effectiveGasPrice": "0x4538edd7e", "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", "to": null, - "contractAddress": "0xb4d3004b5e56d236977e9153f4689cf10e4ff723" + "contractAddress": "0x8c13d7add034a9e1bd8280225efab7584c5e85a6" }, { "status": "0x1", - "cumulativeGasUsed": "0x68a397", + "cumulativeGasUsed": "0xe58e79", "logs": [ { "address": "0xa000000eaa652c7023530b603844471294b811c4", "topics": [ "0x4330c9a27379ee1ae26d7ba186fb3420ab2fde5cb4f1937298b69228b4787058", - "0x000000000000000000000000b4d3004b5e56d236977e9153f4689cf10e4ff723", + "0x0000000000000000000000008c13d7add034a9e1bd8280225efab7584c5e85a6", "0x0000000000000000000000000000000000000000000000000000000000000001" ], "data": "0x", - "blockHash": "0xa1e320fe3efb5b5cd85a79041212bbf96930e0f169b5a56204e57cbe383a7092", - "blockNumber": "0x1436ec7", - "transactionHash": "0xd813eea4fddcd0eb8763bec8bc9261892bd18fd8e4921a85f45890920fd148fb", - "transactionIndex": "0x66", - "logIndex": "0x9a", + "blockHash": "0x6c5177aad37652ac0dc3a24734e657acf95626305ad47e9ef9468550e151cc5d", + "blockNumber": "0x143bd01", + "transactionHash": "0x2640a89c4043e38eb5005408e40bd0d713038538a7255bbc3dad2557b61ba608", + "transactionIndex": "0x86", + "logIndex": "0x1cd", "removed": false } ], - "logsBloom": "0x00000000000000000001000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000040000040001000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000100000000000000000000200000000000000000000000000000000000000000000040000000000000000000000000000000800000000000000000000000000000000000", + "logsBloom": "0x00000000000000000001000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000040000040001000000040000000000000000000000000000040000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000200000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000", "type": "0x2", - "transactionHash": "0xd813eea4fddcd0eb8763bec8bc9261892bd18fd8e4921a85f45890920fd148fb", - "transactionIndex": "0x66", - "blockHash": "0xa1e320fe3efb5b5cd85a79041212bbf96930e0f169b5a56204e57cbe383a7092", - "blockNumber": "0x1436ec7", - "gasUsed": "0xce40", - "effectiveGasPrice": "0x381cf4c1d", + "transactionHash": "0x2640a89c4043e38eb5005408e40bd0d713038538a7255bbc3dad2557b61ba608", + "transactionIndex": "0x86", + "blockHash": "0x6c5177aad37652ac0dc3a24734e657acf95626305ad47e9ef9468550e151cc5d", + "blockNumber": "0x143bd01", + "gasUsed": "0xce4c", + "effectiveGasPrice": "0x45fc3feaa", "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", "to": "0xa000000eaa652c7023530b603844471294b811c4", "contractAddress": null @@ -94,7 +145,7 @@ "libraries": [], "pending": [], "returns": {}, - "timestamp": 1731714690, + "timestamp": 1731955928, "chain": 1, - "commit": "fa932d7" + "commit": "076a1a2" } \ No newline at end of file diff --git a/broadcast/145-upgrade_access_protocol.s.sol/42161/run-1731955678.json b/broadcast/145-upgrade_access_protocol.s.sol/42161/run-1731955678.json new file mode 100644 index 00000000..df8feadc --- /dev/null +++ b/broadcast/145-upgrade_access_protocol.s.sol/42161/run-1731955678.json @@ -0,0 +1,157 @@ +{ + "transactions": [ + { + "hash": "0x96d1db6af42ec1c7f5e498dd55d5d3413ef2d265a5d726bc2811b734b9caa990", + "transactionType": "CALL", + "contractName": "UUPSProxy", + "contractAddress": "0xa000000eaa652c7023530b603844471294b811c4", + "function": null, + "arguments": null, + "transaction": { + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0xa000000eaa652c7023530b603844471294b811c4", + "gas": "0x2f89a", + "value": "0x0", + "input": "0x0bf919fc0000000000000000000000005aadfb43ef8daf45dd80f4676345b7676f1d70e3", + "nonce": "0x291", + "chainId": "0xa4b1" + }, + "additionalContracts": [], + "isFixedGasLimit": false + }, + { + "hash": "0x0fefa8c3853aa740dc947e39e81cd81d7aee89cef5b083c34dd3de329a6da5ff", + "transactionType": "CREATE", + "contractName": "AaveBorrowWorkflow", + "contractAddress": "0xd0187ca378f7b26d53e0a91fbe8d7ba80498ef10", + "function": null, + "arguments": [ + "0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb", + "0xb7DfE09Cf3950141DFb7DB8ABca90dDef8d06Ec0" + ], + "transaction": { + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "gas": "0x1e90a7", + "value": "0x0", + "input": "0x60c060405234801561001057600080fd5b50604051610a60380380610a6083398101604081905261002f91610062565b6001600160a01b039182166080521660a052610095565b80516001600160a01b038116811461005d57600080fd5b919050565b6000806040838503121561007557600080fd5b61007e83610046565b915061008c60208401610046565b90509250929050565b60805160a05161098c6100d460003960008181609e01528181610135015281816101c0015261020b01526000818160ea0152610298015261098c6000f3fe60806040526004361061003f5760003560e01c806316452c26146100445780634b8a35291461006a5780634d47fc851461008c57806362684616146100d8575b600080fd5b6100576100523660046106ad565b61010c565b6040519081526020015b60405180910390f35b34801561007657600080fd5b5061008a61008536600461071e565b610296565b005b34801561009857600080fd5b506100c07f000000000000000000000000000000000000000000000000000000000000000081565b6040516001600160a01b039091168152602001610061565b3480156100e457600080fd5b506100c07f000000000000000000000000000000000000000000000000000000000000000081565b60006101188585610296565b604051636eb1769f60e11b81523060048201526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000008116602483015285919087169063dd62ed3e90604401602060405180830381865afa158015610187573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ab919061074a565b10156101e7576101e76001600160a01b0386167f0000000000000000000000000000000000000000000000000000000000000000600019610394565b6040805160208101825260008152905163e48e2d8f60e01b81526001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169163e48e2d8f9161024a91899189918991849184918b906004016107fd565b6020604051808303816000875af1158015610269573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028d919061074a565b95945050505050565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663026b1d5f6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156102f4573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061031891906108fb565b60405163a415bcad60e01b81526001600160a01b038481166004830152602482018490526002604483015260006064830152306084830152919091169063a415bcad9060a401600060405180830381600087803b15801561037857600080fd5b505af115801561038c573d6000803e3d6000fd5b505050505050565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b1790526103e5848261044e565b61044857604080516001600160a01b038516602482015260006044808301919091528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b17905261043e9085906104f1565b61044884826104f1565b50505050565b6000806000846001600160a01b03168460405161046b9190610918565b6000604051808303816000865af19150503d80600081146104a8576040519150601f19603f3d011682016040523d82523d6000602084013e6104ad565b606091505b50915091508180156104d75750805115806104d75750808060200190518101906104d79190610934565b801561028d5750505050506001600160a01b03163b151590565b60006105066001600160a01b0384168361055e565b9050805160001415801561052b5750808060200190518101906105299190610934565b155b1561055957604051635274afe760e01b81526001600160a01b03841660048201526024015b60405180910390fd5b505050565b606061056c83836000610573565b9392505050565b6060814710156105985760405163cd78605960e01b8152306004820152602401610550565b600080856001600160a01b031684866040516105b49190610918565b60006040518083038185875af1925050503d80600081146105f1576040519150601f19603f3d011682016040523d82523d6000602084013e6105f6565b606091505b5091509150610606868383610610565b9695505050505050565b606082610625576106208261066c565b61056c565b815115801561063c57506001600160a01b0384163b155b1561066557604051639996b31560e01b81526001600160a01b0385166004820152602401610550565b508061056c565b80511561067c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b50565b6001600160a01b038116811461069557600080fd5b600080600080608085870312156106c357600080fd5b84356106ce81610698565b93506020850135925060408501356106e581610698565b9150606085013567ffffffffffffffff81111561070157600080fd5b850160c0818803121561071357600080fd5b939692955090935050565b6000806040838503121561073157600080fd5b823561073c81610698565b946020939093013593505050565b60006020828403121561075c57600080fd5b5051919050565b60005b8381101561077e578181015183820152602001610766565b50506000910152565b6000808335601e1984360301811261079e57600080fd5b830160208101925035905067ffffffffffffffff8111156107be57600080fd5b8036038213156107cd57600080fd5b9250929050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b600060018060a01b03808a1683528860208401528088166040840152808716606084015285608084015260e060a084015284518060e08501526101006108498282870160208a01610763565b601f19601f83011685019150808583030160c0860152853561086a81610698565b83169082015260208501356101208201526040850135610140820152606085013561089481610698565b82166101608201526108a96080860186610787565b925060c06101808301526108c26101c0830184836107d4565b9250506108d260a0860186610787565b82840360ff19016101a08401526108ea8482846107d4565b9d9c50505050505050505050505050565b60006020828403121561090d57600080fd5b815161056c81610698565b6000825161092a818460208701610763565b9190910192915050565b60006020828403121561094657600080fd5b8151801515811461056c57600080fdfea26469706673582212206813f75d027189c2c6cd6f9856bdf4ef085cef910ced1304279337ffe324d0f464736f6c63430008180033000000000000000000000000a97684ead0e402dc232d5a977953df7ecbab3cdb000000000000000000000000b7dfe09cf3950141dfb7db8abca90ddef8d06ec0", + "nonce": "0x292", + "chainId": "0xa4b1" + }, + "additionalContracts": [], + "isFixedGasLimit": false + }, + { + "hash": "0x39a1bde764790a7770221376a3b512f39a4378f4e3cc9e1de9f0a3c8ba69fd8c", + "transactionType": "CALL", + "contractName": "UUPSProxy", + "contractAddress": "0xa000000eaa652c7023530b603844471294b811c4", + "function": null, + "arguments": null, + "transaction": { + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0xa000000eaa652c7023530b603844471294b811c4", + "gas": "0x2f109", + "value": "0x0", + "input": "0x0bf919fc000000000000000000000000d0187ca378f7b26d53e0a91fbe8d7ba80498ef10", + "nonce": "0x293", + "chainId": "0xa4b1" + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [ + { + "status": "0x1", + "cumulativeGasUsed": "0x116c3f", + "logs": [ + { + "address": "0xa000000eaa652c7023530b603844471294b811c4", + "topics": [ + "0x4330c9a27379ee1ae26d7ba186fb3420ab2fde5cb4f1937298b69228b4787058", + "0x0000000000000000000000005aadfb43ef8daf45dd80f4676345b7676f1d70e3", + "0x0000000000000000000000000000000000000000000000000000000000000001" + ], + "data": "0x", + "blockHash": "0x6d109f48c73d108e23def247845615ff07b3aa925dea7390d67e0006645c004d", + "blockNumber": "0x10710d7f", + "transactionHash": "0x96d1db6af42ec1c7f5e498dd55d5d3413ef2d265a5d726bc2811b734b9caa990", + "transactionIndex": "0x6", + "logIndex": "0x10", + "removed": false + } + ], + "logsBloom": "0x00000000000000000001000000000000000000000000400000000002000000000000000000000000000000000000000000000000000000000000000000040000040001000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000200000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0x96d1db6af42ec1c7f5e498dd55d5d3413ef2d265a5d726bc2811b734b9caa990", + "transactionIndex": "0x6", + "blockHash": "0x6d109f48c73d108e23def247845615ff07b3aa925dea7390d67e0006645c004d", + "blockNumber": "0x10710d7f", + "gasUsed": "0x1c613", + "effectiveGasPrice": "0xe37290", + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0xa000000eaa652c7023530b603844471294b811c4", + "contractAddress": null, + "gasUsedForL1": "0xf7c7", + "l1BlockNumber": "0x143bceb" + }, + { + "status": "0x1", + "cumulativeGasUsed": "0x26a8f8", + "logs": [], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0x0fefa8c3853aa740dc947e39e81cd81d7aee89cef5b083c34dd3de329a6da5ff", + "transactionIndex": "0x3", + "blockHash": "0xe2a340574eba86fd732058c0e87657a23e800297acc41c2139e3d5af4ecb450e", + "blockNumber": "0x10710d84", + "gasUsed": "0x141fd0", + "effectiveGasPrice": "0xe26cd8", + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": null, + "contractAddress": "0xd0187ca378f7b26d53e0a91fbe8d7ba80498ef10", + "gasUsedForL1": "0xb3b97", + "l1BlockNumber": "0x143bceb" + }, + { + "status": "0x1", + "cumulativeGasUsed": "0x1c804", + "logs": [ + { + "address": "0xa000000eaa652c7023530b603844471294b811c4", + "topics": [ + "0x4330c9a27379ee1ae26d7ba186fb3420ab2fde5cb4f1937298b69228b4787058", + "0x000000000000000000000000d0187ca378f7b26d53e0a91fbe8d7ba80498ef10", + "0x0000000000000000000000000000000000000000000000000000000000000001" + ], + "data": "0x", + "blockHash": "0xa894b88c0efa129fbcdc9b363ed9ab3c41bb3cc3b004b876411306e6deb45123", + "blockNumber": "0x10710d89", + "transactionHash": "0x39a1bde764790a7770221376a3b512f39a4378f4e3cc9e1de9f0a3c8ba69fd8c", + "transactionIndex": "0x1", + "logIndex": "0x0", + "removed": false + } + ], + "logsBloom": "0x00000000000000000001000000000000000000000000400000000000020000000000000000000000000000000000000000000000000000000000000000040000040001000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000100000000000000000000000000200000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000020000000", + "type": "0x2", + "transactionHash": "0x39a1bde764790a7770221376a3b512f39a4378f4e3cc9e1de9f0a3c8ba69fd8c", + "transactionIndex": "0x1", + "blockHash": "0xa894b88c0efa129fbcdc9b363ed9ab3c41bb3cc3b004b876411306e6deb45123", + "blockNumber": "0x10710d89", + "gasUsed": "0x1c804", + "effectiveGasPrice": "0xe1ad70", + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0xa000000eaa652c7023530b603844471294b811c4", + "contractAddress": null, + "gasUsedForL1": "0xf9b8", + "l1BlockNumber": "0x143bceb" + } + ], + "libraries": [], + "pending": [], + "returns": {}, + "timestamp": 1731955678, + "chain": 42161, + "commit": "076a1a2" +} \ No newline at end of file diff --git a/broadcast/145-upgrade_access_protocol.s.sol/42161/run-latest.json b/broadcast/145-upgrade_access_protocol.s.sol/42161/run-latest.json index 3269a3db..df8feadc 100644 --- a/broadcast/145-upgrade_access_protocol.s.sol/42161/run-latest.json +++ b/broadcast/145-upgrade_access_protocol.s.sol/42161/run-latest.json @@ -1,10 +1,29 @@ { "transactions": [ { - "hash": "0x91a7d7a8b5473a701cb972996159eb7ec1ba10d9acc1ed1c00755ca1a82202d9", + "hash": "0x96d1db6af42ec1c7f5e498dd55d5d3413ef2d265a5d726bc2811b734b9caa990", + "transactionType": "CALL", + "contractName": "UUPSProxy", + "contractAddress": "0xa000000eaa652c7023530b603844471294b811c4", + "function": null, + "arguments": null, + "transaction": { + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0xa000000eaa652c7023530b603844471294b811c4", + "gas": "0x2f89a", + "value": "0x0", + "input": "0x0bf919fc0000000000000000000000005aadfb43ef8daf45dd80f4676345b7676f1d70e3", + "nonce": "0x291", + "chainId": "0xa4b1" + }, + "additionalContracts": [], + "isFixedGasLimit": false + }, + { + "hash": "0x0fefa8c3853aa740dc947e39e81cd81d7aee89cef5b083c34dd3de329a6da5ff", "transactionType": "CREATE", - "contractName": "AaveWithdrawWorkflow", - "contractAddress": "0xef4d6687372172c4af1802c208ab40673b014309", + "contractName": "AaveBorrowWorkflow", + "contractAddress": "0xd0187ca378f7b26d53e0a91fbe8d7ba80498ef10", "function": null, "arguments": [ "0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb", @@ -12,17 +31,17 @@ ], "transaction": { "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", - "gas": "0x2736ef", + "gas": "0x1e90a7", "value": "0x0", - "input": "0x60c060405234801561001057600080fd5b50604051610d48380380610d4883398101604081905261002f91610062565b6001600160a01b039182166080521660a052610095565b80516001600160a01b038116811461005d57600080fd5b919050565b6000806040838503121561007557600080fd5b61007e83610046565b915061008c60208401610046565b90509250929050565b60805160a051610c746100d460003960008181605601528181610135015281816101c0015261020b01526000818160a7015261029a0152610c746000f3fe60806040526004361061003f5760003560e01c80634d47fc85146100445780636268461614610095578063dbb4e148146100c9578063f3fef3a3146100ea575b600080fd5b34801561005057600080fd5b506100787f000000000000000000000000000000000000000000000000000000000000000081565b6040516001600160a01b0390911681526020015b60405180910390f35b3480156100a157600080fd5b506100787f000000000000000000000000000000000000000000000000000000000000000081565b6100dc6100d7366004610793565b61010c565b60405190815260200161008c565b3480156100f657600080fd5b5061010a610105366004610804565b610296565b005b60006101188585610296565b604051636eb1769f60e11b81523060048201526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000008116602483015285919087169063dd62ed3e90604401602060405180830381865afa158015610187573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ab9190610830565b10156101e7576101e76001600160a01b0386167f0000000000000000000000000000000000000000000000000000000000000000600019610480565b6040805160208101825260008152905163e48e2d8f60e01b81526001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169163e48e2d8f9161024a91899189918991849184918b906004016108e3565b6020604051808303816000875af1158015610269573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028d9190610830565b95945050505050565b60007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663026b1d5f6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156102f6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061031a91906109f1565b90506000198203610401576040516335ea6a7560e01b81526001600160a01b0384811660048301528216906335ea6a75906024016101e060405180830381865afa15801561036c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103909190610add565b61010001516040516370a0823160e01b81523060048201526001600160a01b03909116906370a0823190602401602060405180830381865afa1580156103da573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103fe9190610830565b91505b604051631a4ca37b60e21b81526001600160a01b038481166004830152602482018490523060448301528216906369328dec906064016020604051808303816000875af1158015610456573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061047a9190610830565b50505050565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b1790526104d18482610534565b61047a57604080516001600160a01b038516602482015260006044808301919091528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b17905261052a9085906105d7565b61047a84826105d7565b6000806000846001600160a01b0316846040516105519190610c00565b6000604051808303816000865af19150503d806000811461058e576040519150601f19603f3d011682016040523d82523d6000602084013e610593565b606091505b50915091508180156105bd5750805115806105bd5750808060200190518101906105bd9190610c1c565b801561028d5750505050506001600160a01b03163b151590565b60006105ec6001600160a01b03841683610644565b9050805160001415801561061157508080602001905181019061060f9190610c1c565b155b1561063f57604051635274afe760e01b81526001600160a01b03841660048201526024015b60405180910390fd5b505050565b606061065283836000610659565b9392505050565b60608147101561067e5760405163cd78605960e01b8152306004820152602401610636565b600080856001600160a01b0316848660405161069a9190610c00565b60006040518083038185875af1925050503d80600081146106d7576040519150601f19603f3d011682016040523d82523d6000602084013e6106dc565b606091505b50915091506106ec8683836106f6565b9695505050505050565b60608261070b5761070682610752565b610652565b815115801561072257506001600160a01b0384163b155b1561074b57604051639996b31560e01b81526001600160a01b0385166004820152602401610636565b5080610652565b8051156107625780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b50565b6001600160a01b038116811461077b57600080fd5b600080600080608085870312156107a957600080fd5b84356107b48161077e565b93506020850135925060408501356107cb8161077e565b9150606085013567ffffffffffffffff8111156107e757600080fd5b850160c081880312156107f957600080fd5b939692955090935050565b6000806040838503121561081757600080fd5b82356108228161077e565b946020939093013593505050565b60006020828403121561084257600080fd5b5051919050565b60005b8381101561086457818101518382015260200161084c565b50506000910152565b6000808335601e1984360301811261088457600080fd5b830160208101925035905067ffffffffffffffff8111156108a457600080fd5b8036038213156108b357600080fd5b9250929050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b600060018060a01b03808a1683528860208401528088166040840152808716606084015285608084015260e060a084015284518060e085015261010061092f8282870160208a01610849565b601f19601f83011685019150808583030160c086015285356109508161077e565b83169082015260208501356101208201526040850135610140820152606085013561097a8161077e565b821661016082015261098f608086018661086d565b925060c06101808301526109a86101c0830184836108ba565b9250506109b860a086018661086d565b82840360ff19016101a08401526109d08482846108ba565b9d9c50505050505050505050505050565b80516109ec8161077e565b919050565b600060208284031215610a0357600080fd5b81516106528161077e565b6040516101e0810167ffffffffffffffff81118282101715610a4057634e487b7160e01b600052604160045260246000fd5b60405290565b600060208284031215610a5857600080fd5b6040516020810181811067ffffffffffffffff82111715610a8957634e487b7160e01b600052604160045260246000fd5b6040529151825250919050565b80516fffffffffffffffffffffffffffffffff811681146109ec57600080fd5b805164ffffffffff811681146109ec57600080fd5b805161ffff811681146109ec57600080fd5b60006101e08284031215610af057600080fd5b610af8610a0e565b610b028484610a46565b8152610b1060208401610a96565b6020820152610b2160408401610a96565b6040820152610b3260608401610a96565b6060820152610b4360808401610a96565b6080820152610b5460a08401610a96565b60a0820152610b6560c08401610ab6565b60c0820152610b7660e08401610acb565b60e0820152610100610b898185016109e1565b90820152610120610b9b8482016109e1565b90820152610140610bad8482016109e1565b90820152610160610bbf8482016109e1565b90820152610180610bd1848201610a96565b908201526101a0610be3848201610a96565b908201526101c0610bf5848201610a96565b908201529392505050565b60008251610c12818460208701610849565b9190910192915050565b600060208284031215610c2e57600080fd5b8151801515811461065257600080fdfea2646970667358221220d5ae2937a849a1bb129d49d213f210b198cf5930255eb59a7f30fe1c91351db764736f6c63430008180033000000000000000000000000a97684ead0e402dc232d5a977953df7ecbab3cdb000000000000000000000000b7dfe09cf3950141dfb7db8abca90ddef8d06ec0", - "nonce": "0x28f", + "input": "0x60c060405234801561001057600080fd5b50604051610a60380380610a6083398101604081905261002f91610062565b6001600160a01b039182166080521660a052610095565b80516001600160a01b038116811461005d57600080fd5b919050565b6000806040838503121561007557600080fd5b61007e83610046565b915061008c60208401610046565b90509250929050565b60805160a05161098c6100d460003960008181609e01528181610135015281816101c0015261020b01526000818160ea0152610298015261098c6000f3fe60806040526004361061003f5760003560e01c806316452c26146100445780634b8a35291461006a5780634d47fc851461008c57806362684616146100d8575b600080fd5b6100576100523660046106ad565b61010c565b6040519081526020015b60405180910390f35b34801561007657600080fd5b5061008a61008536600461071e565b610296565b005b34801561009857600080fd5b506100c07f000000000000000000000000000000000000000000000000000000000000000081565b6040516001600160a01b039091168152602001610061565b3480156100e457600080fd5b506100c07f000000000000000000000000000000000000000000000000000000000000000081565b60006101188585610296565b604051636eb1769f60e11b81523060048201526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000008116602483015285919087169063dd62ed3e90604401602060405180830381865afa158015610187573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ab919061074a565b10156101e7576101e76001600160a01b0386167f0000000000000000000000000000000000000000000000000000000000000000600019610394565b6040805160208101825260008152905163e48e2d8f60e01b81526001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169163e48e2d8f9161024a91899189918991849184918b906004016107fd565b6020604051808303816000875af1158015610269573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028d919061074a565b95945050505050565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663026b1d5f6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156102f4573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061031891906108fb565b60405163a415bcad60e01b81526001600160a01b038481166004830152602482018490526002604483015260006064830152306084830152919091169063a415bcad9060a401600060405180830381600087803b15801561037857600080fd5b505af115801561038c573d6000803e3d6000fd5b505050505050565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b1790526103e5848261044e565b61044857604080516001600160a01b038516602482015260006044808301919091528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b17905261043e9085906104f1565b61044884826104f1565b50505050565b6000806000846001600160a01b03168460405161046b9190610918565b6000604051808303816000865af19150503d80600081146104a8576040519150601f19603f3d011682016040523d82523d6000602084013e6104ad565b606091505b50915091508180156104d75750805115806104d75750808060200190518101906104d79190610934565b801561028d5750505050506001600160a01b03163b151590565b60006105066001600160a01b0384168361055e565b9050805160001415801561052b5750808060200190518101906105299190610934565b155b1561055957604051635274afe760e01b81526001600160a01b03841660048201526024015b60405180910390fd5b505050565b606061056c83836000610573565b9392505050565b6060814710156105985760405163cd78605960e01b8152306004820152602401610550565b600080856001600160a01b031684866040516105b49190610918565b60006040518083038185875af1925050503d80600081146105f1576040519150601f19603f3d011682016040523d82523d6000602084013e6105f6565b606091505b5091509150610606868383610610565b9695505050505050565b606082610625576106208261066c565b61056c565b815115801561063c57506001600160a01b0384163b155b1561066557604051639996b31560e01b81526001600160a01b0385166004820152602401610550565b508061056c565b80511561067c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b50565b6001600160a01b038116811461069557600080fd5b600080600080608085870312156106c357600080fd5b84356106ce81610698565b93506020850135925060408501356106e581610698565b9150606085013567ffffffffffffffff81111561070157600080fd5b850160c0818803121561071357600080fd5b939692955090935050565b6000806040838503121561073157600080fd5b823561073c81610698565b946020939093013593505050565b60006020828403121561075c57600080fd5b5051919050565b60005b8381101561077e578181015183820152602001610766565b50506000910152565b6000808335601e1984360301811261079e57600080fd5b830160208101925035905067ffffffffffffffff8111156107be57600080fd5b8036038213156107cd57600080fd5b9250929050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b600060018060a01b03808a1683528860208401528088166040840152808716606084015285608084015260e060a084015284518060e08501526101006108498282870160208a01610763565b601f19601f83011685019150808583030160c0860152853561086a81610698565b83169082015260208501356101208201526040850135610140820152606085013561089481610698565b82166101608201526108a96080860186610787565b925060c06101808301526108c26101c0830184836107d4565b9250506108d260a0860186610787565b82840360ff19016101a08401526108ea8482846107d4565b9d9c50505050505050505050505050565b60006020828403121561090d57600080fd5b815161056c81610698565b6000825161092a818460208701610763565b9190910192915050565b60006020828403121561094657600080fd5b8151801515811461056c57600080fdfea26469706673582212206813f75d027189c2c6cd6f9856bdf4ef085cef910ced1304279337ffe324d0f464736f6c63430008180033000000000000000000000000a97684ead0e402dc232d5a977953df7ecbab3cdb000000000000000000000000b7dfe09cf3950141dfb7db8abca90ddef8d06ec0", + "nonce": "0x292", "chainId": "0xa4b1" }, "additionalContracts": [], "isFixedGasLimit": false }, { - "hash": "0xa68209675d65e7f3022edbb4e5529d3b692ca9bae96cf48c90a9ce371ffb89e6", + "hash": "0x39a1bde764790a7770221376a3b512f39a4378f4e3cc9e1de9f0a3c8ba69fd8c", "transactionType": "CALL", "contractName": "UUPSProxy", "contractAddress": "0xa000000eaa652c7023530b603844471294b811c4", @@ -31,10 +50,10 @@ "transaction": { "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", "to": "0xa000000eaa652c7023530b603844471294b811c4", - "gas": "0x32137", + "gas": "0x2f109", "value": "0x0", - "input": "0x0bf919fc000000000000000000000000ef4d6687372172c4af1802c208ab40673b014309", - "nonce": "0x290", + "input": "0x0bf919fc000000000000000000000000d0187ca378f7b26d53e0a91fbe8d7ba80498ef10", + "nonce": "0x293", "chainId": "0xa4b1" }, "additionalContracts": [], @@ -44,61 +63,95 @@ "receipts": [ { "status": "0x1", - "cumulativeGasUsed": "0x1f68c4", + "cumulativeGasUsed": "0x116c3f", + "logs": [ + { + "address": "0xa000000eaa652c7023530b603844471294b811c4", + "topics": [ + "0x4330c9a27379ee1ae26d7ba186fb3420ab2fde5cb4f1937298b69228b4787058", + "0x0000000000000000000000005aadfb43ef8daf45dd80f4676345b7676f1d70e3", + "0x0000000000000000000000000000000000000000000000000000000000000001" + ], + "data": "0x", + "blockHash": "0x6d109f48c73d108e23def247845615ff07b3aa925dea7390d67e0006645c004d", + "blockNumber": "0x10710d7f", + "transactionHash": "0x96d1db6af42ec1c7f5e498dd55d5d3413ef2d265a5d726bc2811b734b9caa990", + "transactionIndex": "0x6", + "logIndex": "0x10", + "removed": false + } + ], + "logsBloom": "0x00000000000000000001000000000000000000000000400000000002000000000000000000000000000000000000000000000000000000000000000000040000040001000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000200000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0x96d1db6af42ec1c7f5e498dd55d5d3413ef2d265a5d726bc2811b734b9caa990", + "transactionIndex": "0x6", + "blockHash": "0x6d109f48c73d108e23def247845615ff07b3aa925dea7390d67e0006645c004d", + "blockNumber": "0x10710d7f", + "gasUsed": "0x1c613", + "effectiveGasPrice": "0xe37290", + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0xa000000eaa652c7023530b603844471294b811c4", + "contractAddress": null, + "gasUsedForL1": "0xf7c7", + "l1BlockNumber": "0x143bceb" + }, + { + "status": "0x1", + "cumulativeGasUsed": "0x26a8f8", "logs": [], "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "type": "0x2", - "transactionHash": "0x91a7d7a8b5473a701cb972996159eb7ec1ba10d9acc1ed1c00755ca1a82202d9", - "transactionIndex": "0x4", - "blockHash": "0x42881184d27313fa5ee6de5c448a4af4f746c3c621b559ac752ae51507291d0b", - "blockNumber": "0x10626899", - "gasUsed": "0x1a64d9", - "effectiveGasPrice": "0xa6ea78", + "transactionHash": "0x0fefa8c3853aa740dc947e39e81cd81d7aee89cef5b083c34dd3de329a6da5ff", + "transactionIndex": "0x3", + "blockHash": "0xe2a340574eba86fd732058c0e87657a23e800297acc41c2139e3d5af4ecb450e", + "blockNumber": "0x10710d84", + "gasUsed": "0x141fd0", + "effectiveGasPrice": "0xe26cd8", "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", "to": null, - "contractAddress": "0xef4d6687372172c4af1802c208ab40673b014309", - "gasUsedForL1": "0xf0cde", - "l1BlockNumber": "0x1436ec3" + "contractAddress": "0xd0187ca378f7b26d53e0a91fbe8d7ba80498ef10", + "gasUsedForL1": "0xb3b97", + "l1BlockNumber": "0x143bceb" }, { "status": "0x1", - "cumulativeGasUsed": "0x26c342", + "cumulativeGasUsed": "0x1c804", "logs": [ { "address": "0xa000000eaa652c7023530b603844471294b811c4", "topics": [ "0x4330c9a27379ee1ae26d7ba186fb3420ab2fde5cb4f1937298b69228b4787058", - "0x000000000000000000000000ef4d6687372172c4af1802c208ab40673b014309", + "0x000000000000000000000000d0187ca378f7b26d53e0a91fbe8d7ba80498ef10", "0x0000000000000000000000000000000000000000000000000000000000000001" ], "data": "0x", - "blockHash": "0x8a4f6e32b29977807f5ad64e6d6e7219b89fe471732738b891c2128f6b8d7040", - "blockNumber": "0x1062689d", - "transactionHash": "0xa68209675d65e7f3022edbb4e5529d3b692ca9bae96cf48c90a9ce371ffb89e6", - "transactionIndex": "0x9", - "logIndex": "0x11", + "blockHash": "0xa894b88c0efa129fbcdc9b363ed9ab3c41bb3cc3b004b876411306e6deb45123", + "blockNumber": "0x10710d89", + "transactionHash": "0x39a1bde764790a7770221376a3b512f39a4378f4e3cc9e1de9f0a3c8ba69fd8c", + "transactionIndex": "0x1", + "logIndex": "0x0", "removed": false } ], - "logsBloom": "0x00000000000000000001000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000040000040001000000000000000000000000000000000020040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000020000000000000000000000200000000040000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000", + "logsBloom": "0x00000000000000000001000000000000000000000000400000000000020000000000000000000000000000000000000000000000000000000000000000040000040001000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000100000000000000000000000000200000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000020000000", "type": "0x2", - "transactionHash": "0xa68209675d65e7f3022edbb4e5529d3b692ca9bae96cf48c90a9ce371ffb89e6", - "transactionIndex": "0x9", - "blockHash": "0x8a4f6e32b29977807f5ad64e6d6e7219b89fe471732738b891c2128f6b8d7040", - "blockNumber": "0x1062689d", - "gasUsed": "0x1e95b", - "effectiveGasPrice": "0xa5c198", + "transactionHash": "0x39a1bde764790a7770221376a3b512f39a4378f4e3cc9e1de9f0a3c8ba69fd8c", + "transactionIndex": "0x1", + "blockHash": "0xa894b88c0efa129fbcdc9b363ed9ab3c41bb3cc3b004b876411306e6deb45123", + "blockNumber": "0x10710d89", + "gasUsed": "0x1c804", + "effectiveGasPrice": "0xe1ad70", "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", "to": "0xa000000eaa652c7023530b603844471294b811c4", "contractAddress": null, - "gasUsedForL1": "0x11b0f", - "l1BlockNumber": "0x1436ec3" + "gasUsedForL1": "0xf9b8", + "l1BlockNumber": "0x143bceb" } ], "libraries": [], "pending": [], "returns": {}, - "timestamp": 1731714634, + "timestamp": 1731955678, "chain": 42161, - "commit": "fa932d7" + "commit": "076a1a2" } \ No newline at end of file diff --git a/broadcast/145-upgrade_access_protocol.s.sol/8453/run-1731955431.json b/broadcast/145-upgrade_access_protocol.s.sol/8453/run-1731955431.json new file mode 100644 index 00000000..2f44aef9 --- /dev/null +++ b/broadcast/145-upgrade_access_protocol.s.sol/8453/run-1731955431.json @@ -0,0 +1,174 @@ +{ + "transactions": [ + { + "hash": "0x1b217d06cbd165c19886343b7061873a5a2bcbac623cae9a8d14979b6c9ada16", + "transactionType": "CALL", + "contractName": "UUPSProxy", + "contractAddress": "0xa000000eaa652c7023530b603844471294b811c4", + "function": null, + "arguments": null, + "transaction": { + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0xa000000eaa652c7023530b603844471294b811c4", + "gas": "0x11cf1", + "value": "0x0", + "input": "0x0bf919fc0000000000000000000000005aadfb43ef8daf45dd80f4676345b7676f1d70e3", + "nonce": "0x147", + "chainId": "0x2105" + }, + "additionalContracts": [], + "isFixedGasLimit": false + }, + { + "hash": "0x748cb6789a18c737bee56f90bbad3c51c28bd0adc8fd49f6a2e6fa203e568d2b", + "transactionType": "CREATE", + "contractName": "AaveBorrowWorkflow", + "contractAddress": "0x8447861ef3f3b390e7e090b5efaac0133cd0bcee", + "function": null, + "arguments": [ + "0xe20fCBdBfFC4Dd138cE8b2E6FBb6CB49777ad64D", + "0x361C9A99Cf874ec0B0A0A89e217Bf0264ee17a5B" + ], + "transaction": { + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "gas": "0xb8e39", + "value": "0x0", + "input": "0x60c060405234801561001057600080fd5b50604051610a60380380610a6083398101604081905261002f91610062565b6001600160a01b039182166080521660a052610095565b80516001600160a01b038116811461005d57600080fd5b919050565b6000806040838503121561007557600080fd5b61007e83610046565b915061008c60208401610046565b90509250929050565b60805160a05161098c6100d460003960008181609e01528181610135015281816101c0015261020b01526000818160ea0152610298015261098c6000f3fe60806040526004361061003f5760003560e01c806316452c26146100445780634b8a35291461006a5780634d47fc851461008c57806362684616146100d8575b600080fd5b6100576100523660046106ad565b61010c565b6040519081526020015b60405180910390f35b34801561007657600080fd5b5061008a61008536600461071e565b610296565b005b34801561009857600080fd5b506100c07f000000000000000000000000000000000000000000000000000000000000000081565b6040516001600160a01b039091168152602001610061565b3480156100e457600080fd5b506100c07f000000000000000000000000000000000000000000000000000000000000000081565b60006101188585610296565b604051636eb1769f60e11b81523060048201526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000008116602483015285919087169063dd62ed3e90604401602060405180830381865afa158015610187573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ab919061074a565b10156101e7576101e76001600160a01b0386167f0000000000000000000000000000000000000000000000000000000000000000600019610394565b6040805160208101825260008152905163e48e2d8f60e01b81526001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169163e48e2d8f9161024a91899189918991849184918b906004016107fd565b6020604051808303816000875af1158015610269573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028d919061074a565b95945050505050565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663026b1d5f6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156102f4573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061031891906108fb565b60405163a415bcad60e01b81526001600160a01b038481166004830152602482018490526002604483015260006064830152306084830152919091169063a415bcad9060a401600060405180830381600087803b15801561037857600080fd5b505af115801561038c573d6000803e3d6000fd5b505050505050565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b1790526103e5848261044e565b61044857604080516001600160a01b038516602482015260006044808301919091528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b17905261043e9085906104f1565b61044884826104f1565b50505050565b6000806000846001600160a01b03168460405161046b9190610918565b6000604051808303816000865af19150503d80600081146104a8576040519150601f19603f3d011682016040523d82523d6000602084013e6104ad565b606091505b50915091508180156104d75750805115806104d75750808060200190518101906104d79190610934565b801561028d5750505050506001600160a01b03163b151590565b60006105066001600160a01b0384168361055e565b9050805160001415801561052b5750808060200190518101906105299190610934565b155b1561055957604051635274afe760e01b81526001600160a01b03841660048201526024015b60405180910390fd5b505050565b606061056c83836000610573565b9392505050565b6060814710156105985760405163cd78605960e01b8152306004820152602401610550565b600080856001600160a01b031684866040516105b49190610918565b60006040518083038185875af1925050503d80600081146105f1576040519150601f19603f3d011682016040523d82523d6000602084013e6105f6565b606091505b5091509150610606868383610610565b9695505050505050565b606082610625576106208261066c565b61056c565b815115801561063c57506001600160a01b0384163b155b1561066557604051639996b31560e01b81526001600160a01b0385166004820152602401610550565b508061056c565b80511561067c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b50565b6001600160a01b038116811461069557600080fd5b600080600080608085870312156106c357600080fd5b84356106ce81610698565b93506020850135925060408501356106e581610698565b9150606085013567ffffffffffffffff81111561070157600080fd5b850160c0818803121561071357600080fd5b939692955090935050565b6000806040838503121561073157600080fd5b823561073c81610698565b946020939093013593505050565b60006020828403121561075c57600080fd5b5051919050565b60005b8381101561077e578181015183820152602001610766565b50506000910152565b6000808335601e1984360301811261079e57600080fd5b830160208101925035905067ffffffffffffffff8111156107be57600080fd5b8036038213156107cd57600080fd5b9250929050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b600060018060a01b03808a1683528860208401528088166040840152808716606084015285608084015260e060a084015284518060e08501526101006108498282870160208a01610763565b601f19601f83011685019150808583030160c0860152853561086a81610698565b83169082015260208501356101208201526040850135610140820152606085013561089481610698565b82166101608201526108a96080860186610787565b925060c06101808301526108c26101c0830184836107d4565b9250506108d260a0860186610787565b82840360ff19016101a08401526108ea8482846107d4565b9d9c50505050505050505050505050565b60006020828403121561090d57600080fd5b815161056c81610698565b6000825161092a818460208701610763565b9190910192915050565b60006020828403121561094657600080fd5b8151801515811461056c57600080fdfea26469706673582212206813f75d027189c2c6cd6f9856bdf4ef085cef910ced1304279337ffe324d0f464736f6c63430008180033000000000000000000000000e20fcbdbffc4dd138ce8b2e6fbb6cb49777ad64d000000000000000000000000361c9a99cf874ec0b0a0a89e217bf0264ee17a5b", + "nonce": "0x148", + "chainId": "0x2105" + }, + "additionalContracts": [], + "isFixedGasLimit": false + }, + { + "hash": "0xad79b4ed2a0001c50c622a745ee3eff2bd8c0b63fffd9e64f3f4aee13777c57f", + "transactionType": "CALL", + "contractName": "UUPSProxy", + "contractAddress": "0xa000000eaa652c7023530b603844471294b811c4", + "function": null, + "arguments": null, + "transaction": { + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0xa000000eaa652c7023530b603844471294b811c4", + "gas": "0x11cf1", + "value": "0x0", + "input": "0x0bf919fc0000000000000000000000008447861ef3f3b390e7e090b5efaac0133cd0bcee", + "nonce": "0x149", + "chainId": "0x2105" + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [ + { + "status": "0x1", + "cumulativeGasUsed": "0x13eb577", + "logs": [ + { + "address": "0xa000000eaa652c7023530b603844471294b811c4", + "topics": [ + "0x4330c9a27379ee1ae26d7ba186fb3420ab2fde5cb4f1937298b69228b4787058", + "0x0000000000000000000000005aadfb43ef8daf45dd80f4676345b7676f1d70e3", + "0x0000000000000000000000000000000000000000000000000000000000000001" + ], + "data": "0x", + "blockHash": "0xcf6856f9758456d7c0797a2de9a246cb8243166db086571306d679c925f86490", + "blockNumber": "0x15896f5", + "blockTimestamp": "0x673b8acd", + "transactionHash": "0x1b217d06cbd165c19886343b7061873a5a2bcbac623cae9a8d14979b6c9ada16", + "transactionIndex": "0x6d", + "logIndex": "0x18a", + "removed": false + } + ], + "logsBloom": "0x00000000000000000001000000000000000000000000400000000002000000000000000000000000000000000000000000000000000000000000000000040000040001000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000200000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0x1b217d06cbd165c19886343b7061873a5a2bcbac623cae9a8d14979b6c9ada16", + "transactionIndex": "0x6d", + "blockHash": "0xcf6856f9758456d7c0797a2de9a246cb8243166db086571306d679c925f86490", + "blockNumber": "0x15896f5", + "gasUsed": "0xce4c", + "effectiveGasPrice": "0x2be8b93", + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0xa000000eaa652c7023530b603844471294b811c4", + "contractAddress": null, + "l1BaseFeeScalar": "0x8dd", + "l1BlobBaseFee": "0xad2e16dd", + "l1BlobBaseFeeScalar": "0x101c12", + "l1Fee": "0x1695e1fc6b", + "l1FeeScalar": "0.002269", + "l1GasPrice": "0x4842c8a9a", + "l1GasUsed": "0x89c" + }, + { + "status": "0x1", + "cumulativeGasUsed": "0xee03ef", + "logs": [], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0x748cb6789a18c737bee56f90bbad3c51c28bd0adc8fd49f6a2e6fa203e568d2b", + "transactionIndex": "0x68", + "blockHash": "0x85b8bef0efc41893811b6a427e55cd67e43a4da78756e4990b003bc5b96a32c9", + "blockNumber": "0x15896f6", + "gasUsed": "0x8e439", + "effectiveGasPrice": "0x2bddbaa", + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": null, + "contractAddress": "0x8447861ef3f3b390e7e090b5efaac0133cd0bcee", + "l1BaseFeeScalar": "0x8dd", + "l1BlobBaseFee": "0xad2e16dd", + "l1BlobBaseFeeScalar": "0x101c12", + "l1Fee": "0x1a738b7bdd8", + "l1FeeScalar": "0.002269", + "l1GasPrice": "0x4842c8a9a", + "l1GasUsed": "0xa154" + }, + { + "status": "0x1", + "cumulativeGasUsed": "0xeed23b", + "logs": [ + { + "address": "0xa000000eaa652c7023530b603844471294b811c4", + "topics": [ + "0x4330c9a27379ee1ae26d7ba186fb3420ab2fde5cb4f1937298b69228b4787058", + "0x0000000000000000000000008447861ef3f3b390e7e090b5efaac0133cd0bcee", + "0x0000000000000000000000000000000000000000000000000000000000000001" + ], + "data": "0x", + "blockHash": "0x85b8bef0efc41893811b6a427e55cd67e43a4da78756e4990b003bc5b96a32c9", + "blockNumber": "0x15896f6", + "blockTimestamp": "0x673b8acf", + "transactionHash": "0xad79b4ed2a0001c50c622a745ee3eff2bd8c0b63fffd9e64f3f4aee13777c57f", + "transactionIndex": "0x69", + "logIndex": "0x10c", + "removed": false + } + ], + "logsBloom": "0x00000000000000000001000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000040000040001000000000000000000000000000000000000040000000000020000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000400000200000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0xad79b4ed2a0001c50c622a745ee3eff2bd8c0b63fffd9e64f3f4aee13777c57f", + "transactionIndex": "0x69", + "blockHash": "0x85b8bef0efc41893811b6a427e55cd67e43a4da78756e4990b003bc5b96a32c9", + "blockNumber": "0x15896f6", + "gasUsed": "0xce4c", + "effectiveGasPrice": "0x2bddbaa", + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0xa000000eaa652c7023530b603844471294b811c4", + "contractAddress": null, + "l1BaseFeeScalar": "0x8dd", + "l1BlobBaseFee": "0xad2e16dd", + "l1BlobBaseFeeScalar": "0x101c12", + "l1Fee": "0x1695e1fc6b", + "l1FeeScalar": "0.002269", + "l1GasPrice": "0x4842c8a9a", + "l1GasUsed": "0x89c" + } + ], + "libraries": [], + "pending": [], + "returns": {}, + "timestamp": 1731955431, + "chain": 8453, + "commit": "076a1a2" +} \ No newline at end of file diff --git a/broadcast/145-upgrade_access_protocol.s.sol/8453/run-latest.json b/broadcast/145-upgrade_access_protocol.s.sol/8453/run-latest.json index 48e40865..2f44aef9 100644 --- a/broadcast/145-upgrade_access_protocol.s.sol/8453/run-latest.json +++ b/broadcast/145-upgrade_access_protocol.s.sol/8453/run-latest.json @@ -1,10 +1,29 @@ { "transactions": [ { - "hash": "0x7c9c916aabae8d0b298966db2d00aac37474a7f099d764a8faa44396c2b330ba", + "hash": "0x1b217d06cbd165c19886343b7061873a5a2bcbac623cae9a8d14979b6c9ada16", + "transactionType": "CALL", + "contractName": "UUPSProxy", + "contractAddress": "0xa000000eaa652c7023530b603844471294b811c4", + "function": null, + "arguments": null, + "transaction": { + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0xa000000eaa652c7023530b603844471294b811c4", + "gas": "0x11cf1", + "value": "0x0", + "input": "0x0bf919fc0000000000000000000000005aadfb43ef8daf45dd80f4676345b7676f1d70e3", + "nonce": "0x147", + "chainId": "0x2105" + }, + "additionalContracts": [], + "isFixedGasLimit": false + }, + { + "hash": "0x748cb6789a18c737bee56f90bbad3c51c28bd0adc8fd49f6a2e6fa203e568d2b", "transactionType": "CREATE", - "contractName": "AaveWithdrawWorkflow", - "contractAddress": "0xe307f7bf3fbfbb187f6870b6ad6b393f824e49e6", + "contractName": "AaveBorrowWorkflow", + "contractAddress": "0x8447861ef3f3b390e7e090b5efaac0133cd0bcee", "function": null, "arguments": [ "0xe20fCBdBfFC4Dd138cE8b2E6FBb6CB49777ad64D", @@ -12,17 +31,17 @@ ], "transaction": { "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", - "gas": "0xebe11", + "gas": "0xb8e39", "value": "0x0", - "input": "0x60c060405234801561001057600080fd5b50604051610d48380380610d4883398101604081905261002f91610062565b6001600160a01b039182166080521660a052610095565b80516001600160a01b038116811461005d57600080fd5b919050565b6000806040838503121561007557600080fd5b61007e83610046565b915061008c60208401610046565b90509250929050565b60805160a051610c746100d460003960008181605601528181610135015281816101c0015261020b01526000818160a7015261029a0152610c746000f3fe60806040526004361061003f5760003560e01c80634d47fc85146100445780636268461614610095578063dbb4e148146100c9578063f3fef3a3146100ea575b600080fd5b34801561005057600080fd5b506100787f000000000000000000000000000000000000000000000000000000000000000081565b6040516001600160a01b0390911681526020015b60405180910390f35b3480156100a157600080fd5b506100787f000000000000000000000000000000000000000000000000000000000000000081565b6100dc6100d7366004610793565b61010c565b60405190815260200161008c565b3480156100f657600080fd5b5061010a610105366004610804565b610296565b005b60006101188585610296565b604051636eb1769f60e11b81523060048201526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000008116602483015285919087169063dd62ed3e90604401602060405180830381865afa158015610187573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ab9190610830565b10156101e7576101e76001600160a01b0386167f0000000000000000000000000000000000000000000000000000000000000000600019610480565b6040805160208101825260008152905163e48e2d8f60e01b81526001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169163e48e2d8f9161024a91899189918991849184918b906004016108e3565b6020604051808303816000875af1158015610269573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028d9190610830565b95945050505050565b60007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663026b1d5f6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156102f6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061031a91906109f1565b90506000198203610401576040516335ea6a7560e01b81526001600160a01b0384811660048301528216906335ea6a75906024016101e060405180830381865afa15801561036c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103909190610add565b61010001516040516370a0823160e01b81523060048201526001600160a01b03909116906370a0823190602401602060405180830381865afa1580156103da573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103fe9190610830565b91505b604051631a4ca37b60e21b81526001600160a01b038481166004830152602482018490523060448301528216906369328dec906064016020604051808303816000875af1158015610456573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061047a9190610830565b50505050565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b1790526104d18482610534565b61047a57604080516001600160a01b038516602482015260006044808301919091528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b17905261052a9085906105d7565b61047a84826105d7565b6000806000846001600160a01b0316846040516105519190610c00565b6000604051808303816000865af19150503d806000811461058e576040519150601f19603f3d011682016040523d82523d6000602084013e610593565b606091505b50915091508180156105bd5750805115806105bd5750808060200190518101906105bd9190610c1c565b801561028d5750505050506001600160a01b03163b151590565b60006105ec6001600160a01b03841683610644565b9050805160001415801561061157508080602001905181019061060f9190610c1c565b155b1561063f57604051635274afe760e01b81526001600160a01b03841660048201526024015b60405180910390fd5b505050565b606061065283836000610659565b9392505050565b60608147101561067e5760405163cd78605960e01b8152306004820152602401610636565b600080856001600160a01b0316848660405161069a9190610c00565b60006040518083038185875af1925050503d80600081146106d7576040519150601f19603f3d011682016040523d82523d6000602084013e6106dc565b606091505b50915091506106ec8683836106f6565b9695505050505050565b60608261070b5761070682610752565b610652565b815115801561072257506001600160a01b0384163b155b1561074b57604051639996b31560e01b81526001600160a01b0385166004820152602401610636565b5080610652565b8051156107625780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b50565b6001600160a01b038116811461077b57600080fd5b600080600080608085870312156107a957600080fd5b84356107b48161077e565b93506020850135925060408501356107cb8161077e565b9150606085013567ffffffffffffffff8111156107e757600080fd5b850160c081880312156107f957600080fd5b939692955090935050565b6000806040838503121561081757600080fd5b82356108228161077e565b946020939093013593505050565b60006020828403121561084257600080fd5b5051919050565b60005b8381101561086457818101518382015260200161084c565b50506000910152565b6000808335601e1984360301811261088457600080fd5b830160208101925035905067ffffffffffffffff8111156108a457600080fd5b8036038213156108b357600080fd5b9250929050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b600060018060a01b03808a1683528860208401528088166040840152808716606084015285608084015260e060a084015284518060e085015261010061092f8282870160208a01610849565b601f19601f83011685019150808583030160c086015285356109508161077e565b83169082015260208501356101208201526040850135610140820152606085013561097a8161077e565b821661016082015261098f608086018661086d565b925060c06101808301526109a86101c0830184836108ba565b9250506109b860a086018661086d565b82840360ff19016101a08401526109d08482846108ba565b9d9c50505050505050505050505050565b80516109ec8161077e565b919050565b600060208284031215610a0357600080fd5b81516106528161077e565b6040516101e0810167ffffffffffffffff81118282101715610a4057634e487b7160e01b600052604160045260246000fd5b60405290565b600060208284031215610a5857600080fd5b6040516020810181811067ffffffffffffffff82111715610a8957634e487b7160e01b600052604160045260246000fd5b6040529151825250919050565b80516fffffffffffffffffffffffffffffffff811681146109ec57600080fd5b805164ffffffffff811681146109ec57600080fd5b805161ffff811681146109ec57600080fd5b60006101e08284031215610af057600080fd5b610af8610a0e565b610b028484610a46565b8152610b1060208401610a96565b6020820152610b2160408401610a96565b6040820152610b3260608401610a96565b6060820152610b4360808401610a96565b6080820152610b5460a08401610a96565b60a0820152610b6560c08401610ab6565b60c0820152610b7660e08401610acb565b60e0820152610100610b898185016109e1565b90820152610120610b9b8482016109e1565b90820152610140610bad8482016109e1565b90820152610160610bbf8482016109e1565b90820152610180610bd1848201610a96565b908201526101a0610be3848201610a96565b908201526101c0610bf5848201610a96565b908201529392505050565b60008251610c12818460208701610849565b9190910192915050565b600060208284031215610c2e57600080fd5b8151801515811461065257600080fdfea2646970667358221220d5ae2937a849a1bb129d49d213f210b198cf5930255eb59a7f30fe1c91351db764736f6c63430008180033000000000000000000000000e20fcbdbffc4dd138ce8b2e6fbb6cb49777ad64d000000000000000000000000361c9a99cf874ec0b0a0a89e217bf0264ee17a5b", - "nonce": "0x145", + "input": "0x60c060405234801561001057600080fd5b50604051610a60380380610a6083398101604081905261002f91610062565b6001600160a01b039182166080521660a052610095565b80516001600160a01b038116811461005d57600080fd5b919050565b6000806040838503121561007557600080fd5b61007e83610046565b915061008c60208401610046565b90509250929050565b60805160a05161098c6100d460003960008181609e01528181610135015281816101c0015261020b01526000818160ea0152610298015261098c6000f3fe60806040526004361061003f5760003560e01c806316452c26146100445780634b8a35291461006a5780634d47fc851461008c57806362684616146100d8575b600080fd5b6100576100523660046106ad565b61010c565b6040519081526020015b60405180910390f35b34801561007657600080fd5b5061008a61008536600461071e565b610296565b005b34801561009857600080fd5b506100c07f000000000000000000000000000000000000000000000000000000000000000081565b6040516001600160a01b039091168152602001610061565b3480156100e457600080fd5b506100c07f000000000000000000000000000000000000000000000000000000000000000081565b60006101188585610296565b604051636eb1769f60e11b81523060048201526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000008116602483015285919087169063dd62ed3e90604401602060405180830381865afa158015610187573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ab919061074a565b10156101e7576101e76001600160a01b0386167f0000000000000000000000000000000000000000000000000000000000000000600019610394565b6040805160208101825260008152905163e48e2d8f60e01b81526001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169163e48e2d8f9161024a91899189918991849184918b906004016107fd565b6020604051808303816000875af1158015610269573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028d919061074a565b95945050505050565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663026b1d5f6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156102f4573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061031891906108fb565b60405163a415bcad60e01b81526001600160a01b038481166004830152602482018490526002604483015260006064830152306084830152919091169063a415bcad9060a401600060405180830381600087803b15801561037857600080fd5b505af115801561038c573d6000803e3d6000fd5b505050505050565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b1790526103e5848261044e565b61044857604080516001600160a01b038516602482015260006044808301919091528251808303909101815260649091019091526020810180516001600160e01b031663095ea7b360e01b17905261043e9085906104f1565b61044884826104f1565b50505050565b6000806000846001600160a01b03168460405161046b9190610918565b6000604051808303816000865af19150503d80600081146104a8576040519150601f19603f3d011682016040523d82523d6000602084013e6104ad565b606091505b50915091508180156104d75750805115806104d75750808060200190518101906104d79190610934565b801561028d5750505050506001600160a01b03163b151590565b60006105066001600160a01b0384168361055e565b9050805160001415801561052b5750808060200190518101906105299190610934565b155b1561055957604051635274afe760e01b81526001600160a01b03841660048201526024015b60405180910390fd5b505050565b606061056c83836000610573565b9392505050565b6060814710156105985760405163cd78605960e01b8152306004820152602401610550565b600080856001600160a01b031684866040516105b49190610918565b60006040518083038185875af1925050503d80600081146105f1576040519150601f19603f3d011682016040523d82523d6000602084013e6105f6565b606091505b5091509150610606868383610610565b9695505050505050565b606082610625576106208261066c565b61056c565b815115801561063c57506001600160a01b0384163b155b1561066557604051639996b31560e01b81526001600160a01b0385166004820152602401610550565b508061056c565b80511561067c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b50565b6001600160a01b038116811461069557600080fd5b600080600080608085870312156106c357600080fd5b84356106ce81610698565b93506020850135925060408501356106e581610698565b9150606085013567ffffffffffffffff81111561070157600080fd5b850160c0818803121561071357600080fd5b939692955090935050565b6000806040838503121561073157600080fd5b823561073c81610698565b946020939093013593505050565b60006020828403121561075c57600080fd5b5051919050565b60005b8381101561077e578181015183820152602001610766565b50506000910152565b6000808335601e1984360301811261079e57600080fd5b830160208101925035905067ffffffffffffffff8111156107be57600080fd5b8036038213156107cd57600080fd5b9250929050565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b600060018060a01b03808a1683528860208401528088166040840152808716606084015285608084015260e060a084015284518060e08501526101006108498282870160208a01610763565b601f19601f83011685019150808583030160c0860152853561086a81610698565b83169082015260208501356101208201526040850135610140820152606085013561089481610698565b82166101608201526108a96080860186610787565b925060c06101808301526108c26101c0830184836107d4565b9250506108d260a0860186610787565b82840360ff19016101a08401526108ea8482846107d4565b9d9c50505050505050505050505050565b60006020828403121561090d57600080fd5b815161056c81610698565b6000825161092a818460208701610763565b9190910192915050565b60006020828403121561094657600080fd5b8151801515811461056c57600080fdfea26469706673582212206813f75d027189c2c6cd6f9856bdf4ef085cef910ced1304279337ffe324d0f464736f6c63430008180033000000000000000000000000e20fcbdbffc4dd138ce8b2e6fbb6cb49777ad64d000000000000000000000000361c9a99cf874ec0b0a0a89e217bf0264ee17a5b", + "nonce": "0x148", "chainId": "0x2105" }, "additionalContracts": [], "isFixedGasLimit": false }, { - "hash": "0xda27e74fd9f08831d0e0e6fac7bce1db2bc52e0355d7844b778bab81eecda03b", + "hash": "0xad79b4ed2a0001c50c622a745ee3eff2bd8c0b63fffd9e64f3f4aee13777c57f", "transactionType": "CALL", "contractName": "UUPSProxy", "contractAddress": "0xa000000eaa652c7023530b603844471294b811c4", @@ -33,8 +52,8 @@ "to": "0xa000000eaa652c7023530b603844471294b811c4", "gas": "0x11cf1", "value": "0x0", - "input": "0x0bf919fc000000000000000000000000e307f7bf3fbfbb187f6870b6ad6b393f824e49e6", - "nonce": "0x146", + "input": "0x0bf919fc0000000000000000000000008447861ef3f3b390e7e090b5efaac0133cd0bcee", + "nonce": "0x149", "chainId": "0x2105" }, "additionalContracts": [], @@ -44,72 +63,112 @@ "receipts": [ { "status": "0x1", - "cumulativeGasUsed": "0x12736c5", + "cumulativeGasUsed": "0x13eb577", + "logs": [ + { + "address": "0xa000000eaa652c7023530b603844471294b811c4", + "topics": [ + "0x4330c9a27379ee1ae26d7ba186fb3420ab2fde5cb4f1937298b69228b4787058", + "0x0000000000000000000000005aadfb43ef8daf45dd80f4676345b7676f1d70e3", + "0x0000000000000000000000000000000000000000000000000000000000000001" + ], + "data": "0x", + "blockHash": "0xcf6856f9758456d7c0797a2de9a246cb8243166db086571306d679c925f86490", + "blockNumber": "0x15896f5", + "blockTimestamp": "0x673b8acd", + "transactionHash": "0x1b217d06cbd165c19886343b7061873a5a2bcbac623cae9a8d14979b6c9ada16", + "transactionIndex": "0x6d", + "logIndex": "0x18a", + "removed": false + } + ], + "logsBloom": "0x00000000000000000001000000000000000000000000400000000002000000000000000000000000000000000000000000000000000000000000000000040000040001000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000200000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0x1b217d06cbd165c19886343b7061873a5a2bcbac623cae9a8d14979b6c9ada16", + "transactionIndex": "0x6d", + "blockHash": "0xcf6856f9758456d7c0797a2de9a246cb8243166db086571306d679c925f86490", + "blockNumber": "0x15896f5", + "gasUsed": "0xce4c", + "effectiveGasPrice": "0x2be8b93", + "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", + "to": "0xa000000eaa652c7023530b603844471294b811c4", + "contractAddress": null, + "l1BaseFeeScalar": "0x8dd", + "l1BlobBaseFee": "0xad2e16dd", + "l1BlobBaseFeeScalar": "0x101c12", + "l1Fee": "0x1695e1fc6b", + "l1FeeScalar": "0.002269", + "l1GasPrice": "0x4842c8a9a", + "l1GasUsed": "0x89c" + }, + { + "status": "0x1", + "cumulativeGasUsed": "0xee03ef", "logs": [], "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "type": "0x2", - "transactionHash": "0x7c9c916aabae8d0b298966db2d00aac37474a7f099d764a8faa44396c2b330ba", - "transactionIndex": "0x7f", - "blockHash": "0xf15813de05ea46550245e452272d04e2615393934fc7a87c964919d1130988a6", - "blockNumber": "0x156c032", - "gasUsed": "0xb57fb", - "effectiveGasPrice": "0x134799e", + "transactionHash": "0x748cb6789a18c737bee56f90bbad3c51c28bd0adc8fd49f6a2e6fa203e568d2b", + "transactionIndex": "0x68", + "blockHash": "0x85b8bef0efc41893811b6a427e55cd67e43a4da78756e4990b003bc5b96a32c9", + "blockNumber": "0x15896f6", + "gasUsed": "0x8e439", + "effectiveGasPrice": "0x2bddbaa", "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", "to": null, - "contractAddress": "0xe307f7bf3fbfbb187f6870b6ad6b393f824e49e6", + "contractAddress": "0x8447861ef3f3b390e7e090b5efaac0133cd0bcee", "l1BaseFeeScalar": "0x8dd", - "l1BlobBaseFee": "0xd7ee15f", + "l1BlobBaseFee": "0xad2e16dd", "l1BlobBaseFeeScalar": "0x101c12", - "l1Fee": "0x1a05a7cc768", + "l1Fee": "0x1a738b7bdd8", "l1FeeScalar": "0.002269", - "l1GasPrice": "0x3761f342a", - "l1GasUsed": "0xcf14" + "l1GasPrice": "0x4842c8a9a", + "l1GasUsed": "0xa154" }, { "status": "0x1", - "cumulativeGasUsed": "0x1280511", + "cumulativeGasUsed": "0xeed23b", "logs": [ { "address": "0xa000000eaa652c7023530b603844471294b811c4", "topics": [ "0x4330c9a27379ee1ae26d7ba186fb3420ab2fde5cb4f1937298b69228b4787058", - "0x000000000000000000000000e307f7bf3fbfbb187f6870b6ad6b393f824e49e6", + "0x0000000000000000000000008447861ef3f3b390e7e090b5efaac0133cd0bcee", "0x0000000000000000000000000000000000000000000000000000000000000001" ], "data": "0x", - "blockHash": "0xf15813de05ea46550245e452272d04e2615393934fc7a87c964919d1130988a6", - "blockNumber": "0x156c032", - "blockTimestamp": "0x6737dd47", - "transactionHash": "0xda27e74fd9f08831d0e0e6fac7bce1db2bc52e0355d7844b778bab81eecda03b", - "transactionIndex": "0x80", - "logIndex": "0x13f", + "blockHash": "0x85b8bef0efc41893811b6a427e55cd67e43a4da78756e4990b003bc5b96a32c9", + "blockNumber": "0x15896f6", + "blockTimestamp": "0x673b8acf", + "transactionHash": "0xad79b4ed2a0001c50c622a745ee3eff2bd8c0b63fffd9e64f3f4aee13777c57f", + "transactionIndex": "0x69", + "logIndex": "0x10c", "removed": false } ], - "logsBloom": "0x00000000000000000001000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000040000040001000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000800000040000000000000000000000000000000100000000000000000000000000000000000", + "logsBloom": "0x00000000000000000001000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000040000040001000000000000000000000000000000000000040000000000020000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000400000200000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000", "type": "0x2", - "transactionHash": "0xda27e74fd9f08831d0e0e6fac7bce1db2bc52e0355d7844b778bab81eecda03b", - "transactionIndex": "0x80", - "blockHash": "0xf15813de05ea46550245e452272d04e2615393934fc7a87c964919d1130988a6", - "blockNumber": "0x156c032", + "transactionHash": "0xad79b4ed2a0001c50c622a745ee3eff2bd8c0b63fffd9e64f3f4aee13777c57f", + "transactionIndex": "0x69", + "blockHash": "0x85b8bef0efc41893811b6a427e55cd67e43a4da78756e4990b003bc5b96a32c9", + "blockNumber": "0x15896f6", "gasUsed": "0xce4c", - "effectiveGasPrice": "0x134799e", + "effectiveGasPrice": "0x2bddbaa", "from": "0x660ad4b5a74130a4796b4d54bc6750ae93c86e6c", "to": "0xa000000eaa652c7023530b603844471294b811c4", "contractAddress": null, "l1BaseFeeScalar": "0x8dd", - "l1BlobBaseFee": "0xd7ee15f", + "l1BlobBaseFee": "0xad2e16dd", "l1BlobBaseFeeScalar": "0x101c12", - "l1Fee": "0x1167835528", + "l1Fee": "0x1695e1fc6b", "l1FeeScalar": "0.002269", - "l1GasPrice": "0x3761f342a", - "l1GasUsed": "0x8a8" + "l1GasPrice": "0x4842c8a9a", + "l1GasUsed": "0x89c" } ], "libraries": [], "pending": [], "returns": {}, - "timestamp": 1731714515, + "timestamp": 1731955431, "chain": 8453, - "commit": "fa932d7" + "commit": "076a1a2" } \ No newline at end of file diff --git a/script/migrations/145-upgrade_access_protocol.s.sol b/script/migrations/145-upgrade_access_protocol.s.sol index 9678429b..2d556ecf 100644 --- a/script/migrations/145-upgrade_access_protocol.s.sol +++ b/script/migrations/145-upgrade_access_protocol.s.sol @@ -35,35 +35,32 @@ contract DeployScript is Script, MigrationHelper { return; } - vm.broadcast(deployerPrivateKey); + vm.startBroadcast(deployerPrivateKey); + + registry.disallowWorkflow(_getChainDeployment("AaveLendWorkflow")); AaveLendWorkflow aaveLendWorkflow = new AaveLendWorkflow(getAavePoolProvider()); saveContractAddress("AaveLendWorkflow", address(aaveLendWorkflow)); - - vm.broadcast(deployerPrivateKey); registry.allowWorkflow(address(aaveLendWorkflow)); - vm.broadcast(deployerPrivateKey); + registry.disallowWorkflow(_getChainDeployment("AaveRepayWorkflow")); AaveRepayWorkflow aaveRepayWorkflow = new AaveRepayWorkflow(getAavePoolProvider()); saveContractAddress("AaveRepayWorkflow", address(aaveRepayWorkflow)); - - vm.broadcast(deployerPrivateKey); registry.allowWorkflow(address(aaveRepayWorkflow)); - vm.broadcast(deployerPrivateKey); + registry.disallowWorkflow(_getChainDeployment("AaveWithdrawWorkflow")); AaveWithdrawWorkflow aaveWithdrawWorkflow = new AaveWithdrawWorkflow(getAavePoolProvider(), _getChainDeployment("Bridger")); saveContractAddress("AaveWithdrawWorkflow", address(aaveWithdrawWorkflow)); - - vm.broadcast(deployerPrivateKey); registry.allowWorkflow(address(aaveWithdrawWorkflow)); - vm.broadcast(deployerPrivateKey); - AaveBorrowWorkflow aaveBorrowWorkflow = new AaveBorrowWorkflow(getAavePoolProvider()); + registry.disallowWorkflow(_getChainDeployment("AaveBorrowWorkflow")); + AaveBorrowWorkflow aaveBorrowWorkflow = + new AaveBorrowWorkflow(getAavePoolProvider(), _getChainDeployment("Bridger")); saveContractAddress("AaveBorrowWorkflow", address(aaveBorrowWorkflow)); - - vm.broadcast(deployerPrivateKey); registry.allowWorkflow(address(aaveBorrowWorkflow)); + vm.stopBroadcast(); + require(registry.isWorkflowAllowed(address(aaveLendWorkflow)), "Workflow is not set properly"); require(registry.isWorkflowAllowed(address(aaveRepayWorkflow)), "Workflow is not set properly"); require(registry.isWorkflowAllowed(address(aaveWithdrawWorkflow)), "Workflow is not set properly"); diff --git a/src/access/workflows/AaveBorrowWorkflow.sol b/src/access/workflows/AaveBorrowWorkflow.sol index f3c1c069..8c9d4834 100644 --- a/src/access/workflows/AaveBorrowWorkflow.sol +++ b/src/access/workflows/AaveBorrowWorkflow.sol @@ -5,6 +5,7 @@ import {IERC20} from "@openzeppelin-5.0.1/contracts/token/ERC20/IERC20.sol"; import {SafeERC20} from "@openzeppelin-5.0.1/contracts/token/ERC20/utils/SafeERC20.sol"; import {Address} from "@openzeppelin-5.0.1/contracts/utils/Address.sol"; import {IWETH} from "@kinto-core/interfaces/IWETH.sol"; +import {IBridger} from "@kinto-core/interfaces/bridger/IBridger.sol"; import {IAavePool, IPoolAddressesProvider} from "@kinto-core/interfaces/external/IAavePool.sol"; @@ -20,6 +21,8 @@ contract AaveBorrowWorkflow { /// @notice Address of the PoolAddressesProvider contract IPoolAddressesProvider public immutable poolAddressProvider; + /// @notice Address of the Bridger contract + IBridger public immutable bridger; /* ============ Constructor ============ */ @@ -27,8 +30,9 @@ contract AaveBorrowWorkflow { * @notice Initializes the contract with Aave's pool address provider * @param poolAddressProvider_ The address of Aave's pool address provider */ - constructor(address poolAddressProvider_) { + constructor(address poolAddressProvider_, address bridger_) { poolAddressProvider = IPoolAddressesProvider(poolAddressProvider_); + bridger = IBridger(bridger_); } /* ============ External Functions ============ */ @@ -38,7 +42,7 @@ contract AaveBorrowWorkflow { * @param asset The address of the asset to borrow * @param amount The amount to borrow */ - function borrow(address asset, uint256 amount) external { + function borrow(address asset, uint256 amount) public { IAavePool(poolAddressProvider.getPool()).borrow( asset, amount, @@ -47,4 +51,20 @@ contract AaveBorrowWorkflow { address(this) ); } + + function borrowAndBridge( + address asset, + uint256 amount, + address kintoWallet, + IBridger.BridgeData calldata bridgeData + ) external payable returns (uint256 amountOut) { + borrow(asset, amount); + + // Approve max allowance to save on gas for future transfers + if (IERC20(asset).allowance(address(this), address(bridger)) < amount) { + IERC20(asset).forceApprove(address(bridger), type(uint256).max); + } + + return bridger.depositERC20(asset, amount, kintoWallet, asset, amount, bytes(""), bridgeData); + } } diff --git a/src/access/workflows/AaveRepayWorkflow.sol b/src/access/workflows/AaveRepayWorkflow.sol index 4cb59c0f..9bd33b9f 100644 --- a/src/access/workflows/AaveRepayWorkflow.sol +++ b/src/access/workflows/AaveRepayWorkflow.sol @@ -37,15 +37,14 @@ contract AaveRepayWorkflow { * @notice Repays a borrowed asset to Aave * @param asset The address of the borrowed asset to repay * @param amount The amount to repay (use type(uint256).max for max debt) - * @param onBehalfOf The address of the user who will get their debt reduced * @return amountRepaid The actual amount repaid */ - function repay(address asset, uint256 amount, address onBehalfOf) external returns (uint256) { + function repay(address asset, uint256 amount) external returns (uint256) { address pool = poolAddressProvider.getPool(); // If amount is max uint256, get the debt for this specific asset if (amount == type(uint256).max) { - amount = IERC20(IAavePool(pool).getReserveData(asset).variableDebtTokenAddress).balanceOf(onBehalfOf); + amount = IERC20(IAavePool(pool).getReserveData(asset).variableDebtTokenAddress).balanceOf(address(this)); } // Approve max allowance to save on gas for future transfers @@ -58,7 +57,7 @@ contract AaveRepayWorkflow { asset, amount, 2, // RATE_MODE: 2 for variable rate - onBehalfOf + address(this) ); } } diff --git a/test/artifacts/1/addresses.json b/test/artifacts/1/addresses.json index 10704718..18591bb7 100644 --- a/test/artifacts/1/addresses.json +++ b/test/artifacts/1/addresses.json @@ -36,7 +36,7 @@ "WethWorkflow": "0x19452D4C2b2422d0623e1A5F0Caa9a52C2Cf55B5", "WithdrawWorkflow": "0xdC70c1c6c49AC9B3cA50E2F9079843545646524a", "AaveLendWorkflow": "0x30592A2E419Db1338A6759279c547A9fdf2cd1DF", - "AaveRepayWorkflow": "0x5e4cB8F8E70FBe315EA76323f16410B40151fe3b", + "AaveRepayWorkflow": "0x5aAdFB43eF8dAF45DD80F4676345b7676f1D70e3", "AaveWithdrawWorkflow": "0xb4D3004b5E56d236977e9153F4689cF10E4Ff723", - "AaveBorrowWorkflow": "0x5bcA84441bfA911b1637A1b2344198dFaCbdCaA1" + "AaveBorrowWorkflow": "0x8c13D7aDD034A9E1bD8280225Efab7584c5E85A6" } \ No newline at end of file diff --git a/test/artifacts/42161/addresses.json b/test/artifacts/42161/addresses.json index 2370034d..5e0d5d18 100644 --- a/test/artifacts/42161/addresses.json +++ b/test/artifacts/42161/addresses.json @@ -30,7 +30,7 @@ "WethWorkflow": "0x7F7c594eE170a62d7e7615972831038Cf7d4Fc1A", "WithdrawWorkflow": "0x36e6cA034958B2E0D4dC7Ea9a8151f15Ba0B27D2", "AaveLendWorkflow": "0xB47Ed636c8296729E81463109FEbf833CeEa71fb", - "AaveRepayWorkflow": "0x5cC25cc25bE29d18472E76b2a19975aA1a37Bd5C", + "AaveRepayWorkflow": "0x5aAdFB43eF8dAF45DD80F4676345b7676f1D70e3", "AaveWithdrawWorkflow": "0xef4D6687372172c4af1802C208Ab40673b014309", - "AaveBorrowWorkflow": "0xAa6a97b31D38892E4Edb183588df6b9b633a71b7" + "AaveBorrowWorkflow": "0xD0187Ca378f7B26D53e0A91fBe8D7ba80498EF10" } \ No newline at end of file diff --git a/test/artifacts/8453/addresses.json b/test/artifacts/8453/addresses.json index 23ceb201..40694811 100644 --- a/test/artifacts/8453/addresses.json +++ b/test/artifacts/8453/addresses.json @@ -25,7 +25,7 @@ "WethWorkflow": "0xC8Bb693Be58f390AC526f1822A3c7d79CbE93157", "WithdrawWorkflow": "0xdC70c1c6c49AC9B3cA50E2F9079843545646524a", "AaveLendWorkflow": "0x720E7BC50C5Db2B387463F3f58E51D4eEa4513E5", - "AaveRepayWorkflow": "0xCbA916cbcC56E911C422C1091d9035362AA7B0EE", + "AaveRepayWorkflow": "0x5aAdFB43eF8dAF45DD80F4676345b7676f1D70e3", "AaveWithdrawWorkflow": "0xe307f7bf3fBfBB187f6870b6ad6b393f824e49e6", - "AaveBorrowWorkflow": "0x4324Fd882507A065FD99E0C6B9332cA2912658A0" + "AaveBorrowWorkflow": "0x8447861eF3F3b390E7e090B5eFaac0133cD0bCEe" } \ No newline at end of file diff --git a/test/fork/workflows/AaveBorrowWorkflow.t.sol b/test/fork/workflows/AaveBorrowWorkflow.t.sol index d33fadbb..2edc7710 100644 --- a/test/fork/workflows/AaveBorrowWorkflow.t.sol +++ b/test/fork/workflows/AaveBorrowWorkflow.t.sol @@ -3,12 +3,14 @@ pragma solidity ^0.8.18; import {stdJson} from "forge-std/StdJson.sol"; -import "@kinto-core/interfaces/bridger/IBridger.sol"; +import {IBridger} from "@kinto-core/interfaces/bridger/IBridger.sol"; +import {Bridger} from "@kinto-core/bridger/Bridger.sol"; import {IAccessRegistry} from "@kinto-core/interfaces/IAccessRegistry.sol"; import {IAccessPoint} from "@kinto-core/interfaces/IAccessPoint.sol"; import {AccessRegistry} from "@kinto-core/access/AccessRegistry.sol"; import {AaveBorrowWorkflow} from "@kinto-core/access/workflows/AaveBorrowWorkflow.sol"; +import {BridgeDataHelper} from "@kinto-core-test/helpers/BridgeDataHelper.sol"; import "@kinto-core-test/fork/const.sol"; import "@kinto-core-test/helpers/UUPSProxy.sol"; @@ -23,9 +25,10 @@ import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "forge-std/console2.sol"; -contract AaveBorrowWorkflowTest is SignatureHelper, ForkTest, ArtifactsReader, Constants { +contract AaveBorrowWorkflowTest is SignatureHelper, ForkTest, ArtifactsReader, Constants, BridgeDataHelper { using stdJson for string; + Bridger internal bridger; AccessRegistry internal accessRegistry; IAccessPoint internal accessPoint; AaveBorrowWorkflow internal aaveBorrowWorkflow; @@ -34,6 +37,7 @@ contract AaveBorrowWorkflowTest is SignatureHelper, ForkTest, ArtifactsReader, C function setUp() public override { super.setUp(); + bridger = Bridger(payable(_getChainDeployment("Bridger"))); accessRegistry = AccessRegistry(_getChainDeployment("AccessRegistry")); aavePool = IAavePool(IPoolAddressesProvider(ARB_AAVE_POOL_PROVIDER).getPool()); @@ -45,7 +49,7 @@ contract AaveBorrowWorkflowTest is SignatureHelper, ForkTest, ArtifactsReader, C accessPoint = accessRegistry.deployFor(address(alice0)); vm.label(address(accessPoint), "accessPoint"); - aaveBorrowWorkflow = new AaveBorrowWorkflow(ARB_AAVE_POOL_PROVIDER); + aaveBorrowWorkflow = new AaveBorrowWorkflow(ARB_AAVE_POOL_PROVIDER, address(bridger)); vm.label(address(aaveBorrowWorkflow), "aaveBorrowWorkflow"); vm.prank(accessRegistry.owner()); @@ -95,4 +99,52 @@ contract AaveBorrowWorkflowTest is SignatureHelper, ForkTest, ArtifactsReader, C "Invalid debt token balance" ); } + + function testBorrowAndBridge_WhenUSDC() public { + address collateralAsset = WETH_ARBITRUM; + address borrowAsset = USDC_ARBITRUM; + uint256 collateralAmount = 1 ether; + uint256 borrowAmount = 100e6; // 100 USDC + + // Supply collateral first + deal(collateralAsset, address(accessPoint), collateralAmount); + vm.startPrank(address(accessPoint)); + IERC20(collateralAsset).approve(address(aavePool), collateralAmount); + aavePool.supply(collateralAsset, collateralAmount, address(accessPoint), 0); + vm.stopPrank(); + + IBridger.BridgeData memory bridgeData = bridgeData[block.chainid][USDC_ARBITRUM]; + + // Get initial balances + uint256 initialBorrowBalance = IERC20(borrowAsset).balanceOf(address(accessPoint)); + address variableDebtToken = aavePool.getReserveData(borrowAsset).variableDebtTokenAddress; + uint256 initialDebtBalance = IERC20(variableDebtToken).balanceOf(address(accessPoint)); + uint256 initialVaultBalance = IERC20(borrowAsset).balanceOf(address(bridgeData.vault)); + uint256 initialBridgerBalance = IERC20(borrowAsset).balanceOf(address(bridger)); + + // Prepare workflow data + bytes memory workflowData = abi.encodeWithSelector( + AaveBorrowWorkflow.borrowAndBridge.selector, borrowAsset, borrowAmount, alice0, bridgeData + ); + + // Execute the borrow workflow + vm.prank(alice0); + accessPoint.execute(address(aaveBorrowWorkflow), workflowData); + + // Assert balances changed correctly + assertEq( + IERC20(borrowAsset).balanceOf(address(accessPoint)), initialBorrowBalance, "Invalid borrowed asset balance" + ); + assertEq( + IERC20(variableDebtToken).balanceOf(address(accessPoint)), + initialDebtBalance + borrowAmount, + "Invalid debt token balance" + ); + assertEq(IERC20(borrowAsset).balanceOf(address(bridger)), initialBridgerBalance, "Invalid bridger balance"); + assertEq( + IERC20(borrowAsset).balanceOf(address(bridgeData.vault)), + initialVaultBalance + borrowAmount, + "Invalid vault balance" + ); + } } diff --git a/test/fork/workflows/AaveRepayWorkflow.t.sol b/test/fork/workflows/AaveRepayWorkflow.t.sol index 68fadac0..3b9af4e3 100644 --- a/test/fork/workflows/AaveRepayWorkflow.t.sol +++ b/test/fork/workflows/AaveRepayWorkflow.t.sol @@ -80,8 +80,7 @@ contract AaveRepayWorkflowTest is SignatureHelper, ForkTest, ArtifactsReader, Co uint256 initialDebtBalance = IERC20(variableDebtToken).balanceOf(address(accessPoint)); // Prepare workflow data - bytes memory workflowData = - abi.encodeWithSelector(AaveRepayWorkflow.repay.selector, repayAsset, borrowAmount, address(accessPoint)); + bytes memory workflowData = abi.encodeWithSelector(AaveRepayWorkflow.repay.selector, repayAsset, borrowAmount); // Approve repay asset vm.prank(address(accessPoint)); @@ -128,9 +127,8 @@ contract AaveRepayWorkflowTest is SignatureHelper, ForkTest, ArtifactsReader, Co address variableDebtToken = aavePool.getReserveData(repayAsset).variableDebtTokenAddress; // Prepare workflow data with max amount - bytes memory workflowData = abi.encodeWithSelector( - AaveRepayWorkflow.repay.selector, repayAsset, type(uint256).max, address(accessPoint) - ); + bytes memory workflowData = + abi.encodeWithSelector(AaveRepayWorkflow.repay.selector, repayAsset, type(uint256).max); // Approve repay asset vm.prank(address(accessPoint)); diff --git a/test/fork/workflows/Viewer.t.sol b/test/fork/workflows/Viewer.t.sol index 8c85cb1f..5c70dbdb 100644 --- a/test/fork/workflows/Viewer.t.sol +++ b/test/fork/workflows/Viewer.t.sol @@ -57,7 +57,7 @@ contract ViewerTest is SignatureHelper, ForkTest, ArtifactsReader, Constants { // Deploy and allow workflows aaveLendWorkflow = new AaveLendWorkflow(ARB_AAVE_POOL_PROVIDER); - aaveBorrowWorkflow = new AaveBorrowWorkflow(ARB_AAVE_POOL_PROVIDER); + aaveBorrowWorkflow = new AaveBorrowWorkflow(ARB_AAVE_POOL_PROVIDER, _getChainDeployment("Bridger")); vm.label(address(aaveLendWorkflow), "aaveLendWorkflow"); vm.label(address(aaveBorrowWorkflow), "aaveBorrowWorkflow"); @@ -72,7 +72,7 @@ contract ViewerTest is SignatureHelper, ForkTest, ArtifactsReader, Constants { vm.rollFork(273472816); } - function testGetAccountData_BeforeLending() public { + function testGetAccountData_BeforeLending() public view { address[] memory assets = new address[](1); assets[0] = USDC_ARBITRUM;