@etherisc/gif-next 3.0.0-a258744-217 → 3.0.0-a349fe9-700

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5b88211705aac59c4fe0993bbc1523ad.json"
+  "buildInfo": "../../../build-info/b18e672d65d707a8e395ddf4ffc793b4.json"
 }

package/contracts/authorization/AccessAdmin.sol

@@ -367,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);
     }
 
 
@@ -387,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);
     }
 
 
@@ -418,9 +418,9 @@ contract AccessAdmin is
             0);
         
         emit LogAccessAdminRoleGranted(
-            _adminName, 
             account, 
-            AccessAdminLib.getRoleName(this, roleId));
+            AccessAdminLib.getRoleName(this, roleId),
+            _adminName);
     }
 
 
@@ -441,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);
     }
 
 
@@ -557,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);
     }
 
 
@@ -571,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);
     }
 
 
@@ -652,9 +652,11 @@ contract AccessAdmin is
 
         // logging
         emit LogAccessAdminFunctionGranted(
-            _adminName, 
             target, 
+            selector,
+            roleId,
             AccessAdminLib.toFunctionGrantingString(this, func.name, roleId),
+            _adminName, 
             lastUpdateIn);
     }
 }

package/contracts/authorization/AccessManagerCloneable.sol

@@ -24,6 +24,8 @@ contract AccessManagerCloneable is
     error ErrorAccessManagerTargetAdminLocked(address target);
     error ErrorAccessManagerCallerAdminLocked(address caller);
 
+    event LogAccessManagerLocked(address indexed accessManager, bool indexed locked);
+
     VersionPart private _release;
     bool private _isLocked;
 
@@ -39,6 +41,7 @@ contract AccessManagerCloneable is
 
     function initialize(address admin)
         public
