@etherisc/gif-next 0.0.2-dc95063-418 → 0.0.2-dd40550-413

package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/95371df5f28c49f1193e96df62dcfc87.json"
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
 }

package/artifacts/contracts/types/NftId.sol/NftIdLib.json

@@ -141,8 +141,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61031c61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c806340a8cd9e1161006557806340a8cd9e1461010757806352694ee81461013d578063bc1b392d14610158578063c4cade9d1461015f57600080fd5b806308dc895e1461008c57806330b8415f146100ba5780633889a4c8146100e6575b600080fd5b61009d61009a366004610242565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100d66100c8366004610242565b6001600160601b0316151590565b60405190151581526020016100b1565b6100f96100f436600461025d565b610183565b6040519081526020016100b1565b61012a610115366004610242565b60081b6cffffffffffffffffffffffff001690565b60405160ff1990911681526020016100b1565b6100d661014b366004610242565b6001600160601b03161590565b600061009d565b6100d661016d36600461029a565b60006001600160601b038084169083161461021f565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101fb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061021f91906102cd565b9392505050565b80356001600160601b038116811461023d57600080fd5b919050565b60006020828403121561025457600080fd5b61021f82610226565b6000806040838503121561027057600080fd5b61027983610226565b9150602083013560ff8116811461028f57600080fd5b809150509250929050565b600080604083850312156102ad57600080fd5b6102b683610226565b91506102c460208401610226565b90509250929050565b6000602082840312156102df57600080fd5b505191905056fea264697066735822122073a0b1f638ac075f1f6c28299ae7965b0c307c57401f339146b88c74089d1e4b64736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c806340a8cd9e1161006557806340a8cd9e1461010757806352694ee81461013d578063bc1b392d14610158578063c4cade9d1461015f57600080fd5b806308dc895e1461008c57806330b8415f146100ba5780633889a4c8146100e6575b600080fd5b61009d61009a366004610242565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100d66100c8366004610242565b6001600160601b0316151590565b60405190151581526020016100b1565b6100f96100f436600461025d565b610183565b6040519081526020016100b1565b61012a610115366004610242565b60081b6cffffffffffffffffffffffff001690565b60405160ff1990911681526020016100b1565b6100d661014b366004610242565b6001600160601b03161590565b600061009d565b6100d661016d36600461029a565b60006001600160601b038084169083161461021f565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101fb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061021f91906102cd565b9392505050565b80356001600160601b038116811461023d57600080fd5b919050565b60006020828403121561025457600080fd5b61021f82610226565b6000806040838503121561027057600080fd5b61027983610226565b9150602083013560ff8116811461028f57600080fd5b809150509250929050565b600080604083850312156102ad57600080fd5b6102b683610226565b91506102c460208401610226565b90509250929050565b6000602082840312156102df57600080fd5b505191905056fea264697066735822122073a0b1f638ac075f1f6c28299ae7965b0c307c57401f339146b88c74089d1e4b64736f6c63430008140033",
+  "bytecode": "0x61031c61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c806340a8cd9e1161006557806340a8cd9e1461010757806352694ee81461013d578063bc1b392d14610158578063c4cade9d1461015f57600080fd5b806308dc895e1461008c57806330b8415f146100ba5780633889a4c8146100e6575b600080fd5b61009d61009a366004610242565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100d66100c8366004610242565b6001600160601b0316151590565b60405190151581526020016100b1565b6100f96100f436600461025d565b610183565b6040519081526020016100b1565b61012a610115366004610242565b60081b6cffffffffffffffffffffffff001690565b60405160ff1990911681526020016100b1565b6100d661014b366004610242565b6001600160601b03161590565b600061009d565b6100d661016d36600461029a565b60006001600160601b038084169083161461021f565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101fb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061021f91906102cd565b9392505050565b80356001600160601b038116811461023d57600080fd5b919050565b60006020828403121561025457600080fd5b61021f82610226565b6000806040838503121561027057600080fd5b61027983610226565b9150602083013560ff8116811461028f57600080fd5b809150509250929050565b600080604083850312156102ad57600080fd5b6102b683610226565b91506102c460208401610226565b90509250929050565b6000602082840312156102df57600080fd5b505191905056fea264697066735822122079f3c69b4b2df08ead6ff0a86b2076405ff488efec7e0791d0ec36c248aa472464736f6c63430008140033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c806340a8cd9e1161006557806340a8cd9e1461010757806352694ee81461013d578063bc1b392d14610158578063c4cade9d1461015f57600080fd5b806308dc895e1461008c57806330b8415f146100ba5780633889a4c8146100e6575b600080fd5b61009d61009a366004610242565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100d66100c8366004610242565b6001600160601b0316151590565b60405190151581526020016100b1565b6100f96100f436600461025d565b610183565b6040519081526020016100b1565b61012a610115366004610242565b60081b6cffffffffffffffffffffffff001690565b60405160ff1990911681526020016100b1565b6100d661014b366004610242565b6001600160601b03161590565b600061009d565b6100d661016d36600461029a565b60006001600160601b038084169083161461021f565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101fb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061021f91906102cd565b9392505050565b80356001600160601b038116811461023d57600080fd5b919050565b60006020828403121561025457600080fd5b61021f82610226565b6000806040838503121561027057600080fd5b61027983610226565b9150602083013560ff8116811461028f57600080fd5b809150509250929050565b600080604083850312156102ad57600080fd5b6102b683610226565b91506102c460208401610226565b90509250929050565b6000602082840312156102df57600080fd5b505191905056fea264697066735822122079f3c69b4b2df08ead6ff0a86b2076405ff488efec7e0791d0ec36c248aa472464736f6c63430008140033",
   "linkReferences": {
     "contracts/types/Key32.sol": {
       "Key32Lib": [

package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/95371df5f28c49f1193e96df62dcfc87.json"
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
 }

package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json

@@ -26,8 +26,8 @@
       "type": "error"
     }
   ],
