@etherisc/gif-next 3.0.0-ab0fcb2-112 → 3.0.0-ab43904-022

package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json

@@ -64,7 +64,7 @@
     },
     {
       "inputs": [],
-      "name": "FailedInnerCall",
+      "name": "FailedCall",
       "type": "error"
     },
     {
@@ -135,8 +135,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60a060405234801561000f575f80fd5b506040516110c23803806110c283398101604081905261002e9161038a565b828282828161003d82826100ac565b50508160405161004c9061034e565b6001600160a01b039091168152602001604051809103905ff080158015610075573d5f803e3d5ffd5b506001600160a01b031660805261009361008e60805190565b61010a565b505f91506100a3905082826104de565b505050506105ae565b6100b582610177565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a28051156100fe576100f982826101f5565b505050565b610106610268565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f6101495f805160206110a2833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a161017481610289565b50565b806001600160a01b03163b5f036101b157604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b60605f80846001600160a01b0316846040516102119190610598565b5f60405180830381855af49150503d805f8114610249576040519150601f19603f3d011682016040523d82523d5f602084013e61024e565b606091505b50909250905061025f8583836102c6565b95945050505050565b34156102875760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b0381166102b257604051633173bdd160e11b81525f60048201526024016101a8565b805f805160206110a28339815191526101d4565b6060826102db576102d682610325565b61031e565b81511580156102f257506001600160a01b0384163b155b1561031b57604051639996b31560e01b81526001600160a01b03851660048201526024016101a8565b50805b9392505050565b8051156103355780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6104ef80610bb383390190565b80516001600160a01b0381168114610371575f80fd5b919050565b634e487b7160e01b5f52604160045260245ffd5b5f805f6060848603121561039c575f80fd5b6103a58461035b565b92506103b36020850161035b565b60408501519092506001600160401b038111156103ce575f80fd5b8401601f810186136103de575f80fd5b80516001600160401b038111156103f7576103f7610376565b604051601f8201601f19908116603f011681016001600160401b038111828210171561042557610425610376565b60405281815282820160200188101561043c575f80fd5b8160208401602083015e5f602083830101528093505050509250925092565b600181811c9082168061046f57607f821691505b60208210810361048d57634e487b7160e01b5f52602260045260245ffd5b50919050565b601f8211156100f957805f5260205f20601f840160051c810160208510156104b85750805b601f840160051c820191505b818110156104d7575f81556001016104c4565b5050505050565b81516001600160401b038111156104f7576104f7610376565b61050b81610505845461045b565b84610493565b6020601f82116001811461053d575f83156105265750848201515b5f19600385901b1c1916600184901b1784556104d7565b5f84815260208120601f198516915b8281101561056c578785015182556020948501946001909201910161054c565b508482101561058957868401515f19600387901b60f8161c191681555b50505050600190811b01905550565b5f82518060208501845e5f920191825250919050565b6080516105e86105cb5f395f81816075015260a101526105e85ff3fe608060405260043610610028575f3560e01c8063514e2d93146100325780638b3240a01461005c575b61003061009f565b005b34801561003d575f80fd5b50610046610113565b6040516100539190610423565b60405180910390f35b348015610067575f80fd5b506040516001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000168152602001610053565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316330361010b575f356001600160e01b03191663278f794360e11b14610101576040516334ad5dbb60e21b815260040160405180910390fd5b6101096101a7565b565b6101096101d5565b60605f805461012190610458565b80601f016020809104026020016040519081016040528092919081815260200182805461014d90610458565b80156101985780601f1061016f57610100808354040283529160200191610198565b820191905f5260205f20905b81548152906001019060200180831161017b57829003601f168201915b5050505050905090565b905090565b5f806101b63660048184610490565b8101906101c391906104cb565b915091506101d182826101e5565b5050565b6101096101e061023f565b610271565b6101ee8261028f565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561023757610232828261030a565b505050565b6101d161037c565b5f6101a27f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e80801561028b573d5ff35b3d5ffd5b806001600160a01b03163b5f036102c957604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b031684604051610326919061059c565b5f60405180830381855af49150503d805f811461035e576040519150601f19603f3d011682016040523d82523d5f602084013e610363565b606091505b509150915061037385838361039b565b95945050505050565b34156101095760405163b398979f60e01b815260040160405180910390fd5b6060826103b0576103ab826103fa565b6103f3565b81511580156103c757506001600160a01b0384163b155b156103f057604051639996b31560e01b81526001600160a01b03851660048201526024016102c0565b50805b9392505050565b80511561040a5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b600181811c9082168061046c57607f821691505b60208210810361048a57634e487b7160e01b5f52602260045260245ffd5b50919050565b5f808585111561049e575f80fd5b838611156104aa575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156104dc575f80fd5b82356001600160a01b03811681146104f2575f80fd5b9150602083013567ffffffffffffffff81111561050d575f80fd5b8301601f8101851361051d575f80fd5b803567ffffffffffffffff811115610537576105376104b7565b604051601f8201601f19908116603f0116810167ffffffffffffffff81118282101715610566576105666104b7565b60405281815282820160200187101561057d575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea264697066735822122068eb3582d94c42ef5e17bc746088d0b2e5458c9bbe06da2bc30decce86f2b96964736f6c634300081a0033608060405234801561000f575f80fd5b506040516104ef3803806104ef83398101604081905261002e916100bb565b806001600160a01b03811661005c57604051631e4fbdf760e01b81525f600482015260240160405180910390fd5b6100658161006c565b50506100e8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602082840312156100cb575f80fd5b81516001600160a01b03811681146100e1575f80fd5b9392505050565b6103fa806100f55f395ff3fe608060405260043610610049575f3560e01c8063715018a61461004d5780638da5cb5b146100635780639623609d1461008e578063ad3cb1cc146100a1578063f2fde38b146100de575b5f80fd5b348015610058575f80fd5b506100616100fd565b005b34801561006e575f80fd5b505f546040516001600160a01b0390911681526020015b60405180910390f35b61006161009c366004610260565b610110565b3480156100ac575f80fd5b506100d1604051806040016040528060058152602001640352e302e360dc1b81525081565b6040516100859190610365565b3480156100e9575f80fd5b506100616100f836600461037e565b61017b565b6101056101bd565b61010e5f6101e9565b565b6101186101bd565b60405163278f794360e11b81526001600160a01b03841690634f1ef2869034906101489086908690600401610399565b5f604051808303818588803b15801561015f575f80fd5b505af1158015610171573d5f803e3d5ffd5b5050505050505050565b6101836101bd565b6001600160a01b0381166101b157604051631e4fbdf760e01b81525f60048201526024015b60405180910390fd5b6101ba816101e9565b50565b5f546001600160a01b0316331461010e5760405163118cdaa760e01b81523360048201526024016101a8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101ba575f80fd5b634e487b7160e01b5f52604160045260245ffd5b5f805f60608486031215610272575f80fd5b833561027d81610238565b9250602084013561028d81610238565b9150604084013567ffffffffffffffff8111156102a8575f80fd5b8401601f810186136102b8575f80fd5b803567ffffffffffffffff8111156102d2576102d261024c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156103015761030161024c565b604052818152828201602001881015610318575f80fd5b816020840160208301375f602083830101528093505050509250925092565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6103776020830184610337565b9392505050565b5f6020828403121561038e575f80fd5b813561037781610238565b6001600160a01b03831681526040602082018190525f906103bc90830184610337565b94935050505056fea264697066735822122063012ab3c3421087c307802be7295f03bec95db9eea702a4c2db9595befa162464736f6c634300081a0033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103",
-  "deployedBytecode": "0x608060405260043610610028575f3560e01c8063514e2d93146100325780638b3240a01461005c575b61003061009f565b005b34801561003d575f80fd5b50610046610113565b6040516100539190610423565b60405180910390f35b348015610067575f80fd5b506040516001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000168152602001610053565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316330361010b575f356001600160e01b03191663278f794360e11b14610101576040516334ad5dbb60e21b815260040160405180910390fd5b6101096101a7565b565b6101096101d5565b60605f805461012190610458565b80601f016020809104026020016040519081016040528092919081815260200182805461014d90610458565b80156101985780601f1061016f57610100808354040283529160200191610198565b820191905f5260205f20905b81548152906001019060200180831161017b57829003601f168201915b5050505050905090565b905090565b5f806101b63660048184610490565b8101906101c391906104cb565b915091506101d182826101e5565b5050565b6101096101e061023f565b610271565b6101ee8261028f565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561023757610232828261030a565b505050565b6101d161037c565b5f6101a27f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e80801561028b573d5ff35b3d5ffd5b806001600160a01b03163b5f036102c957604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b031684604051610326919061059c565b5f60405180830381855af49150503d805f811461035e576040519150601f19603f3d011682016040523d82523d5f602084013e610363565b606091505b509150915061037385838361039b565b95945050505050565b34156101095760405163b398979f60e01b815260040160405180910390fd5b6060826103b0576103ab826103fa565b6103f3565b81511580156103c757506001600160a01b0384163b155b156103f057604051639996b31560e01b81526001600160a01b03851660048201526024016102c0565b50805b9392505050565b80511561040a5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b600181811c9082168061046c57607f821691505b60208210810361048a57634e487b7160e01b5f52602260045260245ffd5b50919050565b5f808585111561049e575f80fd5b838611156104aa575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156104dc575f80fd5b82356001600160a01b03811681146104f2575f80fd5b9150602083013567ffffffffffffffff81111561050d575f80fd5b8301601f8101851361051d575f80fd5b803567ffffffffffffffff811115610537576105376104b7565b604051601f8201601f19908116603f0116810167ffffffffffffffff81118282101715610566576105666104b7565b60405281815282820160200187101561057d575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea264697066735822122068eb3582d94c42ef5e17bc746088d0b2e5458c9bbe06da2bc30decce86f2b96964736f6c634300081a0033",
+  "bytecode": "0x60a060405234801561000f575f5ffd5b506040516110b93803806110b983398101604081905261002e9161038a565b828282828161003d82826100ac565b50508160405161004c9061034e565b6001600160a01b039091168152602001604051809103905ff080158015610075573d5f5f3e3d5ffd5b506001600160a01b031660805261009361008e60805190565b61010a565b505f91506100a3905082826104de565b505050506105ae565b6100b582610177565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a28051156100fe576100f982826101f5565b505050565b610106610268565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f6101495f5160206110995f395f51905f52546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a161017481610289565b50565b806001600160a01b03163b5f036101b157604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b60605f5f846001600160a01b0316846040516102119190610598565b5f60405180830381855af49150503d805f8114610249576040519150601f19603f3d011682016040523d82523d5f602084013e61024e565b606091505b50909250905061025f8583836102c6565b95945050505050565b34156102875760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b0381166102b257604051633173bdd160e11b81525f60048201526024016101a8565b805f5160206110995f395f51905f526101d4565b6060826102db576102d682610325565b61031e565b81511580156102f257506001600160a01b0384163b155b1561031b57604051639996b31560e01b81526001600160a01b03851660048201526024016101a8565b50805b9392505050565b8051156103355780518082602001fd5b60405163d6bda27560e01b815260040160405180910390fd5b6104e680610bb383390190565b80516001600160a01b0381168114610371575f5ffd5b919050565b634e487b7160e01b5f52604160045260245ffd5b5f5f5f6060848603121561039c575f5ffd5b6103a58461035b565b92506103b36020850161035b565b60408501519092506001600160401b038111156103ce575f5ffd5b8401601f810186136103de575f5ffd5b80516001600160401b038111156103f7576103f7610376565b604051601f8201601f19908116603f011681016001600160401b038111828210171561042557610425610376565b60405281815282820160200188101561043c575f5ffd5b8160208401602083015e5f602083830101528093505050509250925092565b600181811c9082168061046f57607f821691505b60208210810361048d57634e487b7160e01b5f52602260045260245ffd5b50919050565b601f8211156100f957805f5260205f20601f840160051c810160208510156104b85750805b601f840160051c820191505b818110156104d7575f81556001016104c4565b5050505050565b81516001600160401b038111156104f7576104f7610376565b61050b81610505845461045b565b84610493565b6020601f82116001811461053d575f83156105265750848201515b5f19600385901b1c1916600184901b1784556104d7565b5f84815260208120601f198516915b8281101561056c578785015182556020948501946001909201910161054c565b508482101561058957868401515f19600387901b60f8161c191681555b50505050600190811b01905550565b5f82518060208501845e5f920191825250919050565b6080516105e86105cb5f395f81816075015260a101526105e85ff3fe608060405260043610610028575f3560e01c8063514e2d93146100325780638b3240a01461005c575b61003061009f565b005b34801561003d575f5ffd5b50610046610113565b6040516100539190610423565b60405180910390f35b348015610067575f5ffd5b506040516001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000168152602001610053565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316330361010b575f356001600160e01b03191663278f794360e11b14610101576040516334ad5dbb60e21b815260040160405180910390fd5b6101096101a7565b565b6101096101d5565b60605f805461012190610458565b80601f016020809104026020016040519081016040528092919081815260200182805461014d90610458565b80156101985780601f1061016f57610100808354040283529160200191610198565b820191905f5260205f20905b81548152906001019060200180831161017b57829003601f168201915b5050505050905090565b905090565b5f806101b63660048184610490565b8101906101c391906104cb565b915091506101d182826101e5565b5050565b6101096101e061023f565b610271565b6101ee8261028f565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561023757610232828261030a565b505050565b6101d161037c565b5f6101a27f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f5f375f5f365f845af43d5f5f3e80801561028b573d5ff35b3d5ffd5b806001600160a01b03163b5f036102c957604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f5f846001600160a01b031684604051610326919061059c565b5f60405180830381855af49150503d805f811461035e576040519150601f19603f3d011682016040523d82523d5f602084013e610363565b606091505b509150915061037385838361039b565b95945050505050565b34156101095760405163b398979f60e01b815260040160405180910390fd5b6060826103b0576103ab826103fa565b6103f3565b81511580156103c757506001600160a01b0384163b155b156103f057604051639996b31560e01b81526001600160a01b03851660048201526024016102c0565b50805b9392505050565b80511561040a5780518082602001fd5b60405163d6bda27560e01b815260040160405180910390fd5b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b600181811c9082168061046c57607f821691505b60208210810361048a57634e487b7160e01b5f52602260045260245ffd5b50919050565b5f5f8585111561049e575f5ffd5b838611156104aa575f5ffd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f5f604083850312156104dc575f5ffd5b82356001600160a01b03811681146104f2575f5ffd5b9150602083013567ffffffffffffffff81111561050d575f5ffd5b8301601f8101851361051d575f5ffd5b803567ffffffffffffffff811115610537576105376104b7565b604051601f8201601f19908116603f0116810167ffffffffffffffff81118282101715610566576105666104b7565b60405281815282820160200187101561057d575f5ffd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea26469706673582212204296375230d05397af03eda797dd0a36dcf8739ca7db3b8052059349ae00319964736f6c634300081b00336080604052348015600e575f5ffd5b506040516104e63803806104e6833981016040819052602b9160b4565b806001600160a01b038116605857604051631e4fbdf760e01b81525f600482015260240160405180910390fd5b605f816065565b505060df565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f6020828403121560c3575f5ffd5b81516001600160a01b038116811460d8575f5ffd5b9392505050565b6103fa806100ec5f395ff3fe608060405260043610610049575f3560e01c8063715018a61461004d5780638da5cb5b146100635780639623609d1461008e578063ad3cb1cc146100a1578063f2fde38b146100de575b5f5ffd5b348015610058575f5ffd5b506100616100fd565b005b34801561006e575f5ffd5b505f546040516001600160a01b0390911681526020015b60405180910390f35b61006161009c366004610260565b610110565b3480156100ac575f5ffd5b506100d1604051806040016040528060058152602001640352e302e360dc1b81525081565b6040516100859190610365565b3480156100e9575f5ffd5b506100616100f836600461037e565b61017b565b6101056101bd565b61010e5f6101e9565b565b6101186101bd565b60405163278f794360e11b81526001600160a01b03841690634f1ef2869034906101489086908690600401610399565b5f604051808303818588803b15801561015f575f5ffd5b505af1158015610171573d5f5f3e3d5ffd5b5050505050505050565b6101836101bd565b6001600160a01b0381166101b157604051631e4fbdf760e01b81525f60048201526024015b60405180910390fd5b6101ba816101e9565b50565b5f546001600160a01b0316331461010e5760405163118cdaa760e01b81523360048201526024016101a8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101ba575f5ffd5b634e487b7160e01b5f52604160045260245ffd5b5f5f5f60608486031215610272575f5ffd5b833561027d81610238565b9250602084013561028d81610238565b9150604084013567ffffffffffffffff8111156102a8575f5ffd5b8401601f810186136102b8575f5ffd5b803567ffffffffffffffff8111156102d2576102d261024c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156103015761030161024c565b604052818152828201602001881015610318575f5ffd5b816020840160208301375f602083830101528093505050509250925092565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6103776020830184610337565b9392505050565b5f6020828403121561038e575f5ffd5b813561037781610238565b6001600160a01b03831681526040602082018190525f906103bc90830184610337565b94935050505056fea2646970667358221220a9c065fe5e029fc9342572ca82d58e4e140a3fa74c6c25e5cc5c475e853ad26264736f6c634300081b0033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103",
+  "deployedBytecode": "0x608060405260043610610028575f3560e01c8063514e2d93146100325780638b3240a01461005c575b61003061009f565b005b34801561003d575f5ffd5b50610046610113565b6040516100539190610423565b60405180910390f35b348015610067575f5ffd5b506040516001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000168152602001610053565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316330361010b575f356001600160e01b03191663278f794360e11b14610101576040516334ad5dbb60e21b815260040160405180910390fd5b6101096101a7565b565b6101096101d5565b60605f805461012190610458565b80601f016020809104026020016040519081016040528092919081815260200182805461014d90610458565b80156101985780601f1061016f57610100808354040283529160200191610198565b820191905f5260205f20905b81548152906001019060200180831161017b57829003601f168201915b5050505050905090565b905090565b5f806101b63660048184610490565b8101906101c391906104cb565b915091506101d182826101e5565b5050565b6101096101e061023f565b610271565b6101ee8261028f565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561023757610232828261030a565b505050565b6101d161037c565b5f6101a27f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f5f375f5f365f845af43d5f5f3e80801561028b573d5ff35b3d5ffd5b806001600160a01b03163b5f036102c957604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f5f846001600160a01b031684604051610326919061059c565b5f60405180830381855af49150503d805f811461035e576040519150601f19603f3d011682016040523d82523d5f602084013e610363565b606091505b509150915061037385838361039b565b95945050505050565b34156101095760405163b398979f60e01b815260040160405180910390fd5b6060826103b0576103ab826103fa565b6103f3565b81511580156103c757506001600160a01b0384163b155b156103f057604051639996b31560e01b81526001600160a01b03851660048201526024016102c0565b50805b9392505050565b80511561040a5780518082602001fd5b60405163d6bda27560e01b815260040160405180910390fd5b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b600181811c9082168061046c57607f821691505b60208210810361048a57634e487b7160e01b5f52602260045260245ffd5b50919050565b5f5f8585111561049e575f5ffd5b838611156104aa575f5ffd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f5f604083850312156104dc575f5ffd5b82356001600160a01b03811681146104f2575f5ffd5b9150602083013567ffffffffffffffff81111561050d575f5ffd5b8301601f8101851361051d575f5ffd5b803567ffffffffffffffff811115610537576105376104b7565b604051601f8201601f19908116603f0116810167ffffffffffffffff81118282101715610566576105666104b7565b60405281815282820160200187101561057d575f5ffd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea26469706673582212204296375230d05397af03eda797dd0a36dcf8739ca7db3b8052059349ae00319964736f6c634300081b0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../build-info/89d4fb84a121eb1fe6d86b9702ec88cd.json"
+}