+        override
         initializer()
     {
         __ERC165_init();
@@ -94,6 +97,7 @@ contract AccessManagerCloneable is
         onlyAdminRole() 
     {
         _isLocked = locked;
+        emit LogAccessManagerLocked(address(this), locked);
     }
 
 

package/contracts/authorization/IAccessAdmin.sol

@@ -12,6 +12,7 @@ import {Blocknumber} from "../type/Blocknumber.sol";
 import {NftId} from "../type/NftId.sol";
 import {ObjectType} from "../type/ObjectType.sol";
 import {RoleId} from "../type/RoleId.sol";
+import {Selector} from "../type/Selector.sol";
 import {Str} from "../type/String.sol";
 import {VersionPart} from "../type/Version.sol";
 
@@ -24,14 +25,14 @@ interface IAccessAdmin is
 {
 
     // roles, targets and functions
-    event LogAccessAdminRoleCreated(string admin, RoleId roleId, TargetType targetType, RoleId roleAdminId, string name);
-    event LogAccessAdminTargetCreated(string admin, string name, bool managed, address target, RoleId roleId);
-
-    event LogAccessAdminRoleActivatedSet(string admin, RoleId roleId, bool active, Blocknumber lastUpdateIn);
-    event LogAccessAdminRoleGranted(string admin, address account, string roleName);
-    event LogAccessAdminRoleRevoked(string admin, address account, string roleName);
-    event LogAccessAdminTargetLockedSet(string admin, address target, bool locked, Blocknumber lastUpdateIn);
-    event LogAccessAdminFunctionGranted(string admin, address target, string func, Blocknumber lastUpdateIn);
+    event LogAccessAdminRoleCreated(RoleId indexed roleId, RoleId indexed roleAdminId, TargetType indexed targetType, string name, string admin);
+    event LogAccessAdminTargetCreated(address indexed target, RoleId indexed roleId, bool indexed managed, string name, string admin);
+
+    event LogAccessAdminRoleActivatedSet(RoleId indexed roleId, bool indexed active, string admin, Blocknumber indexed lastUpdateIn);
+    event LogAccessAdminRoleGranted(address indexed account, string roleName, string admin);
+    event LogAccessAdminRoleRevoked(address indexed account, string roleName, string admin);
+    event LogAccessAdminTargetLockedSet(address indexed target, bool indexed locked, string admin, Blocknumber indexed lastUpdateIn);
+    event LogAccessAdminFunctionGranted(address indexed target, Selector indexed selector, RoleId indexed roleId, string func, string admin, Blocknumber lastUpdateIn);
 
     // only deployer modifier
     error ErrorAccessAdminNotDeployer();

package/contracts/distribution/DistributionService.sol

@@ -98,21 +98,24 @@ contract DistributionService is
         }
 
         distributorType = DistributorTypeLib.toDistributorType(distributionNftId, name);
-        IDistribution.DistributorTypeInfo memory info = IDistribution.DistributorTypeInfo({
-            name: name,
-            distributionNftId: distributionNftId,
-            minDiscountPercentage: minDiscountPercentage,
-            maxDiscountPercentage: maxDiscountPercentage,
-            commissionPercentage: commissionPercentage,
-            maxReferralCount: maxReferralCount,
-            maxReferralLifetime: maxReferralLifetime,
-            allowSelfReferrals: allowSelfReferrals,
-            allowRenewals: allowRenewals,
-            data: data});
-
-        instance.getInstanceStore().createDistributorType(distributorType, info);
+        
+        {
+            IDistribution.DistributorTypeInfo memory info = IDistribution.DistributorTypeInfo({
+                name: name,
+                distributionNftId: distributionNftId,
+                minDiscountPercentage: minDiscountPercentage,
+                maxDiscountPercentage: maxDiscountPercentage,
+                commissionPercentage: commissionPercentage,
+                maxReferralCount: maxReferralCount,
+                maxReferralLifetime: maxReferralLifetime,
+                allowSelfReferrals: allowSelfReferrals,
+                allowRenewals: allowRenewals,
+                data: data});
+
+            instance.getInstanceStore().createDistributorType(distributorType, info);
+        }
 
-        emit LogDistributionServiceDistributorTypeCreated(distributionNftId, name, commissionPercentage);
+        emit LogDistributionServiceDistributorTypeCreated(distributionNftId, distributorType, name, commissionPercentage);
     }
 
 
@@ -148,7 +151,7 @@ contract DistributionService is
 
         instance.getInstanceStore().createDistributor(distributorNftId, info);
 
-        emit LogDistributionServiceDistributorCreated(distributionNftId, distributorNftId, distributorType, distributor);
+        emit LogDistributionServiceDistributorCreated(distributionNftId, distributorNftId, distributor, distributorType);
     }
 
     function changeDistributorType(
@@ -236,7 +239,7 @@ contract DistributionService is
 
             instance.getInstanceStore().createReferral(referralId, info);
 
-            emit LogDistributionServiceReferralCreated(distributionNftId, distributorNftId, referralId, code, discountPercentage, maxReferrals, expiryAt);
+            emit LogDistributionServiceReferralCreated(distributorNftId, referralId, code, discountPercentage, maxReferrals, expiryAt);
         }
     }
 
@@ -258,7 +261,7 @@ contract DistributionService is
             referralInfo.usedReferrals += 1;
             instance.getInstanceStore().updateReferral(referralId, referralInfo, KEEP_STATE());
 
-            emit LogDistributionServiceReferralProcessed(distributionNftId, referralInfo.distributorNftId, referralId, referralInfo.usedReferrals);
+            emit LogDistributionServiceReferralProcessed(referralInfo.distributorNftId, referralId, referralInfo.usedReferrals);
         }
     }
 
@@ -299,7 +302,7 @@ contract DistributionService is
         } else {
             // increase distribution balance by distribution owner fee
             _accountingService.increaseDistributionBalance(store, distributionNftId, AmountLib.zero(), distributionOwnerFee);
-            emit LogDistributionServiceSaleProcessed(distributionNftId, referralId, premium.premiumAmount, distributionOwnerFee);
+            emit LogDistributionServiceSaleProcessed(distributionNftId, premium.premiumAmount, distributionOwnerFee);
         }
 
         