-  "bytecode": "0x6104c261003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c80632bfdd6b91461007157806331a97de2146100995780638b6233dd146100ac578063a3082a18146100cc578063a73d5756146100ee578063e797d8991461010e575b600080fd5b61008461007f3660046103c8565b610139565b60405190151581526020015b60405180910390f35b6100846100a7366004610404565b541590565b6100be6100ba366004610404565b5490565b604051908152602001610090565b8180156100d857600080fd5b506100ec6100e73660046103c8565b61015d565b005b8180156100fa57600080fd5b506100ec6101093660046103c8565b6101f8565b61012161011c36600461041d565b610380565b6040516001600160601b039091168152602001610090565b6001600160601b038116600090815260018301602052604090205415155b92915050565b6001600160601b0381166000908152600183016020526040902054156101a6576040516301eae2c560e61b81526001600160601b03821660048201526024015b60405180910390fd5b81546001818101845560008481526020808220600285040180546001600160601b03968716600c968616969096026101000a868102970219169590951790945584549281529301909152604090912055565b6001600160601b03811660009081526001830160205260408120549081900361023f5760405163482084f160e01b81526001600160601b038316600482015260240161019d565b600061024c60018361043f565b84549091506000906102609060019061043f565b905081811461030a57600085600001828154811061028057610280610460565b9060005260206000209060029182820401919006600c029054906101000a90046001600160601b03169050808660000184815481106102c1576102c1610460565b60009182526020808320600283040180546001600160601b03958616600c6001958616026101000a90810290870219909116179055939092168152908701909152604090208390555b845485908061031b5761031b610476565b6001900381819060005260206000209060029182820401919006600c026101000a8154906001600160601b0302191690559055846001016000856001600160601b03166001600160601b03168152602001908152602001600020600090555050505050565b600082600001828154811061039757610397610460565b9060005260206000209060029182820401919006600c029054906101000a90046001600160601b0316905092915050565b600080604083850312156103db57600080fd5b8235915060208301356001600160601b03811681146103f957600080fd5b809150509250929050565b60006020828403121561041657600080fd5b5035919050565b6000806040838503121561043057600080fd5b50508035926020909101359150565b8181038181111561015757634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052603160045260246000fdfea2646970667358221220369c184090835a210a076a85d0211eb1c5adbe5bff85afa1a4081afdd6947d8f64736f6c63430008140033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c80632bfdd6b91461007157806331a97de2146100995780638b6233dd146100ac578063a3082a18146100cc578063a73d5756146100ee578063e797d8991461010e575b600080fd5b61008461007f3660046103c8565b610139565b60405190151581526020015b60405180910390f35b6100846100a7366004610404565b541590565b6100be6100ba366004610404565b5490565b604051908152602001610090565b8180156100d857600080fd5b506100ec6100e73660046103c8565b61015d565b005b8180156100fa57600080fd5b506100ec6101093660046103c8565b6101f8565b61012161011c36600461041d565b610380565b6040516001600160601b039091168152602001610090565b6001600160601b038116600090815260018301602052604090205415155b92915050565b6001600160601b0381166000908152600183016020526040902054156101a6576040516301eae2c560e61b81526001600160601b03821660048201526024015b60405180910390fd5b81546001818101845560008481526020808220600285040180546001600160601b03968716600c968616969096026101000a868102970219169590951790945584549281529301909152604090912055565b6001600160601b03811660009081526001830160205260408120549081900361023f5760405163482084f160e01b81526001600160601b038316600482015260240161019d565b600061024c60018361043f565b84549091506000906102609060019061043f565b905081811461030a57600085600001828154811061028057610280610460565b9060005260206000209060029182820401919006600c029054906101000a90046001600160601b03169050808660000184815481106102c1576102c1610460565b60009182526020808320600283040180546001600160601b03958616600c6001958616026101000a90810290870219909116179055939092168152908701909152604090208390555b845485908061031b5761031b610476565b6001900381819060005260206000209060029182820401919006600c026101000a8154906001600160601b0302191690559055846001016000856001600160601b03166001600160601b03168152602001908152602001600020600090555050505050565b600082600001828154811061039757610397610460565b9060005260206000209060029182820401919006600c029054906101000a90046001600160601b0316905092915050565b600080604083850312156103db57600080fd5b8235915060208301356001600160601b03811681146103f957600080fd5b809150509250929050565b60006020828403121561041657600080fd5b5035919050565b6000806040838503121561043057600080fd5b50508035926020909101359150565b8181038181111561015757634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052603160045260246000fdfea2646970667358221220369c184090835a210a076a85d0211eb1c5adbe5bff85afa1a4081afdd6947d8f64736f6c63430008140033",
+  "bytecode": "0x6104c261003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c80632bfdd6b91461007157806331a97de2146100995780638b6233dd146100ac578063a3082a18146100cc578063a73d5756146100ee578063e797d8991461010e575b600080fd5b61008461007f3660046103c8565b610139565b60405190151581526020015b60405180910390f35b6100846100a7366004610404565b541590565b6100be6100ba366004610404565b5490565b604051908152602001610090565b8180156100d857600080fd5b506100ec6100e73660046103c8565b61015d565b005b8180156100fa57600080fd5b506100ec6101093660046103c8565b6101f8565b61012161011c36600461041d565b610380565b6040516001600160601b039091168152602001610090565b6001600160601b038116600090815260018301602052604090205415155b92915050565b6001600160601b0381166000908152600183016020526040902054156101a6576040516301eae2c560e61b81526001600160601b03821660048201526024015b60405180910390fd5b81546001818101845560008481526020808220600285040180546001600160601b03968716600c968616969096026101000a868102970219169590951790945584549281529301909152604090912055565b6001600160601b03811660009081526001830160205260408120549081900361023f5760405163482084f160e01b81526001600160601b038316600482015260240161019d565b600061024c60018361043f565b84549091506000906102609060019061043f565b905081811461030a57600085600001828154811061028057610280610460565b9060005260206000209060029182820401919006600c029054906101000a90046001600160601b03169050808660000184815481106102c1576102c1610460565b60009182526020808320600283040180546001600160601b03958616600c6001958616026101000a90810290870219909116179055939092168152908701909152604090208390555b845485908061031b5761031b610476565b6001900381819060005260206000209060029182820401919006600c026101000a8154906001600160601b0302191690559055846001016000856001600160601b03166001600160601b03168152602001908152602001600020600090555050505050565b600082600001828154811061039757610397610460565b9060005260206000209060029182820401919006600c029054906101000a90046001600160601b0316905092915050565b600080604083850312156103db57600080fd5b8235915060208301356001600160601b03811681146103f957600080fd5b809150509250929050565b60006020828403121561041657600080fd5b5035919050565b6000806040838503121561043057600080fd5b50508035926020909101359150565b8181038181111561015757634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052603160045260246000fdfea2646970667358221220a77dfba6df8781a1240fd13ee997b0d55bc768bc1587ac066f5922b6be9dec7a64736f6c63430008140033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c80632bfdd6b91461007157806331a97de2146100995780638b6233dd146100ac578063a3082a18146100cc578063a73d5756146100ee578063e797d8991461010e575b600080fd5b61008461007f3660046103c8565b610139565b60405190151581526020015b60405180910390f35b6100846100a7366004610404565b541590565b6100be6100ba366004610404565b5490565b604051908152602001610090565b8180156100d857600080fd5b506100ec6100e73660046103c8565b61015d565b005b8180156100fa57600080fd5b506100ec6101093660046103c8565b6101f8565b61012161011c36600461041d565b610380565b6040516001600160601b039091168152602001610090565b6001600160601b038116600090815260018301602052604090205415155b92915050565b6001600160601b0381166000908152600183016020526040902054156101a6576040516301eae2c560e61b81526001600160601b03821660048201526024015b60405180910390fd5b81546001818101845560008481526020808220600285040180546001600160601b03968716600c968616969096026101000a868102970219169590951790945584549281529301909152604090912055565b6001600160601b03811660009081526001830160205260408120549081900361023f5760405163482084f160e01b81526001600160601b038316600482015260240161019d565b600061024c60018361043f565b84549091506000906102609060019061043f565b905081811461030a57600085600001828154811061028057610280610460565b9060005260206000209060029182820401919006600c029054906101000a90046001600160601b03169050808660000184815481106102c1576102c1610460565b60009182526020808320600283040180546001600160601b03958616600c6001958616026101000a90810290870219909116179055939092168152908701909152604090208390555b845485908061031b5761031b610476565b6001900381819060005260206000209060029182820401919006600c026101000a8154906001600160601b0302191690559055846001016000856001600160601b03166001600160601b03168152602001908152602001600020600090555050505050565b600082600001828154811061039757610397610460565b9060005260206000209060029182820401919006600c029054906101000a90046001600160601b0316905092915050565b600080604083850312156103db57600080fd5b8235915060208301356001600160601b03811681146103f957600080fd5b809150509250929050565b60006020828403121561041657600080fd5b5035919050565b6000806040838503121561043057600080fd5b50508035926020909101359150565b8181038181111561015757634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052603160045260246000fdfea2646970667358221220a77dfba6df8781a1240fd13ee997b0d55bc768bc1587ac066f5922b6be9dec7a64736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/95371df5f28c49f1193e96df62dcfc87.json"
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
 }