package/artifacts/contracts/upgradeability/{Upgradeable.sol/Upgradeable.json → Versionable.sol/Versionable.json}

@@ -1,50 +1,13 @@
 {
   "_format": "hh-sol-artifact-1",
-  "contractName": "Upgradeable",
-  "sourceName": "contracts/upgradeability/Upgradeable.sol",
+  "contractName": "Versionable",
+  "sourceName": "contracts/upgradeability/Versionable.sol",
   "abi": [
     {
       "inputs": [],
       "name": "ErrorVersionableInitializeNotImplemented",
       "type": "error"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "target",
-          "type": "address"
-        },
-        {
-          "internalType": "VersionPart",
-          "name": "invalidRelease",
-          "type": "uint8"
-        }
-      ],
-      "name": "ErrorVersionableReleaseInvalid",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "target",
-          "type": "address"
-        },
-        {
-          "internalType": "VersionPart",
-          "name": "expected",
-          "type": "uint8"
-        },
-        {
-          "internalType": "VersionPart",
-          "name": "actual",
-          "type": "uint8"
-        }
-      ],
-      "name": "ErrorVersionableReleaseMismatch",
-      "type": "error"
-    },
     {
       "inputs": [],
       "name": "ErrorVersionableUpgradeNotImplemented",
@@ -73,19 +36,6 @@
       "name": "Initialized",
       "type": "event"
     },