@@ -343,7 +346,7 @@ contract DistributionService is
         // transfer amount to distributor
         {
             address distributor = getRegistry().ownerOf(distributorNftId);
-            emit LogDistributionServiceCommissionWithdrawn(distributorNftId, distributor, address(distributionInfo.tokenHandler.TOKEN()), withdrawnAmount);
+            emit LogDistributionServiceCommissionWithdrawn(distributorNftId, distributor, withdrawnAmount, address(distributionInfo.tokenHandler.TOKEN()));
             distributionInfo.tokenHandler.pushToken(distributor, withdrawnAmount);
         }
     }

package/contracts/distribution/IDistributionComponent.sol

@@ -11,8 +11,6 @@ import {UFixed} from "../type/UFixed.sol";
 
 interface IDistributionComponent is IInstanceLinkedComponent {
 
-    event LogDistributorUpdated(address to, address operator);
-
     function getDiscountPercentage(
         string memory referralCode
     ) external view returns (UFixed discountPercentage, ReferralStatus status);

package/contracts/distribution/IDistributionService.sol

@@ -39,14 +39,14 @@ interface IDistributionService is IService {
     error ErrorDistributionServiceInvalidFeeTransferred(Amount transferredDistributionFeeAmount, Amount expectedDistributionFeeAmount);
     error ErrorDistributionServiceReferralDistributionMismatch(ReferralId referralId, NftId referralDistributionNft, NftId distributionNftId);
 
-    event LogDistributionServiceCommissionWithdrawn(NftId distributorNftId, address recipient, address tokenAddress, Amount amount);
-    event LogDistributionServiceDistributorTypeCreated(NftId distributionNftId, string name, UFixed commissionPercentage);
-    event LogDistributionServiceDistributorCreated(NftId distributionNftId, NftId distributorNftId, DistributorType distributorType, address distributor);
-    event LogDistributionServiceDistributorTypeChanged(NftId distributorNftId, DistributorType oldDistributorType, DistributorType newDistributorType);
-    event LogDistributionServiceReferralCreated(NftId distributionNftId, NftId distributorNftId, ReferralId referralId, string code, UFixed discountPercentage, uint32 maxReferrals, Timestamp expiryAt);
-    event LogDistributionServiceReferralProcessed(NftId distributionNftId, NftId distributorNftId, ReferralId referralId, uint32 usedReferrals);
-    event LogDistributionServiceSaleProcessed(NftId distributionNftId, ReferralId referralId, Amount premium, Amount distributionOwnerFee);
-    event LogDistributionServiceSaleProcessedWithReferral(NftId distributionNftId, NftId distributorNftId, ReferralId referralId, uint32 numPoliciesSold, Amount premium, Amount distributionOwnerFee, Amount commissionAmount);
+    event LogDistributionServiceCommissionWithdrawn(NftId indexed distributorNftId, address indexed recipient, Amount amount, address indexed tokenAddress);
+    event LogDistributionServiceDistributorTypeCreated(NftId indexed distributionNftId, DistributorType indexed distributorType, string name, UFixed commissionPercentage);
+    event LogDistributionServiceDistributorCreated(NftId indexed distributionNftId, NftId indexed distributorNftId, address indexed distributor, DistributorType distributorType);
+    event LogDistributionServiceDistributorTypeChanged(NftId indexed distributorNftId, DistributorType indexed oldDistributorType, DistributorType indexed newDistributorType);
+    event LogDistributionServiceReferralCreated(NftId indexed distributorNftId, ReferralId indexed referralId, string code, UFixed discountPercentage, uint32 maxReferrals, Timestamp expiryAt);
+    event LogDistributionServiceReferralProcessed(NftId indexed distributorNftId, ReferralId indexed referralId, uint32 usedReferrals);
+    event LogDistributionServiceSaleProcessed(NftId indexed distributionNftId, Amount premium, Amount distributionOwnerFee);
+    event LogDistributionServiceSaleProcessedWithReferral(NftId indexed distributionNftId, NftId indexed distributorNftId, ReferralId indexed referralId, uint32 numPoliciesSold, Amount premium, Amount distributionOwnerFee, Amount commissionAmount);
 
     function createDistributorType(
         string memory name,

package/contracts/examples/flight/FlightProduct.sol

@@ -216,12 +216,12 @@ contract FlightProduct is
     }
 
 
-    function resendRequest(RequestId requestId)
+    function resendResponse(RequestId requestId)
         external
         virtual
         restricted()
     {
-        _resendRequest(requestId);
+        _resendResponse(requestId);
     }
 
 

package/contracts/examples/flight/FlightProductAuthorization.sol

@@ -57,7 +57,7 @@ contract FlightProductAuthorization
 
         // authorize public role (additional authz via onlyOwner)
         functions = _authorizeForTarget(getMainTargetName(), PUBLIC_ROLE());
-        _authorize(functions, FlightProduct.resendRequest.selector, "resendRequest");
+        _authorize(functions, FlightProduct.resendResponse.selector, "resendResponse");
         _authorize(functions, FlightProduct.processPayoutsAndClosePolicies.selector, "processPayoutsAndClosePolicies");
         _authorize(functions, FlightProduct.setConstants.selector, "setConstants");
         _authorize(functions, FlightProduct.setTestMode.selector, "setTestMode");

package/contracts/instance/BundleSet.sol

@@ -14,13 +14,12 @@ contract BundleSet is
 {
     using LibNftIdSet for LibNftIdSet.Set;
 
-    event LogBundleSetPolicyLinked(NftId bundleNftId, NftId policyNftId);
-    event LogBundleSetPolicyUnlinked(NftId bundleNftId, NftId policyNftId);
+    event LogBundleSetPolicyLinked(NftId indexed bundleNftId, NftId indexed policyNftId);
+    event LogBundleSetPolicyUnlinked(NftId indexed bundleNftId, NftId indexed policyNftId);
 
-    event LogBundleSetBundleAdded(NftId poolNftId, NftId bundleNftId);
-    event LogBundleSetBundleUnlocked(NftId poolNftId, NftId bundleNftId);
-    event LogBundleSetBundleLocked(NftId poolNftId, NftId bundleNftId);
-    event LogBundleSetBundleClosed(NftId poolNftId, NftId bundleNftId);
+    event LogBundleSetBundleAdded(NftId indexed poolNftId, NftId indexed bundleNftId);
+    event LogBundleSetBundleLocked(NftId indexed poolNftId, NftId indexed bundleNftId, bool locked);
+    event LogBundleSetBundleClosed(NftId indexed poolNftId, NftId indexed bundleNftId);
 
     error ErrorBundleSetPolicyAlreadyActivated(NftId policyNftId);
     error ErrorBundleSetBundleLocked(NftId bundleNftId, NftId policyNftId);
@@ -76,14 +75,14 @@ contract BundleSet is
     function unlock(NftId bundleNftId) external restricted() {
         NftId poolNftId = ObjectSetHelperLib.getPoolNftId(_instanceAddress, bundleNftId);
         _activate(poolNftId, _toBundleKey32(bundleNftId));
-        emit LogBundleSetBundleUnlocked(poolNftId, bundleNftId);
+        emit LogBundleSetBundleLocked(poolNftId, bundleNftId, false);
     }
 
     /// @dev locked (deactivated) bundles may not collateralize any new policies
     function lock(NftId bundleNftId) external restricted() {
         NftId poolNftId = ObjectSetHelperLib.getPoolNftId(_instanceAddress, bundleNftId);
         _deactivate(poolNftId, _toBundleKey32(bundleNftId));
-        emit LogBundleSetBundleLocked(poolNftId, bundleNftId);
+        emit LogBundleSetBundleLocked(poolNftId, bundleNftId, true);
     }
 
 

package/contracts/instance/IInstance.sol

@@ -21,15 +21,15 @@ interface IInstance is
     IRegisterable
 {
     // role handling
-    event LogInstanceCustomRoleCreated(RoleId roleId, string roleName, RoleId adminRoleId, uint32 maxMemberCount);
-    event LogInstanceCustomRoleActiveSet(RoleId roleId, bool active, address caller);
-    event LogInstanceCustomRoleGranted(RoleId roleId, address account, address caller);
-    event LogInstanceCustomRoleRevoked(RoleId roleId, address account, address caller);
+    event LogInstanceCustomRoleCreated(RoleId indexed roleId, string indexed roleName, RoleId indexed adminRoleId, uint32 maxMemberCount);
+    event LogInstanceCustomRoleActiveSet(RoleId indexed roleId, bool indexed active, address indexed caller);
+    event LogInstanceCustomRoleGranted(RoleId indexed roleId, address indexed account, address indexed caller);
+    event LogInstanceCustomRoleRevoked(RoleId indexed roleId, address indexed account, address indexed caller);
 
     // target handling
-    event LogInstanceCustomTargetCreated(address target, RoleId targetRoleId, string name);
-    event LogInstanceTargetLocked(address target, bool locked);
-    event LogInstanceCustomTargetFunctionRoleSet(address target, bytes4[] selectors, RoleId roleId);
+    event LogInstanceCustomTargetCreated(address indexed target, RoleId indexed targetRoleId, string indexed name);
+    event LogInstanceTargetLocked(address indexed target, bool indexed locked);
+    event LogInstanceCustomTargetFunctionRoleSet(address indexed target, bytes4[] selectors, RoleId indexed roleId);
 
     // modifier is onlyRoleAdmin
     error ErrorInstanceNotCustomRole(RoleId roleId);

package/contracts/instance/IInstanceService.sol

@@ -56,10 +56,12 @@ interface IInstanceService is IService {
     error ErrorInstanceServiceInstanceComponentMismatch(NftId instanceNftId, NftId componentNftId);
     error ErrorInstanceServiceInvalidComponentType(address componentAddress, ObjectType expectedType, ObjectType componentType);
     
-    event LogInstanceServiceInstanceLocked(NftId instanceNftId, bool locked);
-    event LogInstanceServiceInstanceCreated(NftId instanceNftId, address instance);
-    event LogInstanceServiceMasterInstanceReaderUpgraded(NftId instanceNfId, address newInstanceReader);
-    event LogInstanceServiceInstanceReaderUpgraded(NftId instanceNfId, address newInstanceReader);
+    event LogInstanceServiceInstanceLocked(NftId indexed instanceNftId, bool indexed locked);
+    event LogInstanceServiceInstanceCreated(NftId indexed instanceNftId, address indexed instance);
+    event LogInstanceServiceMasterInstanceRegistered(NftId indexed masterInstanceNftId, address indexed masterInstance, address indexed masterInstanceAdmin, address masterAccessManager, 
+                address masterInstanceReader, address masterInstanceBundleSet, address masterInstanceRiskSet, address masterInstanceStore, address masterProductStore);
+    event LogInstanceServiceMasterInstanceReaderUpgraded(NftId indexed instanceNfId, address indexed oldInstanceReader, address indexed newInstanceReader);
+    event LogInstanceServiceInstanceReaderUpgraded(NftId indexed instanceNfId, address indexed oldInstanceReader, address indexed newInstanceReader);
 
     /// @dev Creates a new custom role for the calling instance.
     function createRole(string memory roleName, RoleId adminRoleId, uint32 maxMemberCount) external returns (RoleId roleId);

package/contracts/instance/InstanceReader.sol

@@ -164,7 +164,9 @@ contract InstanceReader {
 
 
     /// @dev Returns the currently locked amount for the given NFT ID.
-    /// The target NFT ID may reference a pool or a bundle.
+    /// Locked amounts are only tracked for bundles, not for pool. To get the 
+    /// pool locked amount, then locked amounts of the bundles contained in the 
+    /// pool must be summed up. The target NFT ID may only a bundle. 
     function getLockedAmount(NftId targetNftId) external view returns (Amount) { 
         return _store.getLockedAmount(targetNftId);
     }

package/contracts/instance/InstanceService.sol

@@ -304,11 +304,13 @@ contract InstanceService is
         InstanceReader upgradedInstanceReaderClone = InstanceReader(
             Clones.clone(address(_masterInstanceReader)));
 
+        address oldInstanceReaderAddress = address(instance.getInstanceReader());
         upgradedInstanceReaderClone.initializeWithInstance(instanceAddress);
         instance.setInstanceReader(upgradedInstanceReaderClone);
 
         emit LogInstanceServiceInstanceReaderUpgraded(
             getRegistry().getNftIdForAddress(instanceAddress),
+            oldInstanceReaderAddress,
             address(upgradedInstanceReaderClone));
     }
 
@@ -372,6 +374,10 @@ contract InstanceService is
             IInstance masterInstance = IInstance(_masterInstance);
             IRegistry.ObjectInfo memory info = _registryService.registerInstance(masterInstance, getOwner());
             masterInstanceNftId = info.nftId;
+            
+            emit LogInstanceServiceMasterInstanceRegistered(
+                masterInstanceNftId, _masterInstance, _masterInstanceAdmin, _masterAccessManager, 
+                _masterInstanceReader, _masterInstanceBundleSet, _masterInstanceRiskSet, _masterInstanceStore, _masterProductStore);
         }
     }
 
@@ -388,10 +394,12 @@ contract InstanceService is
         InstanceReader instanceReader = InstanceReader(instanceReaderAddress);
         if(instanceReader.getInstance() != IInstance(_masterInstance)) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch(); }
 
+        address oldMasterInstanceReaderAddress = _masterInstanceReader;
         _masterInstanceReader = instanceReaderAddress;
 
         emit LogInstanceServiceMasterInstanceReaderUpgraded(
             getRegistry().getNftIdForAddress(_masterInstance),
+            oldMasterInstanceReaderAddress,
             instanceReaderAddress);
     }
 

package/contracts/instance/InstanceStore.sol

@@ -34,20 +34,20 @@ contract InstanceStore is
     BaseStore
 {
 
-    event LogProductStoreComponentInfoCreated(NftId componentNftId, StateId state, address createdby, address txOrigin);
-    event LogProductStoreComponentInfoUpdated(NftId componentNftId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStorePoolInfoCreated(NftId poolNftId, StateId state, address createdBy, address txOrigin);
-    event LogProductStorePoolInfoUpdated(NftId poolNftId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStoreDistributorTypeInfoCreated(DistributorType distributorType, StateId state, address createdBy, address txOrigin);
-    event LogProductStoreDistributorTypeInfoUpdated(DistributorType distributorType, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStoreDistributorInfoCreated(NftId distributorNftId, StateId state, address createdBy, address txOrigin);
-    event LogProductStoreDistributorInfoUpdated(NftId distributorNftId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStoreReferralInfoCreated(ReferralId referralId, StateId state, address createdBy, address txOrigin);
-    event LogProductStoreReferralInfoUpdated(ReferralId referralId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStoreBundleInfoCreated(NftId bundleNftId, StateId state, address createdBy, address txOrigin);
-    event LogProductStoreBundleInfoUpdated(NftId bundleNftId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStoreRequestInfoCreated(RequestId requestId, StateId state, address createdBy, address txOrigin);
-    event LogProductStoreRequestInfoUpdated(RequestId requestId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStoreComponentInfoCreated(NftId indexed componentNftId, StateId indexed state, address indexed createdby, address txOrigin);
+    event LogProductStoreComponentInfoUpdated(NftId indexed componentNftId, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStorePoolInfoCreated(NftId indexed poolNftId, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStorePoolInfoUpdated(NftId indexed poolNftId, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStoreDistributorTypeInfoCreated(DistributorType indexed distributorType, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStoreDistributorTypeInfoUpdated(DistributorType indexed distributorType, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStoreDistributorInfoCreated(NftId indexed distributorNftId, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStoreDistributorInfoUpdated(NftId indexed distributorNftId, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStoreReferralInfoCreated(ReferralId indexed referralId, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStoreReferralInfoUpdated(ReferralId indexed referralId, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStoreBundleInfoCreated(NftId indexed bundleNftId, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStoreBundleInfoUpdated(NftId indexed bundleNftId, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStoreRequestInfoCreated(RequestId indexed requestId, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStoreRequestInfoUpdated(RequestId indexed requestId, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
 
 
     mapping(Key32 => IComponents.ComponentInfo) private _components;

package/contracts/instance/ProductStore.sol

@@ -29,20 +29,20 @@ contract ProductStore is
     ObjectCounter,
     ObjectLifecycle
 {
-    event LogProductStoreProductInfoCreated(NftId productNftId, StateId state, address createdBy, address txOrigin);
-    event LogProductStoreProductInfoUpdated(NftId productNftId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStoreFeeInfoCreated(NftId productNftId, StateId state, address createdBy, address txOrigin);
-    event LogProductStoreFeeInfoUpdated(NftId productNftId, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStoreRiskInfoCreated(RiskId riskId, StateId state, address createdBy, address txOrigin);
-    event LogProductStoreRiskInfoUpdated(RiskId riskId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStorePolicyInfoCreated(NftId policyNftId, StateId state, address createdBy, address txOrigin);
-    event LogProductStorePolicyInfoUpdated(NftId policyNftId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStorePremiumInfoCreated(NftId policyNftId, StateId state, address createdBy, address txOrigin);
-    event LogProductStorePremiumInfoUpdated(NftId policyNftId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStoreClaimInfoCreated(NftId policyNftId, ClaimId claimId, StateId state, address createdBy, address txOrigin);
-    event LogProductStoreClaimInfoUpdated(NftId policyNftId, ClaimId claimId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStorePayoutInfoCreated(NftId policyNftId, PayoutId payoutId, StateId state, address createdBy, address txOrigin);
-    event LogProductStorePayoutInfoUpdated(NftId policyNftId, PayoutId payoutId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStoreProductInfoCreated(NftId indexed productNftId, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStoreProductInfoUpdated(NftId indexed productNftId, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStoreFeeInfoCreated(NftId indexed productNftId, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStoreFeeInfoUpdated(NftId indexed productNftId, address indexed updatedBy, address indexed txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStoreRiskInfoCreated(RiskId indexed riskId, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStoreRiskInfoUpdated(RiskId indexed riskId, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStorePolicyInfoCreated(NftId indexed policyNftId, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStorePolicyInfoUpdated(NftId indexed policyNftId, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStorePremiumInfoCreated(NftId indexed policyNftId, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStorePremiumInfoUpdated(NftId indexed policyNftId, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStoreClaimInfoCreated(NftId indexed policyNftId, ClaimId indexed claimId, StateId indexed state, address createdBy, address txOrigin);
+    event LogProductStoreClaimInfoUpdated(NftId indexed policyNftId, ClaimId indexed claimId, StateId indexed oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStorePayoutInfoCreated(NftId indexed policyNftId, PayoutId indexed payoutId, StateId indexed state, address createdBy, address txOrigin);
+    event LogProductStorePayoutInfoUpdated(NftId indexed policyNftId, PayoutId indexed payoutId, StateId indexed oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
 
     mapping(Key32 key32 => IComponents.ProductInfo) private _products;
     mapping(Key32 key32 => IComponents.FeeInfo) private _fees;

package/contracts/instance/RiskSet.sol

@@ -13,12 +13,11 @@ contract RiskSet is
     ObjectSet
 {
 
-    event LogRiskSetPolicyLinked(RiskId riskId, NftId policyNftId);
-    event LogRiskSetPolicyUnlinked(RiskId riskId, NftId policyNftId);
+    event LogRiskSetPolicyLinked(RiskId indexed riskId, NftId indexed policyNftId);
+    event LogRiskSetPolicyUnlinked(RiskId indexed riskId, NftId indexed policyNftId);
 
-    event LogRiskSetRiskAdded(NftId productNftId, RiskId riskId);
-    event LogRiskSetRiskActive(NftId poolNftId,  RiskId riskId);
-    event LogRiskSetRiskPaused(NftId poolNftId,  RiskId riskId);
+    event LogRiskSetRiskAdded(NftId indexed productNftId, RiskId indexed riskId);
+    event LogRiskSetRiskActivated(NftId indexed poolNftId,  RiskId indexed riskId, bool indexed active);
 
     error ErrorRiskSetRiskLocked(RiskId riskId, NftId policyNftId); 
     error ErrorRiskSetRiskUnknown(RiskId riskId);
@@ -68,14 +67,14 @@ contract RiskSet is
     function activate(RiskId riskId) external restricted() {
         NftId productNftId = ObjectSetHelperLib.getProductNftId(_instanceAddress, riskId);
         _activate(productNftId, riskId.toKey32());
-        emit LogRiskSetRiskActive(productNftId, riskId);
+        emit LogRiskSetRiskActivated(productNftId, riskId, true);
     }
 
     /// @dev Applications linked to paused/archived risks may not be underwritten
     function deactivate(RiskId riskId) external restricted() {
         NftId productNftId = ObjectSetHelperLib.getProductNftId(_instanceAddress, riskId);
         _deactivate(productNftId, riskId.toKey32());
-        emit LogRiskSetRiskPaused(productNftId, riskId);
+        emit LogRiskSetRiskActivated(productNftId, riskId, false);
     }
 
     function checkRisk(NftId productNftId, RiskId riskId)

package/contracts/instance/base/BalanceStore.sol

@@ -10,16 +10,16 @@ contract BalanceStore {
     error ErrorBalanceStoreTargetAlreadyRegistered(NftId targetNftId);
     error ErrorBalanceStoreTargetNotRegistered(NftId targetNftId);
 
-    event LogBalanceStoreTargetRegistered(NftId targetNftId);
+    event LogBalanceStoreTargetRegistered(NftId indexed targetNftId);
 
-    event LogBalanceStoreFeesIncreased(NftId targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
-    event LogBalanceStoreFeesDecreased(NftId targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
+    event LogBalanceStoreFeesIncreased(NftId indexed targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
+    event LogBalanceStoreFeesDecreased(NftId indexed targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
 
-    event LogBalanceStoreLockedIncreased(NftId targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
-    event LogBalanceStoreLockedDecreased(NftId targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
+    event LogBalanceStoreLockedIncreased(NftId indexed targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
+    event LogBalanceStoreLockedDecreased(NftId indexed targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
 
-    event LogBalanceStoreBalanceIncreased(NftId targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
-    event LogBalanceStoreBalanceDecreased(NftId targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
+    event LogBalanceStoreBalanceIncreased(NftId indexed targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
+    event LogBalanceStoreBalanceDecreased(NftId indexed targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
 
     mapping(NftId nftId => Amount balance) private _balanceAmount;
     mapping(NftId nftId => Amount locked) private _lockedAmount;