package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/95371df5f28c49f1193e96df62dcfc87.json"
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
 }

package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json

@@ -85,8 +85,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61018c61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632c2f8a671461005b5780636f91962014610083578063ac43d83414610098578063b2466acf146100c9575b600080fd5b61006e610069366004610108565b6100df565b60405190151581526020015b60405180910390f35b61006e61009136600461013b565b60ff161590565b6100ac6100a636600461013b565b60ff1690565b6040516bffffffffffffffffffffffff909116815260200161007a565b61006e6100d736600461013b565b60ff16151590565b600060ff808416908316145b9392505050565b803560ff8116811461010357600080fd5b919050565b6000806040838503121561011b57600080fd5b610124836100f2565b9150610132602084016100f2565b90509250929050565b60006020828403121561014d57600080fd5b6100eb826100f256fea2646970667358221220bab64214f5d4bea5957c22fb6c1a2350710d3571f862c57f9a888084fc6a528764736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632c2f8a671461005b5780636f91962014610083578063ac43d83414610098578063b2466acf146100c9575b600080fd5b61006e610069366004610108565b6100df565b60405190151581526020015b60405180910390f35b61006e61009136600461013b565b60ff161590565b6100ac6100a636600461013b565b60ff1690565b6040516bffffffffffffffffffffffff909116815260200161007a565b61006e6100d736600461013b565b60ff16151590565b600060ff808416908316145b9392505050565b803560ff8116811461010357600080fd5b919050565b6000806040838503121561011b57600080fd5b610124836100f2565b9150610132602084016100f2565b90509250929050565b60006020828403121561014d57600080fd5b6100eb826100f256fea2646970667358221220bab64214f5d4bea5957c22fb6c1a2350710d3571f862c57f9a888084fc6a528764736f6c63430008140033",
+  "bytecode": "0x61018c61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632c2f8a671461005b5780636f91962014610083578063ac43d83414610098578063b2466acf146100c9575b600080fd5b61006e610069366004610108565b6100df565b60405190151581526020015b60405180910390f35b61006e61009136600461013b565b60ff161590565b6100ac6100a636600461013b565b60ff1690565b6040516bffffffffffffffffffffffff909116815260200161007a565b61006e6100d736600461013b565b60ff16151590565b600060ff808416908316145b9392505050565b803560ff8116811461010357600080fd5b919050565b6000806040838503121561011b57600080fd5b610124836100f2565b9150610132602084016100f2565b90509250929050565b60006020828403121561014d57600080fd5b6100eb826100f256fea2646970667358221220a05598860810f4a0e7e5f7213578f3d434700569bbd80c6f7d3653667cfd84b764736f6c63430008140033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632c2f8a671461005b5780636f91962014610083578063ac43d83414610098578063b2466acf146100c9575b600080fd5b61006e610069366004610108565b6100df565b60405190151581526020015b60405180910390f35b61006e61009136600461013b565b60ff161590565b6100ac6100a636600461013b565b60ff1690565b6040516bffffffffffffffffffffffff909116815260200161007a565b61006e6100d736600461013b565b60ff16151590565b600060ff808416908316145b9392505050565b803560ff8116811461010357600080fd5b919050565b6000806040838503121561011b57600080fd5b610124836100f2565b9150610132602084016100f2565b90509250929050565b60006020828403121561014d57600080fd5b6100eb826100f256fea2646970667358221220a05598860810f4a0e7e5f7213578f3d434700569bbd80c6f7d3653667cfd84b764736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/95371df5f28c49f1193e96df62dcfc87.json"
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
 }

package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json