-    {
-      "inputs": [],
-      "name": "getRelease",
-      "outputs": [
-        {
-          "internalType": "VersionPart",
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "stateMutability": "pure",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "getVersion",
@@ -112,7 +62,7 @@
           "type": "bytes"
         }
       ],
-      "name": "initialize",
+      "name": "initializeVersionable",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -125,7 +75,7 @@
           "type": "bytes"
         }
       ],
-      "name": "upgrade",
+      "name": "upgradeVersionable",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"

package/contracts/accounting/AccountingService.sol

@@ -9,7 +9,7 @@ import {InstanceStore} from "../instance/InstanceStore.sol";
 import {Amount, AmountLib} from "../type/Amount.sol";
 import {Fee} from "../type/Fee.sol";
 import {NftId} from "../type/NftId.sol";
-import {ObjectType, ACCOUNTING, BUNDLE, DISTRIBUTION, DISTRIBUTOR, POOL, PRODUCT} from "../type/ObjectType.sol";
+import {ObjectType, ACCOUNTING, BUNDLE, COMPONENT, DISTRIBUTION, DISTRIBUTOR, POOL, PRODUCT} from "../type/ObjectType.sol";
 import {Service} from "../shared/Service.sol";
 
 
@@ -26,13 +26,14 @@ contract AccountingService is
     )
         internal
         virtual override
-        onlyInitializing()
+        initializer()
     {
         (
-            address authority
-        ) = abi.decode(data, (address));
+            address authority,
+            address registry
+        ) = abi.decode(data, (address, address));
 
-        __Service_init(authority, owner);
+        __Service_init(authority, registry, owner);
         _registerInterface(type(IAccountingService).interfaceId);
     }
 
@@ -45,7 +46,7 @@ contract AccountingService is
         virtual
         restricted()
     {
-        _changeTargetBalance(DECREASE, instanceStore, componentNftId, AmountLib.zero(), feeAmount);    
+        _changeTargetBalance(DECREASE, instanceStore, componentNftId, COMPONENT(), AmountLib.zero(), feeAmount);    
     }
 
 
@@ -59,7 +60,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(productNftId, PRODUCT());
-        _changeTargetBalance(INCREASE, instanceStore, productNftId, AmountLib.zero(), feeAmount);
+        _changeTargetBalance(INCREASE, instanceStore, productNftId, PRODUCT(), AmountLib.zero(), feeAmount);
     }
 
     function increaseProductFeesForPool(
@@ -72,7 +73,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(productNftId, PRODUCT());
-        _changeTargetBalance(INCREASE, instanceStore, productNftId, AmountLib.zero(), feeAmount);
+        _changeTargetBalance(INCREASE, instanceStore, productNftId, PRODUCT(), AmountLib.zero(), feeAmount);
     }
 
 