@@ -41,6 +41,25 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "PayoutId",
+          "name": "payoutId",
+          "type": "uint24"
+        }
+      ],
+      "name": "toClaimId",
+      "outputs": [
+        {
+          "internalType": "ClaimId",
+          "name": "",
+          "type": "uint16"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -63,9 +82,62 @@
     {
       "inputs": [
         {
-          "internalType": "uint256",
-          "name": "a",
-          "type": "uint256"
+          "internalType": "PayoutId",
+          "name": "payoutId",
+          "type": "uint24"
+        },
+        {
+          "internalType": "NftId",
+          "name": "policyNftId",
+          "type": "uint96"
+        }
+      ],
+      "name": "toKey32",
+      "outputs": [
+        {
+          "internalType": "Key32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "PayoutId",
+          "name": "payoutId",
+          "type": "uint24"
+        },
+        {
+          "internalType": "NftId",
+          "name": "policyNftId",
+          "type": "uint96"
+        }
+      ],
+      "name": "toKeyId",
+      "outputs": [
+        {
+          "internalType": "KeyId",
+          "name": "",
+          "type": "bytes31"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "ClaimId",
+          "name": "claimId",
+          "type": "uint16"
+        },
+        {
+          "internalType": "uint8",
+          "name": "payoutNo",
+          "type": "uint8"
         }
       ],
       "name": "toPayoutId",
@@ -79,6 +151,25 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "PayoutId",
+          "name": "payoutId",
+          "type": "uint24"
+        }
+      ],
+      "name": "toPayoutNo",
+      "outputs": [
+        {
+          "internalType": "uint8",
+          "name": "",
+          "type": "uint8"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "zero",
@@ -93,8 +184,26 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61015f61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100615760003560e01c806302985c61146100665780635560100714610093578063691d05ec146100b8578063bc1b392d146100cf578063f43d0be4146100d6575b600080fd5b61007e6100743660046100e4565b62ffffff16151590565b60405190151581526020015b60405180910390f35b6100a46100a13660046100e4565b90565b60405162ffffff909116815260200161008a565b61007e6100c63660046100e4565b62ffffff161590565b60006100a4565b6100a46100a1366004610110565b6000602082840312156100f657600080fd5b813562ffffff8116811461010957600080fd5b9392505050565b60006020828403121561012257600080fd5b503591905056fea26469706673582212207ec57330ef4c4442fd6c82ef8bddeb33653eafa2bd64d4a0d3cd4448c6b536c764736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100615760003560e01c806302985c61146100665780635560100714610093578063691d05ec146100b8578063bc1b392d146100cf578063f43d0be4146100d6575b600080fd5b61007e6100743660046100e4565b62ffffff16151590565b60405190151581526020015b60405180910390f35b6100a46100a13660046100e4565b90565b60405162ffffff909116815260200161008a565b61007e6100c63660046100e4565b62ffffff161590565b60006100a4565b6100a46100a1366004610110565b6000602082840312156100f657600080fd5b813562ffffff8116811461010957600080fd5b9392505050565b60006020828403121561012257600080fd5b503591905056fea26469706673582212207ec57330ef4c4442fd6c82ef8bddeb33653eafa2bd64d4a0d3cd4448c6b536c764736f6c63430008140033",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
+  "bytecode": "0x61041d61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061009d5760003560e01c8063691d05ec11610070578063691d05ec1461013b5780637d464fd414610152578063bc1b392d14610178578063d5b5ee5d1461017f578063de5f11a21461019257600080fd5b806302985c61146100a2578063455d3483146100cf57806355601007146100f5578063592734111461011a575b600080fd5b6100ba6100b03660046102d3565b62ffffff16151590565b60405190151581526020015b60405180910390f35b6100e26100dd3660046102ee565b6101bd565b60405160ff1990911681526020016100c6565b6101066101033660046102d3565b90565b60405162ffffff90911681526020016100c6565b61012d6101283660046102ee565b6101fe565b6040519081526020016100c6565b6100ba6101493660046102d3565b62ffffff161590565b6101666101603660046102d3565b60ff1690565b60405160ff90911681526020016100c6565b6000610106565b61010661018d366004610336565b610298565b6101aa6101a03660046102d3565b60081c61ffff1690565b60405161ffff90911681526020016100c6565b60006101e362ffffff84166effffffffffffffffffffffff000000601885901b16610387565b60881b6bffffffffffffffffffffffff60881b169392505050565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce60d561022686866101bd565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af415801561026d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061029191906103b3565b9392505050565b60006102b060ff831662ffff00600886901b166103cc565b61ffff169392505050565b803562ffffff811681146102ce57600080fd5b919050565b6000602082840312156102e557600080fd5b610291826102bb565b6000806040838503121561030157600080fd5b61030a836102bb565b915060208301356bffffffffffffffffffffffff8116811461032b57600080fd5b809150509250929050565b6000806040838503121561034957600080fd5b823561ffff8116811461035b57600080fd5b9150602083013560ff8116811461032b57600080fd5b634e487b7160e01b600052601160045260246000fd5b6bffffffffffffffffffffffff8181168382160190808211156103ac576103ac610371565b5092915050565b6000602082840312156103c557600080fd5b5051919050565b61ffff8181168382160190808211156103ac576103ac61037156fea2646970667358221220912aee446512676a01553c6e58f95a1683cc6430c6e201d02ea16dd1bf437f7564736f6c63430008140033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061009d5760003560e01c8063691d05ec11610070578063691d05ec1461013b5780637d464fd414610152578063bc1b392d14610178578063d5b5ee5d1461017f578063de5f11a21461019257600080fd5b806302985c61146100a2578063455d3483146100cf57806355601007146100f5578063592734111461011a575b600080fd5b6100ba6100b03660046102d3565b62ffffff16151590565b60405190151581526020015b60405180910390f35b6100e26100dd3660046102ee565b6101bd565b60405160ff1990911681526020016100c6565b6101066101033660046102d3565b90565b60405162ffffff90911681526020016100c6565b61012d6101283660046102ee565b6101fe565b6040519081526020016100c6565b6100ba6101493660046102d3565b62ffffff161590565b6101666101603660046102d3565b60ff1690565b60405160ff90911681526020016100c6565b6000610106565b61010661018d366004610336565b610298565b6101aa6101a03660046102d3565b60081c61ffff1690565b60405161ffff90911681526020016100c6565b60006101e362ffffff84166effffffffffffffffffffffff000000601885901b16610387565b60881b6bffffffffffffffffffffffff60881b169392505050565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce60d561022686866101bd565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af415801561026d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061029191906103b3565b9392505050565b60006102b060ff831662ffff00600886901b166103cc565b61ffff169392505050565b803562ffffff811681146102ce57600080fd5b919050565b6000602082840312156102e557600080fd5b610291826102bb565b6000806040838503121561030157600080fd5b61030a836102bb565b915060208301356bffffffffffffffffffffffff8116811461032b57600080fd5b809150509250929050565b6000806040838503121561034957600080fd5b823561ffff8116811461035b57600080fd5b9150602083013560ff8116811461032b57600080fd5b634e487b7160e01b600052601160045260246000fd5b6bffffffffffffffffffffffff8181168382160190808211156103ac576103ac610371565b5092915050565b6000602082840312156103c557600080fd5b5051919050565b61ffff8181168382160190808211156103ac576103ac61037156fea2646970667358221220912aee446512676a01553c6e58f95a1683cc6430c6e201d02ea16dd1bf437f7564736f6c63430008140033",
+  "linkReferences": {
+    "contracts/types/Key32.sol": {
+      "Key32Lib": [
+        {
+          "length": 20,
+          "start": 572
+        }
+      ]
+    }
+  },
+  "deployedLinkReferences": {
+    "contracts/types/Key32.sol": {
+      "Key32Lib": [
+        {
+          "length": 20,
+          "start": 514
+        }
+      ]
+    }
+  }
 }

package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/95371df5f28c49f1193e96df62dcfc87.json"
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
 }

package/artifacts/contracts/types/Referral.sol/ReferralLib.json

@@ -117,8 +117,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61041061003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c80632cf96bf9146100715780633f093cd6146100a457806355ee6275146100d05780637bc32ecf146100f1578063a420c78714610114578063bc1b392d14610137575b600080fd5b61008c61007f36600461021e565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100b76100b2366004610265565b61013e565b6040516001600160c01b0319909116815260200161009b565b6100e36100de36600461021e565b610171565b60405190815260200161009b565b6101046100ff36600461021e565b61020b565b604051901515815260200161009b565b61012561012236600461033a565b90565b60405160ff909116815260200161009b565b60006100b7565b6000828260405160200161015392919061035d565b60405160208183030381529060405280519060200120905092915050565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce607b6001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101e1573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061020591906103c1565b92915050565b60006001600160c01b0319821615610205565b60006020828403121561023057600080fd5b81356001600160c01b03198116811461024857600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b6000806040838503121561027857600080fd5b82356bffffffffffffffffffffffff8116811461029457600080fd5b9150602083013567ffffffffffffffff808211156102b157600080fd5b818501915085601f8301126102c557600080fd5b8135818111156102d7576102d761024f565b604051601f8201601f19908116603f011681019083821181831017156102ff576102ff61024f565b8160405282815288602084870101111561031857600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b60006020828403121561034c57600080fd5b813560ff8116811461024857600080fd5b6bffffffffffffffffffffffff8316815260006020604081840152835180604085015260005b8181101561039f57858101830151858201606001528201610383565b506000606082860101526060601f19601f830116850101925050509392505050565b6000602082840312156103d357600080fd5b505191905056fea26469706673582212200fff46fb81b7989c0c3195a957b6fdc916d19829e3044f3965c1141bea0f404b64736f6c63430008140033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c80632cf96bf9146100715780633f093cd6146100a457806355ee6275146100d05780637bc32ecf146100f1578063a420c78714610114578063bc1b392d14610137575b600080fd5b61008c61007f36600461021e565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100b76100b2366004610265565b61013e565b6040516001600160c01b0319909116815260200161009b565b6100e36100de36600461021e565b610171565b60405190815260200161009b565b6101046100ff36600461021e565b61020b565b604051901515815260200161009b565b61012561012236600461033a565b90565b60405160ff909116815260200161009b565b60006100b7565b6000828260405160200161015392919061035d565b60405160208183030381529060405280519060200120905092915050565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce607b6001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101e1573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061020591906103c1565b92915050565b60006001600160c01b0319821615610205565b60006020828403121561023057600080fd5b81356001600160c01b03198116811461024857600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b6000806040838503121561027857600080fd5b82356bffffffffffffffffffffffff8116811461029457600080fd5b9150602083013567ffffffffffffffff808211156102b157600080fd5b818501915085601f8301126102c557600080fd5b8135818111156102d7576102d761024f565b604051601f8201601f19908116603f011681019083821181831017156102ff576102ff61024f565b8160405282815288602084870101111561031857600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b60006020828403121561034c57600080fd5b813560ff8116811461024857600080fd5b6bffffffffffffffffffffffff8316815260006020604081840152835180604085015260005b8181101561039f57858101830151858201606001528201610383565b506000606082860101526060601f19601f830116850101925050509392505050565b6000602082840312156103d357600080fd5b505191905056fea26469706673582212200fff46fb81b7989c0c3195a957b6fdc916d19829e3044f3965c1141bea0f404b64736f6c63430008140033",
+  "bytecode": "0x61041061003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c80632cf96bf9146100715780633f093cd6146100a457806355ee6275146100d05780637bc32ecf146100f1578063a420c78714610114578063bc1b392d14610137575b600080fd5b61008c61007f36600461021e565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100b76100b2366004610265565b61013e565b6040516001600160c01b0319909116815260200161009b565b6100e36100de36600461021e565b610171565b60405190815260200161009b565b6101046100ff36600461021e565b61020b565b604051901515815260200161009b565b61012561012236600461033a565b90565b60405160ff909116815260200161009b565b60006100b7565b6000828260405160200161015392919061035d565b60405160208183030381529060405280519060200120905092915050565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce607b6001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101e1573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061020591906103c1565b92915050565b60006001600160c01b0319821615610205565b60006020828403121561023057600080fd5b81356001600160c01b03198116811461024857600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b6000806040838503121561027857600080fd5b82356bffffffffffffffffffffffff8116811461029457600080fd5b9150602083013567ffffffffffffffff808211156102b157600080fd5b818501915085601f8301126102c557600080fd5b8135818111156102d7576102d761024f565b604051601f8201601f19908116603f011681019083821181831017156102ff576102ff61024f565b8160405282815288602084870101111561031857600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b60006020828403121561034c57600080fd5b813560ff8116811461024857600080fd5b6bffffffffffffffffffffffff8316815260006020604081840152835180604085015260005b8181101561039f57858101830151858201606001528201610383565b506000606082860101526060601f19601f830116850101925050509392505050565b6000602082840312156103d357600080fd5b505191905056fea2646970667358221220dd056262c1202693d24667cc3fa292c0c78f308163ae1c9263c67dab81491f8564736f6c63430008140033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c80632cf96bf9146100715780633f093cd6146100a457806355ee6275146100d05780637bc32ecf146100f1578063a420c78714610114578063bc1b392d14610137575b600080fd5b61008c61007f36600461021e565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100b76100b2366004610265565b61013e565b6040516001600160c01b0319909116815260200161009b565b6100e36100de36600461021e565b610171565b60405190815260200161009b565b6101046100ff36600461021e565b61020b565b604051901515815260200161009b565b61012561012236600461033a565b90565b60405160ff909116815260200161009b565b60006100b7565b6000828260405160200161015392919061035d565b60405160208183030381529060405280519060200120905092915050565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce607b6001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101e1573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061020591906103c1565b92915050565b60006001600160c01b0319821615610205565b60006020828403121561023057600080fd5b81356001600160c01b03198116811461024857600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b6000806040838503121561027857600080fd5b82356bffffffffffffffffffffffff8116811461029457600080fd5b9150602083013567ffffffffffffffff808211156102b157600080fd5b818501915085601f8301126102c557600080fd5b8135818111156102d7576102d761024f565b604051601f8201601f19908116603f011681019083821181831017156102ff576102ff61024f565b8160405282815288602084870101111561031857600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b60006020828403121561034c57600080fd5b813560ff8116811461024857600080fd5b6bffffffffffffffffffffffff8316815260006020604081840152835180604085015260005b8181101561039f57858101830151858201606001528201610383565b506000606082860101526060601f19601f830116850101925050509392505050565b6000602082840312156103d357600080fd5b505191905056fea2646970667358221220dd056262c1202693d24667cc3fa292c0c78f308163ae1c9263c67dab81491f8564736f6c63430008140033",
   "linkReferences": {
     "contracts/types/Key32.sol": {
       "Key32Lib": [

package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/95371df5f28c49f1193e96df62dcfc87.json"
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
 }

package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json

@@ -61,8 +61,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61032f61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061004b5760003560e01c80632cf96bf9146100505780634a7485ba1461008357806355ee6275146100af575b600080fd5b61006b61005e36600461019a565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100966100913660046101e1565b6100d0565b6040516001600160c01b0319909116815260200161007a565b6100c26100bd36600461019a565b610100565b60405190815260200161007a565b6000816040516020016100e39190610292565b604051602081830303815290604052805190602001209050919050565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce60c86001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610170573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019491906102e0565b92915050565b6000602082840312156101ac57600080fd5b81356001600160c01b0319811681146101c457600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b6000602082840312156101f357600080fd5b813567ffffffffffffffff8082111561020b57600080fd5b818401915084601f83011261021f57600080fd5b813581811115610231576102316101cb565b604051601f8201601f19908116603f01168101908382118183101715610259576102596101cb565b8160405282815287602084870101111561027257600080fd5b826020860160208301376000928101602001929092525095945050505050565b600060208083528351808285015260005b818110156102bf578581018301518582016040015282016102a3565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156102f257600080fd5b505191905056fea2646970667358221220d7e1d9554175adf15b55c97a8324f22a2bb3d5ade2067d8fe0cd8a9120ee1e5364736f6c63430008140033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061004b5760003560e01c80632cf96bf9146100505780634a7485ba1461008357806355ee6275146100af575b600080fd5b61006b61005e36600461019a565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100966100913660046101e1565b6100d0565b6040516001600160c01b0319909116815260200161007a565b6100c26100bd36600461019a565b610100565b60405190815260200161007a565b6000816040516020016100e39190610292565b604051602081830303815290604052805190602001209050919050565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce60c86001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610170573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019491906102e0565b92915050565b6000602082840312156101ac57600080fd5b81356001600160c01b0319811681146101c457600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b6000602082840312156101f357600080fd5b813567ffffffffffffffff8082111561020b57600080fd5b818401915084601f83011261021f57600080fd5b813581811115610231576102316101cb565b604051601f8201601f19908116603f01168101908382118183101715610259576102596101cb565b8160405282815287602084870101111561027257600080fd5b826020860160208301376000928101602001929092525095945050505050565b600060208083528351808285015260005b818110156102bf578581018301518582016040015282016102a3565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156102f257600080fd5b505191905056fea2646970667358221220d7e1d9554175adf15b55c97a8324f22a2bb3d5ade2067d8fe0cd8a9120ee1e5364736f6c63430008140033",
+  "bytecode": "0x61032f61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061004b5760003560e01c80632cf96bf9146100505780634a7485ba1461008357806355ee6275146100af575b600080fd5b61006b61005e36600461019a565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100966100913660046101e1565b6100d0565b6040516001600160c01b0319909116815260200161007a565b6100c26100bd36600461019a565b610100565b60405190815260200161007a565b6000816040516020016100e39190610292565b604051602081830303815290604052805190602001209050919050565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce60c86001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610170573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019491906102e0565b92915050565b6000602082840312156101ac57600080fd5b81356001600160c01b0319811681146101c457600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b6000602082840312156101f357600080fd5b813567ffffffffffffffff8082111561020b57600080fd5b818401915084601f83011261021f57600080fd5b813581811115610231576102316101cb565b604051601f8201601f19908116603f01168101908382118183101715610259576102596101cb565b8160405282815287602084870101111561027257600080fd5b826020860160208301376000928101602001929092525095945050505050565b600060208083528351808285015260005b818110156102bf578581018301518582016040015282016102a3565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156102f257600080fd5b505191905056fea26469706673582212200548278561b146a0e65573d2f79dc26313cd18b7687b0aef81ef6cfd019f487d64736f6c63430008140033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061004b5760003560e01c80632cf96bf9146100505780634a7485ba1461008357806355ee6275146100af575b600080fd5b61006b61005e36600461019a565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100966100913660046101e1565b6100d0565b6040516001600160c01b0319909116815260200161007a565b6100c26100bd36600461019a565b610100565b60405190815260200161007a565b6000816040516020016100e39190610292565b604051602081830303815290604052805190602001209050919050565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce60c86001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610170573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019491906102e0565b92915050565b6000602082840312156101ac57600080fd5b81356001600160c01b0319811681146101c457600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b6000602082840312156101f357600080fd5b813567ffffffffffffffff8082111561020b57600080fd5b818401915084601f83011261021f57600080fd5b813581811115610231576102316101cb565b604051601f8201601f19908116603f01168101908382118183101715610259576102596101cb565b8160405282815287602084870101111561027257600080fd5b826020860160208301376000928101602001929092525095945050505050565b600060208083528351808285015260005b818110156102bf578581018301518582016040015282016102a3565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156102f257600080fd5b505191905056fea26469706673582212200548278561b146a0e65573d2f79dc26313cd18b7687b0aef81ef6cfd019f487d64736f6c63430008140033",
   "linkReferences": {
     "contracts/types/Key32.sol": {
       "Key32Lib": [

package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/95371df5f28c49f1193e96df62dcfc87.json"
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
 }

package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json

@@ -131,8 +131,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x6102a461003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c806368aebf7b1161006557806368aebf7b14610119578063a42e52e914610127578063bc1b392d14610144578063f37f38f01461014b57600080fd5b8063057182b41461008c578063545ce21c146100bd57806367cb8ec1146100e7575b600080fd5b6100a861009a36600461020b565b67ffffffffffffffff161590565b60405190151581526020015b60405180910390f35b6100ce6100cb36600461020b565b90565b60405167ffffffffffffffff90911681526020016100b4565b6101066100f536600461020b565b60081b68ffffffffffffffff001690565b60405160ff1990911681526020016100b4565b6100ce6100cb36600461023c565b6100a861013536600461020b565b67ffffffffffffffff16151590565b60006100ce565b61015e61015936600461020b565b61016c565b6040519081526020016100b4565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce6014600885901b68ffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101e1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102059190610255565b92915050565b60006020828403121561021d57600080fd5b813567ffffffffffffffff8116811461023557600080fd5b9392505050565b60006020828403121561024e57600080fd5b5035919050565b60006020828403121561026757600080fd5b505191905056fea26469706673582212203f64499afbee2d2a08a50fb98be71ed145e98b3a573706a47f49f7d47d9c367264736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c806368aebf7b1161006557806368aebf7b14610119578063a42e52e914610127578063bc1b392d14610144578063f37f38f01461014b57600080fd5b8063057182b41461008c578063545ce21c146100bd57806367cb8ec1146100e7575b600080fd5b6100a861009a36600461020b565b67ffffffffffffffff161590565b60405190151581526020015b60405180910390f35b6100ce6100cb36600461020b565b90565b60405167ffffffffffffffff90911681526020016100b4565b6101066100f536600461020b565b60081b68ffffffffffffffff001690565b60405160ff1990911681526020016100b4565b6100ce6100cb36600461023c565b6100a861013536600461020b565b67ffffffffffffffff16151590565b60006100ce565b61015e61015936600461020b565b61016c565b6040519081526020016100b4565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce6014600885901b68ffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101e1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102059190610255565b92915050565b60006020828403121561021d57600080fd5b813567ffffffffffffffff8116811461023557600080fd5b9392505050565b60006020828403121561024e57600080fd5b5035919050565b60006020828403121561026757600080fd5b505191905056fea26469706673582212203f64499afbee2d2a08a50fb98be71ed145e98b3a573706a47f49f7d47d9c367264736f6c63430008140033",
+  "bytecode": "0x6102a461003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c806368aebf7b1161006557806368aebf7b14610119578063a42e52e914610127578063bc1b392d14610144578063f37f38f01461014b57600080fd5b8063057182b41461008c578063545ce21c146100bd57806367cb8ec1146100e7575b600080fd5b6100a861009a36600461020b565b67ffffffffffffffff161590565b60405190151581526020015b60405180910390f35b6100ce6100cb36600461020b565b90565b60405167ffffffffffffffff90911681526020016100b4565b6101066100f536600461020b565b60081b68ffffffffffffffff001690565b60405160ff1990911681526020016100b4565b6100ce6100cb36600461023c565b6100a861013536600461020b565b67ffffffffffffffff16151590565b60006100ce565b61015e61015936600461020b565b61016c565b6040519081526020016100b4565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce6014600885901b68ffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101e1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102059190610255565b92915050565b60006020828403121561021d57600080fd5b813567ffffffffffffffff8116811461023557600080fd5b9392505050565b60006020828403121561024e57600080fd5b5035919050565b60006020828403121561026757600080fd5b505191905056fea26469706673582212203660a82977ddfc4eba71f947431e7a360093cacc7d8cf235484f4ea935646cb464736f6c63430008140033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c806368aebf7b1161006557806368aebf7b14610119578063a42e52e914610127578063bc1b392d14610144578063f37f38f01461014b57600080fd5b8063057182b41461008c578063545ce21c146100bd57806367cb8ec1146100e7575b600080fd5b6100a861009a36600461020b565b67ffffffffffffffff161590565b60405190151581526020015b60405180910390f35b6100ce6100cb36600461020b565b90565b60405167ffffffffffffffff90911681526020016100b4565b6101066100f536600461020b565b60081b68ffffffffffffffff001690565b60405160ff1990911681526020016100b4565b6100ce6100cb36600461023c565b6100a861013536600461020b565b67ffffffffffffffff16151590565b60006100ce565b61015e61015936600461020b565b61016c565b6040519081526020016100b4565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce6014600885901b68ffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101e1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102059190610255565b92915050565b60006020828403121561021d57600080fd5b813567ffffffffffffffff8116811461023557600080fd5b9392505050565b60006020828403121561024e57600080fd5b5035919050565b60006020828403121561026757600080fd5b505191905056fea26469706673582212203660a82977ddfc4eba71f947431e7a360093cacc7d8cf235484f4ea935646cb464736f6c63430008140033",
   "linkReferences": {
     "contracts/types/Key32.sol": {
       "Key32Lib": [

package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/95371df5f28c49f1193e96df62dcfc87.json"
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
 }

package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/95371df5f28c49f1193e96df62dcfc87.json"
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
 }

package/artifacts/contracts/types/StateId.sol/StateIdLib.json

@@ -85,8 +85,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61018c61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632c2f8a671461005b5780636f91962014610083578063ac43d83414610098578063b2466acf146100c9575b600080fd5b61006e610069366004610108565b6100df565b60405190151581526020015b60405180910390f35b61006e61009136600461013b565b60ff161590565b6100ac6100a636600461013b565b60ff1690565b6040516bffffffffffffffffffffffff909116815260200161007a565b61006e6100d736600461013b565b60ff16151590565b600060ff808416908316145b9392505050565b803560ff8116811461010357600080fd5b919050565b6000806040838503121561011b57600080fd5b610124836100f2565b9150610132602084016100f2565b90509250929050565b60006020828403121561014d57600080fd5b6100eb826100f256fea2646970667358221220a25bf37fd7297b1b8623da737cd78a38f2571cd092fb7529ab9afb6e50fb916864736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632c2f8a671461005b5780636f91962014610083578063ac43d83414610098578063b2466acf146100c9575b600080fd5b61006e610069366004610108565b6100df565b60405190151581526020015b60405180910390f35b61006e61009136600461013b565b60ff161590565b6100ac6100a636600461013b565b60ff1690565b6040516bffffffffffffffffffffffff909116815260200161007a565b61006e6100d736600461013b565b60ff16151590565b600060ff808416908316145b9392505050565b803560ff8116811461010357600080fd5b919050565b6000806040838503121561011b57600080fd5b610124836100f2565b9150610132602084016100f2565b90509250929050565b60006020828403121561014d57600080fd5b6100eb826100f256fea2646970667358221220a25bf37fd7297b1b8623da737cd78a38f2571cd092fb7529ab9afb6e50fb916864736f6c63430008140033",
+  "bytecode": "0x61018c61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632c2f8a671461005b5780636f91962014610083578063ac43d83414610098578063b2466acf146100c9575b600080fd5b61006e610069366004610108565b6100df565b60405190151581526020015b60405180910390f35b61006e61009136600461013b565b60ff161590565b6100ac6100a636600461013b565b60ff1690565b6040516bffffffffffffffffffffffff909116815260200161007a565b61006e6100d736600461013b565b60ff16151590565b600060ff808416908316145b9392505050565b803560ff8116811461010357600080fd5b919050565b6000806040838503121561011b57600080fd5b610124836100f2565b9150610132602084016100f2565b90509250929050565b60006020828403121561014d57600080fd5b6100eb826100f256fea264697066735822122049f6558c0cb157a85a73ed50ebe855848931d039aa28f12620ce338c3e8bec8364736f6c63430008140033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632c2f8a671461005b5780636f91962014610083578063ac43d83414610098578063b2466acf146100c9575b600080fd5b61006e610069366004610108565b6100df565b60405190151581526020015b60405180910390f35b61006e61009136600461013b565b60ff161590565b6100ac6100a636600461013b565b60ff1690565b6040516bffffffffffffffffffffffff909116815260200161007a565b61006e6100d736600461013b565b60ff16151590565b600060ff808416908316145b9392505050565b803560ff8116811461010357600080fd5b919050565b6000806040838503121561011b57600080fd5b610124836100f2565b9150610132602084016100f2565b90509250929050565b60006020828403121561014d57600080fd5b6100eb826100f256fea264697066735822122049f6558c0cb157a85a73ed50ebe855848931d039aa28f12620ce338c3e8bec8364736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/95371df5f28c49f1193e96df62dcfc87.json"
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
 }

package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json

@@ -240,16 +240,29 @@
       ],
       "stateMutability": "pure",
       "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "zero",
+      "outputs": [
+        {
+          "internalType": "Timestamp",
+          "name": "",
+          "type": "uint40"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
     }
   ],
-  "bytecode": "0x6103bf61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100b35760003560e01c8063a5798b4e1161007b578063a5798b4e14610139578063adb6183214610162578063add9ce9914610168578063c24922ce1461017b578063da09d4841461018e578063ddf3d631146101b457600080fd5b8063790a38ad146100b857806383ffcdef146100e65780638d38cd4b146100f957806394335b1a146101135780639df8763914610126575b600080fd5b6100d16100c63660046102f2565b64ffffffffff161590565b60405190151581526020015b60405180910390f35b6100d16100f4366004610316565b6101c7565b6100d16101073660046102f2565b64ffffffffff16151590565b6100d1610121366004610316565b6101e0565b6100d1610134366004610316565b6101f5565b61014c610147366004610316565b610209565b60405164ffffffffff90911681526020016100dd565b4261014c565b6100d1610176366004610316565b61029e565b6100d1610189366004610316565b6102b2565b6101a661019c3660046102f2565b64ffffffffff1690565b6040519081526020016100dd565b6100d16101c2366004610316565b6102c7565b600064ffffffffff808316908416115b90505b92915050565b600064ffffffffff80831690841611156101d7565b600064ffffffffff808416908316146101d7565b604051633682752160e21b815264ffffffffff821660048201526000906101d79073__$a3c3b8d16d3b00e17e1b34e034b17e7fd4$__9063da09d48490602401602060405180830381865af4158015610266573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028a919061034f565b61029b9064ffffffffff8616610368565b90565b600064ffffffffff808316908416106101d7565b600064ffffffffff80831690841610156101d7565b600064ffffffffff80841690831614156101d7565b64ffffffffff811681146102ef57600080fd5b50565b60006020828403121561030457600080fd5b813561030f816102dc565b9392505050565b6000806040838503121561032957600080fd5b8235610334816102dc565b91506020830135610344816102dc565b809150509250929050565b60006020828403121561036157600080fd5b5051919050565b808201808211156101da57634e487b7160e01b600052601160045260246000fdfea2646970667358221220a0a94077c356730058bd5647ba115210c4c0f8fe5b91e7687d8a4f08dbebec1664736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100b35760003560e01c8063a5798b4e1161007b578063a5798b4e14610139578063adb6183214610162578063add9ce9914610168578063c24922ce1461017b578063da09d4841461018e578063ddf3d631146101b457600080fd5b8063790a38ad146100b857806383ffcdef146100e65780638d38cd4b146100f957806394335b1a146101135780639df8763914610126575b600080fd5b6100d16100c63660046102f2565b64ffffffffff161590565b60405190151581526020015b60405180910390f35b6100d16100f4366004610316565b6101c7565b6100d16101073660046102f2565b64ffffffffff16151590565b6100d1610121366004610316565b6101e0565b6100d1610134366004610316565b6101f5565b61014c610147366004610316565b610209565b60405164ffffffffff90911681526020016100dd565b4261014c565b6100d1610176366004610316565b61029e565b6100d1610189366004610316565b6102b2565b6101a661019c3660046102f2565b64ffffffffff1690565b6040519081526020016100dd565b6100d16101c2366004610316565b6102c7565b600064ffffffffff808316908416115b90505b92915050565b600064ffffffffff80831690841611156101d7565b600064ffffffffff808416908316146101d7565b604051633682752160e21b815264ffffffffff821660048201526000906101d79073__$a3c3b8d16d3b00e17e1b34e034b17e7fd4$__9063da09d48490602401602060405180830381865af4158015610266573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028a919061034f565b61029b9064ffffffffff8616610368565b90565b600064ffffffffff808316908416106101d7565b600064ffffffffff80831690841610156101d7565b600064ffffffffff80841690831614156101d7565b64ffffffffff811681146102ef57600080fd5b50565b60006020828403121561030457600080fd5b813561030f816102dc565b9392505050565b6000806040838503121561032957600080fd5b8235610334816102dc565b91506020830135610344816102dc565b809150509250929050565b60006020828403121561036157600080fd5b5051919050565b808201808211156101da57634e487b7160e01b600052601160045260246000fdfea2646970667358221220a0a94077c356730058bd5647ba115210c4c0f8fe5b91e7687d8a4f08dbebec1664736f6c63430008140033",
+  "bytecode": "0x6103d161003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100be5760003560e01c8063adb618321161007b578063adb618321461016d578063add9ce9914610173578063bc1b392d14610186578063c24922ce1461018d578063da09d484146101a0578063ddf3d631146101c657600080fd5b8063790a38ad146100c357806383ffcdef146100f15780638d38cd4b1461010457806394335b1a1461011e5780639df8763914610131578063a5798b4e14610144575b600080fd5b6100dc6100d1366004610304565b64ffffffffff161590565b60405190151581526020015b60405180910390f35b6100dc6100ff366004610328565b6101d9565b6100dc610112366004610304565b64ffffffffff16151590565b6100dc61012c366004610328565b6101f2565b6100dc61013f366004610328565b610207565b610157610152366004610328565b61021b565b60405164ffffffffff90911681526020016100e8565b42610157565b6100dc610181366004610328565b6102b0565b6000610157565b6100dc61019b366004610328565b6102c4565b6101b86101ae366004610304565b64ffffffffff1690565b6040519081526020016100e8565b6100dc6101d4366004610328565b6102d9565b600064ffffffffff808316908416115b90505b92915050565b600064ffffffffff80831690841611156101e9565b600064ffffffffff808416908316146101e9565b604051633682752160e21b815264ffffffffff821660048201526000906101e99073__$a3c3b8d16d3b00e17e1b34e034b17e7fd4$__9063da09d48490602401602060405180830381865af4158015610278573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061029c9190610361565b6102ad9064ffffffffff861661037a565b90565b600064ffffffffff808316908416106101e9565b600064ffffffffff80831690841610156101e9565b600064ffffffffff80841690831614156101e9565b64ffffffffff8116811461030157600080fd5b50565b60006020828403121561031657600080fd5b8135610321816102ee565b9392505050565b6000806040838503121561033b57600080fd5b8235610346816102ee565b91506020830135610356816102ee565b809150509250929050565b60006020828403121561037357600080fd5b5051919050565b808201808211156101ec57634e487b7160e01b600052601160045260246000fdfea26469706673582212209a859a9d2e862bf8df4a8ca5002e1814474f9c343aa91fa3f113da71f0d1f3dc64736f6c63430008140033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100be5760003560e01c8063adb618321161007b578063adb618321461016d578063add9ce9914610173578063bc1b392d14610186578063c24922ce1461018d578063da09d484146101a0578063ddf3d631146101c657600080fd5b8063790a38ad146100c357806383ffcdef146100f15780638d38cd4b1461010457806394335b1a1461011e5780639df8763914610131578063a5798b4e14610144575b600080fd5b6100dc6100d1366004610304565b64ffffffffff161590565b60405190151581526020015b60405180910390f35b6100dc6100ff366004610328565b6101d9565b6100dc610112366004610304565b64ffffffffff16151590565b6100dc61012c366004610328565b6101f2565b6100dc61013f366004610328565b610207565b610157610152366004610328565b61021b565b60405164ffffffffff90911681526020016100e8565b42610157565b6100dc610181366004610328565b6102b0565b6000610157565b6100dc61019b366004610328565b6102c4565b6101b86101ae366004610304565b64ffffffffff1690565b6040519081526020016100e8565b6100dc6101d4366004610328565b6102d9565b600064ffffffffff808316908416115b90505b92915050565b600064ffffffffff80831690841611156101e9565b600064ffffffffff808416908316146101e9565b604051633682752160e21b815264ffffffffff821660048201526000906101e99073__$a3c3b8d16d3b00e17e1b34e034b17e7fd4$__9063da09d48490602401602060405180830381865af4158015610278573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061029c9190610361565b6102ad9064ffffffffff861661037a565b90565b600064ffffffffff808316908416106101e9565b600064ffffffffff80831690841610156101e9565b600064ffffffffff80841690831614156101e9565b64ffffffffff8116811461030157600080fd5b50565b60006020828403121561031657600080fd5b8135610321816102ee565b9392505050565b6000806040838503121561033b57600080fd5b8235610346816102ee565b91506020830135610356816102ee565b809150509250929050565b60006020828403121561037357600080fd5b5051919050565b808201808211156101ec57634e487b7160e01b600052601160045260246000fdfea26469706673582212209a859a9d2e862bf8df4a8ca5002e1814474f9c343aa91fa3f113da71f0d1f3dc64736f6c63430008140033",
   "linkReferences": {
     "contracts/types/Seconds.sol": {
       "SecondsLib": [
         {
           "length": 20,
-          "start": 614
+          "start": 632
         }
       ]
     }
@@ -259,7 +272,7 @@
       "SecondsLib": [
         {
           "length": 20,
-          "start": 556
+          "start": 574
         }
       ]
     }

package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/95371df5f28c49f1193e96df62dcfc87.json"
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
 }

package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/95371df5f28c49f1193e96df62dcfc87.json"
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
 }

package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/95371df5f28c49f1193e96df62dcfc87.json"
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
 }

package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/95371df5f28c49f1193e96df62dcfc87.json"
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
 }