@@ -82,7 +83,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(productNftId, PRODUCT());
-        _changeTargetBalance(DECREASE, instanceStore, productNftId, AmountLib.zero(), feeAmount);
+        _changeTargetBalance(DECREASE, instanceStore, productNftId, PRODUCT(), AmountLib.zero(), feeAmount);
     }
 
     function increaseDistributionBalance(
@@ -96,7 +97,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(distributionNftId, DISTRIBUTION());
-        _changeTargetBalance(INCREASE, instanceStore, distributionNftId, amount, feeAmount);
+        _changeTargetBalance(INCREASE, instanceStore, distributionNftId, DISTRIBUTION(), amount, feeAmount);
     }
 
 
@@ -111,7 +112,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(distributionNftId, DISTRIBUTION());
-        _changeTargetBalance(DECREASE, instanceStore, distributionNftId, amount, feeAmount);
+        _changeTargetBalance(DECREASE, instanceStore, distributionNftId, DISTRIBUTION(), amount, feeAmount);
     }
 
     function increaseDistributorBalance(
@@ -125,7 +126,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(distributorNftId, DISTRIBUTOR());
-        _changeTargetBalance(INCREASE, instanceStore, distributorNftId, amount, feeAmount);
+        _changeTargetBalance(INCREASE, instanceStore, distributorNftId, DISTRIBUTOR(), amount, feeAmount);
     }
 
     function decreaseDistributorBalance(
@@ -139,7 +140,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(distributorNftId, DISTRIBUTOR());
-        _changeTargetBalance(DECREASE, instanceStore, distributorNftId, amount, feeAmount);
+        _changeTargetBalance(DECREASE, instanceStore, distributorNftId, DISTRIBUTOR(), amount, feeAmount);
     }
 
     function increasePoolBalance(
@@ -153,7 +154,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(poolNftId, POOL());
-        _changeTargetBalance(INCREASE, instanceStore, poolNftId, amount, feeAmount);
+        _changeTargetBalance(INCREASE, instanceStore, poolNftId, POOL(), amount, feeAmount);
     }
 
     function decreasePoolBalance(
@@ -167,7 +168,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(poolNftId, POOL());
-        _changeTargetBalance(DECREASE, instanceStore, poolNftId, amount, feeAmount);
+        _changeTargetBalance(DECREASE, instanceStore, poolNftId, POOL(), amount, feeAmount);
     }
 
     function increaseBundleBalance(
@@ -181,7 +182,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(bundleNftId, BUNDLE());
-        _changeTargetBalance(INCREASE, instanceStore, bundleNftId, amount, feeAmount);
+        _changeTargetBalance(INCREASE, instanceStore, bundleNftId, BUNDLE(), amount, feeAmount);
     }
 
     function decreaseBundleBalance(
@@ -195,7 +196,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(bundleNftId, BUNDLE());
-        _changeTargetBalance(DECREASE, instanceStore, bundleNftId, amount, feeAmount);
+        _changeTargetBalance(DECREASE, instanceStore, bundleNftId, BUNDLE(), amount, feeAmount);
     }
 
     function increaseBundleBalanceForPool(
@@ -209,7 +210,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(bundleNftId, BUNDLE());
-        _changeTargetBalance(INCREASE, instanceStore, bundleNftId, amount, feeAmount);
+        _changeTargetBalance(INCREASE, instanceStore, bundleNftId, BUNDLE(), amount, feeAmount);
     }
 
     function decreaseBundleBalanceForPool(
@@ -223,7 +224,7 @@ contract AccountingService is
         restricted()
     {
         _checkNftType(bundleNftId, BUNDLE());
-        _changeTargetBalance(DECREASE, instanceStore, bundleNftId, amount, feeAmount);
+        _changeTargetBalance(DECREASE, instanceStore, bundleNftId, BUNDLE(), amount, feeAmount);
     }
 
 
@@ -233,6 +234,7 @@ contract AccountingService is
         bool increase,
         InstanceStore instanceStore, 
         NftId targetNftId, 
+        ObjectType objectType,
         Amount amount, 
         Amount feeAmount
     )