package/contracts/components/Component.sol

@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
+import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 import {IComponent} from "./IComponent.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
@@ -19,6 +20,7 @@ import {VersionPart} from "../types/Version.sol";
 import {Registerable} from "../shared/Registerable.sol";
 import {RoleId, RoleIdLib} from "../types/RoleId.sol";
 import {IAccess} from "../instance/module/IAccess.sol";
+import {TokenHandler} from "../shared/TokenHandler.sol";
 import {VersionPart} from "../types/Version.sol";
 
 // TODO discuss to inherit from oz accessmanaged
@@ -90,17 +92,32 @@ abstract contract Component is
         $._wallet = address(this);
         $._token = IERC20Metadata(token);
 
+        registerInterface(type(IAccessManaged).interfaceId);
         registerInterface(type(IComponent).interfaceId);
     }
 
-    function lock() external onlyOwner override {
+    function lock() external onlyOwner {
         IInstanceService(_getServiceAddress(INSTANCE())).setComponentLocked(true);
     }
     
-    function unlock() external onlyOwner override {
+    function unlock() external onlyOwner {
         IInstanceService(_getServiceAddress(INSTANCE())).setComponentLocked(false);
     }
 
+    function approveTokenHandler(uint256 spendingLimitAmount) external onlyOwner {
+        IComponents.ComponentInfo memory info = getComponentInfo();
+
+        if(info.wallet != address(this)) {
+            revert ErrorComponentWalletNotComponent();
+        }
+
+        info.token.approve(
+            address(info.tokenHandler),
+            spendingLimitAmount);
+
+        emit LogComponentTokenHandlerApproved(spendingLimitAmount);
+    }
+
     function setWallet(address newWallet)
         external
         override
@@ -195,6 +212,10 @@ abstract contract Component is
         return _getComponentStorage()._token;
     }
 
+    function getTokenHandler() public view returns (TokenHandler tokenHandler) {
+        return getComponentInfo().tokenHandler;
+    }
+
     function isNftInterceptor() public view override returns(bool isInterceptor) {
         return _getComponentStorage()._isNftInterceptor;
     }

package/contracts/components/Distribution.sol

@@ -37,6 +37,8 @@ abstract contract Distribution is
         mapping(address distributor => NftId distributorNftId) _distributorNftId;
     }
 