@@ -248,21 +250,8 @@ contract AccountingService is
             if(totalAmount.gtz()) { instanceStore.decreaseBalance(targetNftId, totalAmount); }
             if(feeAmount.gtz()) { instanceStore.decreaseFees(targetNftId, feeAmount); }
         }
-    }
-
 
-    function _logUpdateFee(NftId productNftId, string memory name, Fee memory feeBefore, Fee memory feeAfter)
-        internal
-        virtual
-    {
-        emit LogAccountingServiceUpdateFee(
-            productNftId, 
-            name,
-            feeBefore.fractionalFee,
-            feeBefore.fixedFee,
-            feeAfter.fractionalFee,
-            feeAfter.fixedFee
-        );
+        emit LogAccountingServiceBalanceChanged(targetNftId, amount, feeAmount, increase, objectType);
     }
 
     function _getDomain() internal pure virtual override returns(ObjectType) {

package/contracts/accounting/AccountingServiceManager.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {AccountingService} from "./AccountingService.sol";
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 
 contract AccountingServiceManager is ProxyManager {
@@ -12,17 +12,19 @@ contract AccountingServiceManager is ProxyManager {
     /// @dev initializes proxy manager with service implementation 
     constructor(
         address authority, 
+        address registry,
         bytes32 salt
     )
     {
         AccountingService svc = new AccountingService();
-        bytes memory data = abi.encode(authority);
-        IUpgradeable upgradeable = initialize(
+        bytes memory data = abi.encode(authority, registry);
+        IVersionable versionable = initialize(
+            registry,
             address(svc), 
             data,
             salt);
 
-        _accountingService = AccountingService(address(upgradeable));
+        _accountingService = AccountingService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/accounting/IAccountingService.sol

@@ -6,20 +6,19 @@ import {Amount} from "../type/Amount.sol";
 import {InstanceStore} from "../instance/InstanceStore.sol";
 import {IService} from "../shared/IService.sol";
 import {NftId} from "../type/NftId.sol";
-import {UFixed} from "../type/UFixed.sol";
+import {ObjectType} from "../type/ObjectType.sol";
 
 /// @dev component base class
 /// component examples are staking, product, distribution, pool and oracle
 interface IAccountingService is 
     IService
 {
-    event LogAccountingServiceUpdateFee(
-        NftId nftId, 
-        string feeName, 
-        UFixed previousFractionalFee, 
-        Amount previousFixedFee,
-        UFixed newFractionalFee, 
-        Amount newFixedFee
+    event LogAccountingServiceBalanceChanged(
+        NftId indexed nftId,
+        Amount indexed amount,
+        Amount indexed feeAmount,
+        bool increase,
+        ObjectType objectType
     );
 
     function decreaseComponentFees(InstanceStore instanceStore, NftId componentNftId, Amount feeAmount) external;

package/contracts/authorization/AccessAdmin.sol

@@ -7,20 +7,20 @@ import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet
 import {IAccess} from "./IAccess.sol";
 import {IAccessAdmin} from "./IAccessAdmin.sol";
 import {IAuthorization} from "./IAuthorization.sol";
+import {IRegistry} from "../registry/IRegistry.sol";
 import {IServiceAuthorization} from "./IServiceAuthorization.sol";
 
 import {AccessAdminLib} from "./AccessAdminLib.sol";
 import {AccessManagerCloneable} from "./AccessManagerCloneable.sol";
 import {Blocknumber, BlocknumberLib} from "../type/Blocknumber.sol";
 import {ContractLib} from "../shared/ContractLib.sol";
-import {NftId} from "../type/NftId.sol";
+import {NftId, NftIdLib} from "../type/NftId.sol";
 import {ObjectType} from "../type/ObjectType.sol";
 import {RoleId, RoleIdLib, ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
-import {RegistryLinked} from "../shared/RegistryLinked.sol";
 import {Selector, SelectorSetLib} from "../type/Selector.sol";
 import {Str, StrLib} from "../type/String.sol";
 import {TimestampLib} from "../type/Timestamp.sol";
-import {VersionPartLib, VersionPart} from "../type/Version.sol";
+import {VersionPart} from "../type/Version.sol";
 
 
 /**
@@ -30,7 +30,6 @@ import {VersionPartLib, VersionPart} from "../type/Version.sol";
  */ 
 contract AccessAdmin is
     AccessManagedUpgradeable,
-    RegistryLinked,
     IAccessAdmin
 {
     using EnumerableSet for EnumerableSet.AddressSet;
@@ -92,16 +91,12 @@ contract AccessAdmin is
     /// Internally initializes access manager with this admin and creates basic role setup.
     function initialize(
         address authority,
-        string memory adminName,
-        VersionPart release 
+        string memory adminName 
     )
         public
+        initializer()
     {
-        if(_getInitializedVersion() != 0) {
-            revert InvalidInitialization();
-        }
-
-        __AccessAdmin_init(authority, adminName, release);
+        __AccessAdmin_init(authority, adminName);
     }
 
 
@@ -111,16 +106,14 @@ contract AccessAdmin is
     /// - this function as well as any completeSetup functions MUST be called in the same tx.
     function __AccessAdmin_init(
         address authority, 
-        string memory adminName,
-        VersionPart release
+        string memory adminName 
     )
         internal
-        reinitializer(release.toInt())
+        onlyInitializing()
     {
         AccessAdminLib.checkInitParameters(authority, adminName);
-
         _authority = AccessManagerCloneable(authority);
-        _authority.initialize(address(this), release);
+        _authority.initialize(address(this));
 
         // delayed additional check for authority after its initialization
         if (!ContractLib.isAuthority(authority)) {
@@ -128,7 +121,7 @@ contract AccessAdmin is
         }
 
         // effects
-        // set and initialize this contract as
+        // set and initialize this access manager contract as
         // the admin (ADMIN_ROLE) of the provided authority
         __AccessManaged_init(authority);
 
@@ -136,7 +129,7 @@ contract AccessAdmin is
         _adminName = adminName;
 
         // set initial linked NFT ID to zero
-        //_linkedNftId = NftIdLib.zero();
+        _linkedNftId = NftIdLib.zero();
 
         // setup admin role
         _createRoleUnchecked(
@@ -156,7 +149,12 @@ contract AccessAdmin is
     //--- view functions for access admin ---------------------------------------//
 
     function getRelease() public view virtual returns (VersionPart release) {
-        return VersionPartLib.toVersionPart(uint8(_getInitializedVersion()));
+        return _authority.getRelease();
+    }
+
+
+    function getRegistry() public view returns (IRegistry registry) {
+        return _authority.getRegistry();
     }
 
 
@@ -281,10 +279,11 @@ contract AccessAdmin is
     {
         Selector selector = SelectorSetLib.at(_targetFunctions[target], idx);
         func = _functionInfo[target][selector];
-        roleId = RoleIdLib.toRoleId(
-            _authority.getTargetFunctionRole(
-                target, 
-                selector.toBytes4()));
+        roleId = AccessAdminLib.getFunctionRoleId(_authority, target, selector);
+        // roleId = RoleIdLib.toRoleId(
+        //     _authority.getTargetFunctionRole(
+        //         target, 
+        //         selector.toBytes4()));
     }
 
 
@@ -299,12 +298,11 @@ contract AccessAdmin is
     //--- internal/private functions -------------------------------------------------//
 
     function _linkToNftOwnable(address registerable) internal {
-        NftId nftId = _getRegistry().getNftIdForAddress(registerable);
-        if (nftId.eqz()) {
+        if (!getRegistry().isRegistered(registerable)) {
             revert ErrorAccessAdminNotRegistered(registerable);
         }
 
-        _linkedNftId = nftId;
+        _linkedNftId = getRegistry().getNftIdForAddress(registerable);
     }
 
 
@@ -321,7 +319,7 @@ contract AccessAdmin is
             (RoleId roleId, bool exists) = getRoleForName(roleInfo.name.toString());
 
             if (!exists) {
-                if (!AccessAdminLib.isDynamicRoleId(authzRoleId)) {
+                if (!AccessAdminLib.isDynamicRoleId(authzRoleId) || roleInfo.targetType == TargetType.Custom) {
                     roleId = authzRoleId;
                 }
 
@@ -369,7 +367,7 @@ contract AccessAdmin is
         // add role to list of roles
         _roleIds.push(roleId);
 
-        emit LogAccessAdminRoleCreated(_adminName, roleId, info.targetType, info.adminRoleId, info.name.toString());
+        emit LogAccessAdminRoleCreated(roleId, info.adminRoleId, info.targetType, info.name.toString(), _adminName);
     }
 
 
@@ -389,7 +387,7 @@ contract AccessAdmin is
         Blocknumber lastUpdateIn = _roleInfo[roleId].lastUpdateIn;
         _roleInfo[roleId].lastUpdateIn = BlocknumberLib.current();
 
-        emit LogAccessAdminRoleActivatedSet(_adminName, roleId, active, lastUpdateIn);
+        emit LogAccessAdminRoleActivatedSet(roleId, active, _adminName, lastUpdateIn);
     }
 
 
@@ -420,9 +418,9 @@ contract AccessAdmin is
             0);
         
         emit LogAccessAdminRoleGranted(
-            _adminName, 
             account, 
-            AccessAdminLib.getRoleName(this, roleId));
+            AccessAdminLib.getRoleName(this, roleId),
+            _adminName);
     }
 
 
@@ -443,7 +441,7 @@ contract AccessAdmin is
             RoleId.unwrap(roleId), 
             account);
 
-        emit LogAccessAdminRoleRevoked(_adminName, account, _roleInfo[roleId].name.toString());
+        emit LogAccessAdminRoleRevoked(account, _roleInfo[roleId].name.toString(), _adminName);
     }
 
 
@@ -559,7 +557,7 @@ contract AccessAdmin is
         // grant contract role to target
         _grantRoleToAccount(targetRoleId, target);
 
-        emit LogAccessAdminTargetCreated(_adminName, targetName, managed, target, targetRoleId);
+        emit LogAccessAdminTargetCreated(target, targetRoleId, managed, targetName, _adminName);
     }
 
 
@@ -573,7 +571,7 @@ contract AccessAdmin is
         Blocknumber lastUpdateIn = _targetInfo[target].lastUpdateIn;
         _targetInfo[target].lastUpdateIn = BlocknumberLib.current();
 
-        emit LogAccessAdminTargetLockedSet(_adminName, target, locked, lastUpdateIn);
+        emit LogAccessAdminTargetLockedSet(target, locked, _adminName, lastUpdateIn);
     }
 
 
@@ -654,29 +652,11 @@ contract AccessAdmin is
 
         // logging
         emit LogAccessAdminFunctionGranted(
-            _adminName, 
             target, 
+            selector,
+            roleId,
             AccessAdminLib.toFunctionGrantingString(this, func.name, roleId),
+            _adminName, 
             lastUpdateIn);
     }
-
-
-    function _checkAuthorization( 
-        address authorization,
-        ObjectType expectedDomain, 
-        VersionPart expectedRelease,
-        bool expectServiceAuthorization,
-        bool checkAlreadyInitialized
-    )
-        internal
-        view
-    {
-        AccessAdminLib.checkAuthorization(
-            address(_authorization), 
-            authorization, 
-            expectedDomain, 
-            expectedRelease, 
-            expectServiceAuthorization,
-            checkAlreadyInitialized);
-    }
 }