+    error ErrorDistributionAlreadyDistributor(address distributor, NftId distributorNftId);
+
     function initializeDistribution(
         address registry,
         NftId instanceNftId,
@@ -58,7 +60,7 @@ abstract contract Distribution is
         $._minDistributionOwnerFee = minDistributionOwnerFee;
         $._distributionFee = distributionFee;
         $._tokenHandler = new TokenHandler(token);
-        $._distributionService = getInstance().getDistributionService();
+        $._distributionService = IDistributionService(_getServiceAddress(DISTRIBUTION())); 
 
         registerInterface(type(IDistributionComponent).interfaceId);
     }
@@ -116,7 +118,9 @@ abstract contract Distribution is
         returns(NftId distributorNftId)
     {
         DistributionStorage storage $ = _getDistributionStorage();
-        require($._distributorNftId[distributor].eqz(), "ERROR:DST-030:ALREADY_DISTRIBUTOR");
+        if($._distributorNftId[distributor].gtz()) {
+            revert ErrorDistributionAlreadyDistributor(distributor, $._distributorNftId[distributor]);
+        }
 
         distributorNftId = $._distributionService.createDistributor(
             distributor,
@@ -136,10 +140,11 @@ abstract contract Distribution is
         // and add it
     {
         DistributionStorage storage $ = _getDistributionStorage();
-        $._distributionService.updateDistributorType(
-            distributorNftId,
-            distributorType,
-            data);
+        // TODO re-enable once implemented
+        // $._distributionService.updateDistributorType(
+        //     distributorNftId,
+        //     distributorType,
+        //     data);
     }
 
     /**