@etherisc/gif-next 0.0.2-f0d86c2-077 → 0.0.2-f4f92b3-338

package/artifacts/contracts/test/Usdc.sol/USDC.json

@@ -8,6 +8,92 @@
       "stateMutability": "nonpayable",
       "type": "constructor"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "spender",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "allowance",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "needed",
+          "type": "uint256"
+        }
+      ],
+      "name": "ERC20InsufficientAllowance",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "sender",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "balance",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "needed",
+          "type": "uint256"
+        }
+      ],
+      "name": "ERC20InsufficientBalance",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "approver",
+          "type": "address"
+        }
+      ],
+      "name": "ERC20InvalidApprover",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "receiver",
+          "type": "address"
+        }
+      ],
+      "name": "ERC20InvalidReceiver",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "sender",
+          "type": "address"
+        }
+      ],
+      "name": "ERC20InvalidSender",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "spender",
+          "type": "address"
+        }
+      ],
+      "name": "ERC20InvalidSpender",
+      "type": "error"
+    },
     {
       "anonymous": false,
       "inputs": [
@@ -143,7 +229,7 @@
         },
         {
           "internalType": "uint256",
-          "name": "amount",
+          "name": "value",
           "type": "uint256"
         }
       ],
@@ -190,54 +276,6 @@
       "stateMutability": "pure",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "subtractedValue",
-          "type": "uint256"
-        }
-      ],
-      "name": "decreaseAllowance",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "addedValue",
-          "type": "uint256"
-        }
-      ],
-      "name": "increaseAllowance",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "name",
@@ -286,7 +324,7 @@
         },
         {
           "internalType": "uint256",
-          "name": "amount",
+          "name": "value",
           "type": "uint256"
         }
       ],
@@ -315,7 +353,7 @@
         },
         {
           "internalType": "uint256",
-          "name": "amount",
+          "name": "value",
           "type": "uint256"
         }
       ],
@@ -331,8 +369,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60806040523480156200001157600080fd5b506040518060400160405280600c81526020016b55534443202d2044554d4d5960a01b815250604051806040016040528060048152602001635553444360e01b815250816003908162000065919062000228565b50600462000074828262000228565b505050620000af6200008b620000b560201b60201c565b620000996006600a62000409565b620000a990633b9aca0062000421565b620000b9565b62000451565b3390565b6001600160a01b038216620001145760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015260640160405180910390fd5b80600260008282546200012891906200043b565b90915550506001600160a01b038216600081815260208181526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b505050565b634e487b7160e01b600052604160045260246000fd5b600181811c90821680620001af57607f821691505b602082108103620001d057634e487b7160e01b600052602260045260246000fd5b50919050565b601f8211156200017f57600081815260208120601f850160051c81016020861015620001ff5750805b601f850160051c820191505b8181101562000220578281556001016200020b565b505050505050565b81516001600160401b0381111562000244576200024462000184565b6200025c816200025584546200019a565b84620001d6565b602080601f8311600181146200029457600084156200027b5750858301515b600019600386901b1c1916600185901b17855562000220565b600085815260208120601f198616915b82811015620002c557888601518255948401946001909101908401620002a4565b5085821015620002e45787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b634e487b7160e01b600052601160045260246000fd5b600181815b808511156200034b5781600019048211156200032f576200032f620002f4565b808516156200033d57918102915b93841c93908002906200030f565b509250929050565b600082620003645750600162000403565b81620003735750600062000403565b81600181146200038c57600281146200039757620003b7565b600191505062000403565b60ff841115620003ab57620003ab620002f4565b50506001821b62000403565b5060208310610133831016604e8410600b8410161715620003dc575081810a62000403565b620003e883836200030a565b8060001904821115620003ff57620003ff620002f4565b0290505b92915050565b60006200041a60ff84168362000353565b9392505050565b8082028115828204841417620004035762000403620002f4565b80820180821115620004035762000403620002f4565b610a3580620004616000396000f3fe608060405234801561001057600080fd5b50600436106100f55760003560e01c80633950935111610097578063a457c2d711610066578063a457c2d7146101f8578063a9059cbb1461020b578063dd62ed3e1461021e578063f76f8d781461023157600080fd5b8063395093511461018957806370a082311461019c57806395d89b41146101c5578063a3f4df7e146101cd57600080fd5b806323b872dd116100d357806323b872dd1461014d5780632e0f2625146101605780632ff2e9dc1461017a578063313ce5671461018257600080fd5b806306fdde03146100fa578063095ea7b31461011857806318160ddd1461013b575b600080fd5b610102610254565b60405161010f919061076d565b60405180910390f35b61012b6101263660046107d7565b6102e6565b604051901515815260200161010f565b6002545b60405190815260200161010f565b61012b61015b366004610801565b610300565b610168600681565b60405160ff909116815260200161010f565b61013f610324565b6006610168565b61012b6101973660046107d7565b610341565b61013f6101aa36600461083d565b6001600160a01b031660009081526020819052604090205490565b610102610363565b6101026040518060400160405280600c81526020016b55534443202d2044554d4d5960a01b81525081565b61012b6102063660046107d7565b610372565b61012b6102193660046107d7565b6103f2565b61013f61022c36600461085f565b610400565b610102604051806040016040528060048152602001635553444360e01b81525081565b60606003805461026390610892565b80601f016020809104026020016040519081016040528092919081815260200182805461028f90610892565b80156102dc5780601f106102b1576101008083540402835291602001916102dc565b820191906000526020600020905b8154815290600101906020018083116102bf57829003601f168201915b5050505050905090565b6000336102f481858561042b565b60019150505b92915050565b60003361030e85828561054f565b6103198585856105c9565b506001949350505050565b6103306006600a6109c6565b61033e90633b9aca006109d5565b81565b6000336102f48185856103548383610400565b61035e91906109ec565b61042b565b60606004805461026390610892565b600033816103808286610400565b9050838110156103e55760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b60648201526084015b60405180910390fd5b610319828686840361042b565b6000336102f48185856105c9565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6001600160a01b03831661048d5760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b60648201526084016103dc565b6001600160a01b0382166104ee5760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b60648201526084016103dc565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b600061055b8484610400565b905060001981146105c357818110156105b65760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e636500000060448201526064016103dc565b6105c3848484840361042b565b50505050565b6001600160a01b03831661062d5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b60648201526084016103dc565b6001600160a01b03821661068f5760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b60648201526084016103dc565b6001600160a01b038316600090815260208190526040902054818110156107075760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b60648201526084016103dc565b6001600160a01b03848116600081815260208181526040808320878703905593871680835291849020805487019055925185815290927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a36105c3565b600060208083528351808285015260005b8181101561079a5785810183015185820160400152820161077e565b506000604082860101526040601f19601f8301168501019250505092915050565b80356001600160a01b03811681146107d257600080fd5b919050565b600080604083850312156107ea57600080fd5b6107f3836107bb565b946020939093013593505050565b60008060006060848603121561081657600080fd5b61081f846107bb565b925061082d602085016107bb565b9150604084013590509250925092565b60006020828403121561084f57600080fd5b610858826107bb565b9392505050565b6000806040838503121561087257600080fd5b61087b836107bb565b9150610889602084016107bb565b90509250929050565b600181811c908216806108a657607f821691505b6020821081036108c657634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600181815b8085111561091d578160001904821115610903576109036108cc565b8085161561091057918102915b93841c93908002906108e7565b509250929050565b600082610934575060016102fa565b81610941575060006102fa565b816001811461095757600281146109615761097d565b60019150506102fa565b60ff841115610972576109726108cc565b50506001821b6102fa565b5060208310610133831016604e8410600b84101617156109a0575081810a6102fa565b6109aa83836108e2565b80600019048211156109be576109be6108cc565b029392505050565b600061085860ff841683610925565b80820281158282048414176102fa576102fa6108cc565b808201808211156102fa576102fa6108cc56fea2646970667358221220284c71a8da7090e32de9a1e56c783803f2b86c58b8a5fafed2a0ff82721a1b4564736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100f55760003560e01c80633950935111610097578063a457c2d711610066578063a457c2d7146101f8578063a9059cbb1461020b578063dd62ed3e1461021e578063f76f8d781461023157600080fd5b8063395093511461018957806370a082311461019c57806395d89b41146101c5578063a3f4df7e146101cd57600080fd5b806323b872dd116100d357806323b872dd1461014d5780632e0f2625146101605780632ff2e9dc1461017a578063313ce5671461018257600080fd5b806306fdde03146100fa578063095ea7b31461011857806318160ddd1461013b575b600080fd5b610102610254565b60405161010f919061076d565b60405180910390f35b61012b6101263660046107d7565b6102e6565b604051901515815260200161010f565b6002545b60405190815260200161010f565b61012b61015b366004610801565b610300565b610168600681565b60405160ff909116815260200161010f565b61013f610324565b6006610168565b61012b6101973660046107d7565b610341565b61013f6101aa36600461083d565b6001600160a01b031660009081526020819052604090205490565b610102610363565b6101026040518060400160405280600c81526020016b55534443202d2044554d4d5960a01b81525081565b61012b6102063660046107d7565b610372565b61012b6102193660046107d7565b6103f2565b61013f61022c36600461085f565b610400565b610102604051806040016040528060048152602001635553444360e01b81525081565b60606003805461026390610892565b80601f016020809104026020016040519081016040528092919081815260200182805461028f90610892565b80156102dc5780601f106102b1576101008083540402835291602001916102dc565b820191906000526020600020905b8154815290600101906020018083116102bf57829003601f168201915b5050505050905090565b6000336102f481858561042b565b60019150505b92915050565b60003361030e85828561054f565b6103198585856105c9565b506001949350505050565b6103306006600a6109c6565b61033e90633b9aca006109d5565b81565b6000336102f48185856103548383610400565b61035e91906109ec565b61042b565b60606004805461026390610892565b600033816103808286610400565b9050838110156103e55760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b60648201526084015b60405180910390fd5b610319828686840361042b565b6000336102f48185856105c9565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6001600160a01b03831661048d5760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b60648201526084016103dc565b6001600160a01b0382166104ee5760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b60648201526084016103dc565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b600061055b8484610400565b905060001981146105c357818110156105b65760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e636500000060448201526064016103dc565b6105c3848484840361042b565b50505050565b6001600160a01b03831661062d5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b60648201526084016103dc565b6001600160a01b03821661068f5760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b60648201526084016103dc565b6001600160a01b038316600090815260208190526040902054818110156107075760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b60648201526084016103dc565b6001600160a01b03848116600081815260208181526040808320878703905593871680835291849020805487019055925185815290927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a36105c3565b600060208083528351808285015260005b8181101561079a5785810183015185820160400152820161077e565b506000604082860101526040601f19601f8301168501019250505092915050565b80356001600160a01b03811681146107d257600080fd5b919050565b600080604083850312156107ea57600080fd5b6107f3836107bb565b946020939093013593505050565b60008060006060848603121561081657600080fd5b61081f846107bb565b925061082d602085016107bb565b9150604084013590509250925092565b60006020828403121561084f57600080fd5b610858826107bb565b9392505050565b6000806040838503121561087257600080fd5b61087b836107bb565b9150610889602084016107bb565b90509250929050565b600181811c908216806108a657607f821691505b6020821081036108c657634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600181815b8085111561091d578160001904821115610903576109036108cc565b8085161561091057918102915b93841c93908002906108e7565b509250929050565b600082610934575060016102fa565b81610941575060006102fa565b816001811461095757600281146109615761097d565b60019150506102fa565b60ff841115610972576109726108cc565b50506001821b6102fa565b5060208310610133831016604e8410600b84101617156109a0575081810a6102fa565b6109aa83836108e2565b80600019048211156109be576109be6108cc565b029392505050565b600061085860ff841683610925565b80820281158282048414176102fa576102fa6108cc565b808201808211156102fa576102fa6108cc56fea2646970667358221220284c71a8da7090e32de9a1e56c783803f2b86c58b8a5fafed2a0ff82721a1b4564736f6c63430008140033",
+  "bytecode": "0x60806040523480156200001157600080fd5b506040518060400160405280600c81526020016b55534443202d2044554d4d5960a01b815250604051806040016040528060048152602001635553444360e01b8152508160039081620000659190620002d3565b506004620000748282620002d3565b505050620000af6200008b620000b560201b60201c565b620000996006600a620004b4565b620000a990633b9aca00620004cc565b620000b9565b620004fc565b3390565b6001600160a01b038216620000e95760405163ec442f0560e01b8152600060048201526024015b60405180910390fd5b620000f760008383620000fb565b5050565b6001600160a01b0383166200012a5780600260008282546200011e9190620004e6565b909155506200019e9050565b6001600160a01b038316600090815260208190526040902054818110156200017f5760405163391434e360e21b81526001600160a01b03851660048201526024810182905260448101839052606401620000e0565b6001600160a01b03841660009081526020819052604090209082900390555b6001600160a01b038216620001bc57600280548290039055620001db565b6001600160a01b03821660009081526020819052604090208054820190555b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040516200022191815260200190565b60405180910390a3505050565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200025957607f821691505b6020821081036200027a57634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620002ce57600081815260208120601f850160051c81016020861015620002a95750805b601f850160051c820191505b81811015620002ca57828155600101620002b5565b5050505b505050565b81516001600160401b03811115620002ef57620002ef6200022e565b620003078162000300845462000244565b8462000280565b602080601f8311600181146200033f5760008415620003265750858301515b600019600386901b1c1916600185901b178555620002ca565b600085815260208120601f198616915b8281101562000370578886015182559484019460019091019084016200034f565b50858210156200038f5787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b634e487b7160e01b600052601160045260246000fd5b600181815b80851115620003f6578160001904821115620003da57620003da6200039f565b80851615620003e857918102915b93841c9390800290620003ba565b509250929050565b6000826200040f57506001620004ae565b816200041e57506000620004ae565b8160018114620004375760028114620004425762000462565b6001915050620004ae565b60ff8411156200045657620004566200039f565b50506001821b620004ae565b5060208310610133831016604e8410600b841016171562000487575081810a620004ae565b620004938383620003b5565b8060001904821115620004aa57620004aa6200039f565b0290505b92915050565b6000620004c560ff841683620003fe565b9392505050565b8082028115828204841417620004ae57620004ae6200039f565b80820180821115620004ae57620004ae6200039f565b6108f3806200050c6000396000f3fe608060405234801561001057600080fd5b50600436106100cf5760003560e01c8063313ce5671161008c578063a3f4df7e11610066578063a3f4df7e14610194578063a9059cbb146101bf578063dd62ed3e146101d2578063f76f8d781461020b57600080fd5b8063313ce5671461015c57806370a082311461016357806395d89b411461018c57600080fd5b806306fdde03146100d4578063095ea7b3146100f257806318160ddd1461011557806323b872dd146101275780632e0f26251461013a5780632ff2e9dc14610154575b600080fd5b6100dc61022e565b6040516100e9919061062b565b60405180910390f35b610105610100366004610695565b6102c0565b60405190151581526020016100e9565b6002545b6040519081526020016100e9565b6101056101353660046106bf565b6102da565b610142600681565b60405160ff90911681526020016100e9565b6101196102fe565b6006610142565b6101196101713660046106fb565b6001600160a01b031660009081526020819052604090205490565b6100dc61031b565b6100dc6040518060400160405280600c81526020016b55534443202d2044554d4d5960a01b81525081565b6101056101cd366004610695565b61032a565b6101196101e036600461071d565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6100dc604051806040016040528060048152602001635553444360e01b81525081565b60606003805461023d90610750565b80601f016020809104026020016040519081016040528092919081815260200182805461026990610750565b80156102b65780601f1061028b576101008083540402835291602001916102b6565b820191906000526020600020905b81548152906001019060200180831161029957829003601f168201915b5050505050905090565b6000336102ce818585610338565b60019150505b92915050565b6000336102e885828561034a565b6102f38585856103cd565b506001949350505050565b61030a6006600a610884565b61031890633b9aca00610893565b81565b60606004805461023d90610750565b6000336102ce8185856103cd565b610345838383600161042c565b505050565b6001600160a01b0383811660009081526001602090815260408083209386168352929052205460001981146103c757818110156103b857604051637dc7a0d960e11b81526001600160a01b038416600482015260248101829052604481018390526064015b60405180910390fd5b6103c78484848403600061042c565b50505050565b6001600160a01b0383166103f757604051634b637e8f60e11b8152600060048201526024016103af565b6001600160a01b0382166104215760405163ec442f0560e01b8152600060048201526024016103af565b610345838383610501565b6001600160a01b0384166104565760405163e602df0560e01b8152600060048201526024016103af565b6001600160a01b03831661048057604051634a1406b160e11b8152600060048201526024016103af565b6001600160a01b03808516600090815260016020908152604080832093871683529290522082905580156103c757826001600160a01b0316846001600160a01b03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040516104f391815260200190565b60405180910390a350505050565b6001600160a01b03831661052c57806002600082825461052191906108aa565b9091555061059e9050565b6001600160a01b0383166000908152602081905260409020548181101561057f5760405163391434e360e21b81526001600160a01b038516600482015260248101829052604481018390526064016103af565b6001600160a01b03841660009081526020819052604090209082900390555b6001600160a01b0382166105ba576002805482900390556105d9565b6001600160a01b03821660009081526020819052604090208054820190555b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8360405161061e91815260200190565b60405180910390a3505050565b600060208083528351808285015260005b818110156106585785810183015185820160400152820161063c565b506000604082860101526040601f19601f8301168501019250505092915050565b80356001600160a01b038116811461069057600080fd5b919050565b600080604083850312156106a857600080fd5b6106b183610679565b946020939093013593505050565b6000806000606084860312156106d457600080fd5b6106dd84610679565b92506106eb60208501610679565b9150604084013590509250925092565b60006020828403121561070d57600080fd5b61071682610679565b9392505050565b6000806040838503121561073057600080fd5b61073983610679565b915061074760208401610679565b90509250929050565b600181811c9082168061076457607f821691505b60208210810361078457634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600181815b808511156107db5781600019048211156107c1576107c161078a565b808516156107ce57918102915b93841c93908002906107a5565b509250929050565b6000826107f2575060016102d4565b816107ff575060006102d4565b8160018114610815576002811461081f5761083b565b60019150506102d4565b60ff8411156108305761083061078a565b50506001821b6102d4565b5060208310610133831016604e8410600b841016171561085e575081810a6102d4565b61086883836107a0565b806000190482111561087c5761087c61078a565b029392505050565b600061071660ff8416836107e3565b80820281158282048414176102d4576102d461078a565b808201808211156102d4576102d461078a56fea2646970667358221220c7cd5b3f809ed9ea6a1f9af7bfa7d7bdd7eb9d8295877f2b981db597faede29d64736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100cf5760003560e01c8063313ce5671161008c578063a3f4df7e11610066578063a3f4df7e14610194578063a9059cbb146101bf578063dd62ed3e146101d2578063f76f8d781461020b57600080fd5b8063313ce5671461015c57806370a082311461016357806395d89b411461018c57600080fd5b806306fdde03146100d4578063095ea7b3146100f257806318160ddd1461011557806323b872dd146101275780632e0f26251461013a5780632ff2e9dc14610154575b600080fd5b6100dc61022e565b6040516100e9919061062b565b60405180910390f35b610105610100366004610695565b6102c0565b60405190151581526020016100e9565b6002545b6040519081526020016100e9565b6101056101353660046106bf565b6102da565b610142600681565b60405160ff90911681526020016100e9565b6101196102fe565b6006610142565b6101196101713660046106fb565b6001600160a01b031660009081526020819052604090205490565b6100dc61031b565b6100dc6040518060400160405280600c81526020016b55534443202d2044554d4d5960a01b81525081565b6101056101cd366004610695565b61032a565b6101196101e036600461071d565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6100dc604051806040016040528060048152602001635553444360e01b81525081565b60606003805461023d90610750565b80601f016020809104026020016040519081016040528092919081815260200182805461026990610750565b80156102b65780601f1061028b576101008083540402835291602001916102b6565b820191906000526020600020905b81548152906001019060200180831161029957829003601f168201915b5050505050905090565b6000336102ce818585610338565b60019150505b92915050565b6000336102e885828561034a565b6102f38585856103cd565b506001949350505050565b61030a6006600a610884565b61031890633b9aca00610893565b81565b60606004805461023d90610750565b6000336102ce8185856103cd565b610345838383600161042c565b505050565b6001600160a01b0383811660009081526001602090815260408083209386168352929052205460001981146103c757818110156103b857604051637dc7a0d960e11b81526001600160a01b038416600482015260248101829052604481018390526064015b60405180910390fd5b6103c78484848403600061042c565b50505050565b6001600160a01b0383166103f757604051634b637e8f60e11b8152600060048201526024016103af565b6001600160a01b0382166104215760405163ec442f0560e01b8152600060048201526024016103af565b610345838383610501565b6001600160a01b0384166104565760405163e602df0560e01b8152600060048201526024016103af565b6001600160a01b03831661048057604051634a1406b160e11b8152600060048201526024016103af565b6001600160a01b03808516600090815260016020908152604080832093871683529290522082905580156103c757826001600160a01b0316846001600160a01b03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040516104f391815260200190565b60405180910390a350505050565b6001600160a01b03831661052c57806002600082825461052191906108aa565b9091555061059e9050565b6001600160a01b0383166000908152602081905260409020548181101561057f5760405163391434e360e21b81526001600160a01b038516600482015260248101829052604481018390526064016103af565b6001600160a01b03841660009081526020819052604090209082900390555b6001600160a01b0382166105ba576002805482900390556105d9565b6001600160a01b03821660009081526020819052604090208054820190555b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8360405161061e91815260200190565b60405180910390a3505050565b600060208083528351808285015260005b818110156106585785810183015185820160400152820161063c565b506000604082860101526040601f19601f8301168501019250505092915050565b80356001600160a01b038116811461069057600080fd5b919050565b600080604083850312156106a857600080fd5b6106b183610679565b946020939093013593505050565b6000806000606084860312156106d457600080fd5b6106dd84610679565b92506106eb60208501610679565b9150604084013590509250925092565b60006020828403121561070d57600080fd5b61071682610679565b9392505050565b6000806040838503121561073057600080fd5b61073983610679565b915061074760208401610679565b90509250929050565b600181811c9082168061076457607f821691505b60208210810361078457634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600181815b808511156107db5781600019048211156107c1576107c161078a565b808516156107ce57918102915b93841c93908002906107a5565b509250929050565b6000826107f2575060016102d4565b816107ff575060006102d4565b8160018114610815576002811461081f5761083b565b60019150506102d4565b60ff8411156108305761083061078a565b50506001821b6102d4565b5060208310610133831016604e8410600b841016171561085e575081810a6102d4565b61086883836107a0565b806000190482111561087c5761087c61078a565b029392505050565b600061071660ff8416836107e3565b80820281158282048414176102d4576102d461078a565b808201808211156102d4576102d461078a56fea2646970667358221220c7cd5b3f809ed9ea6a1f9af7bfa7d7bdd7eb9d8295877f2b981db597faede29d64736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json

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

package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json

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

package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json

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

package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json

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

package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json

@@ -0,0 +1,104 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "DistributorTypeLib",
+  "sourceName": "contracts/types/DistributorType.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "distributionNftId",
+          "type": "uint96"
+        },
+        {
+          "internalType": "string",
+          "name": "name",
+          "type": "string"
+        }
+      ],
+      "name": "toDistributorType",
+      "outputs": [
+        {
+          "internalType": "DistributorType",
+          "name": "",
+          "type": "bytes8"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "DistributorType",
+          "name": "id",
+          "type": "bytes8"
+        }
+      ],
+      "name": "toKey32",
+      "outputs": [
+        {
+          "internalType": "Key32",
+          "name": "key",
+          "type": "bytes32"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "DistributorType",
+          "name": "id",
+          "type": "bytes8"
+        }
+      ],
+      "name": "toKeyId",
+      "outputs": [
+        {
+          "internalType": "KeyId",
+          "name": "keyId",
+          "type": "bytes31"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "zero",
+      "outputs": [
+        {
+          "internalType": "DistributorType",
+          "name": "",
+          "type": "bytes8"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x61037e61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632cf96bf91461005b57806355ee62751461008e578063578c3039146100af578063bc1b392d146100db575b600080fd5b6100766100693660046101af565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100a161009c3660046101af565b6100e2565b604051908152602001610085565b6100c26100bd3660046101f6565b61017c565b6040516001600160c01b03199091168152602001610085565b60006100c2565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce60796001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610152573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061017691906102cb565b92915050565b600082826040516020016101919291906102e4565b60405160208183030381529060405280519060200120905092915050565b6000602082840312156101c157600080fd5b81356001600160c01b0319811681146101d957600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b6000806040838503121561020957600080fd5b82356bffffffffffffffffffffffff8116811461022557600080fd5b9150602083013567ffffffffffffffff8082111561024257600080fd5b818501915085601f83011261025657600080fd5b813581811115610268576102686101e0565b604051601f8201601f19908116603f01168101908382118183101715610290576102906101e0565b816040528281528860208487010111156102a957600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000602082840312156102dd57600080fd5b5051919050565b6bffffffffffffffffffffffff8316815260006020604081840152835180604085015260005b818110156103265785810183015185820160600152820161030a565b506000606082860101526060601f19601f83011685010192505050939250505056fea2646970667358221220fd88b7db7bcbd901668cd76910655271dc1508cf5da8b73875e155645dac38ae64736f6c63430008140033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632cf96bf91461005b57806355ee62751461008e578063578c3039146100af578063bc1b392d146100db575b600080fd5b6100766100693660046101af565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100a161009c3660046101af565b6100e2565b604051908152602001610085565b6100c26100bd3660046101f6565b61017c565b6040516001600160c01b03199091168152602001610085565b60006100c2565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce60796001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610152573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061017691906102cb565b92915050565b600082826040516020016101919291906102e4565b60405160208183030381529060405280519060200120905092915050565b6000602082840312156101c157600080fd5b81356001600160c01b0319811681146101d957600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b6000806040838503121561020957600080fd5b82356bffffffffffffffffffffffff8116811461022557600080fd5b9150602083013567ffffffffffffffff8082111561024257600080fd5b818501915085601f83011261025657600080fd5b813581811115610268576102686101e0565b604051601f8201601f19908116603f01168101908382118183101715610290576102906101e0565b816040528281528860208487010111156102a957600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000602082840312156102dd57600080fd5b5051919050565b6bffffffffffffffffffffffff8316815260006020604081840152835180604085015260005b818110156103265785810183015185820160600152820161030a565b506000606082860101526060601f19601f83011685010192505050939250505056fea2646970667358221220fd88b7db7bcbd901668cd76910655271dc1508cf5da8b73875e155645dac38ae64736f6c63430008140033",
+  "linkReferences": {
+    "contracts/types/Key32.sol": {
+      "Key32Lib": [
+        {
+          "length": 20,
+          "start": 288
+        }
+      ]
+    }
+  },
+  "deployedLinkReferences": {
+    "contracts/types/Key32.sol": {
+      "Key32Lib": [
+        {
+          "length": 20,
+          "start": 230
+        }
+      ]
+    }
+  }
+}

package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json

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

package/artifacts/contracts/types/Fee.sol/FeeLib.json

@@ -5,11 +5,6 @@
   "abi": [
     {
       "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        },
         {
           "components": [
             {
@@ -26,6 +21,11 @@
           "internalType": "struct Fee",
           "name": "fee",
           "type": "tuple"
+        },
+        {
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
         }
       ],
       "name": "calculateFee",
@@ -123,6 +123,37 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "uint8",
+          "name": "percent",
+          "type": "uint8"
+        }
+      ],
+      "name": "percentageFee",
+      "outputs": [
+        {
+          "components": [
+            {
+              "internalType": "UFixed",
+              "name": "fractionalFee",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "fixedFee",
+              "type": "uint256"
+            }
+          ],
+          "internalType": "struct Fee",
+          "name": "fee",
+          "type": "tuple"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -185,32 +216,40 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61053261003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100615760003560e01c80632bd182d3146100665780638de0a4c2146100ac57806395248868146100cf578063c66fb3ae146100e2578063c7010dfa1461010a575b600080fd5b604080518082018252600080825260209182018190528251808401909352808352908201525b604080518251815260209283015192810192909252015b60405180910390f35b6100bf6100ba3660046103fa565b61013e565b60405190151581526020016100a3565b6100bf6100dd366004610416565b610159565b6100f56100f036600461044b565b61017a565b604080519283526020830191909152016100a3565b61008c61011836600461046f565b604080518082018252600080825260209182015281518083019092529281529182015290565b60008160200151600014801561015357508151155b92915050565b600081602001518360200151148015610173575082518251145b9392505050565b600080600061020373__$fa7f345063a1bf0cf2bd14a32ccc1b6018$__6345ebb61e876040518263ffffffff1660e01b81526004016101bb91815260200190565b602060405180830381865af41580156101d8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101fc9190610491565b85516102a0565b6020850151604051632255341b60e11b8152600481018390529192509073__$fa7f345063a1bf0cf2bd14a32ccc1b6018$__906344aa683690602401602060405180830381865af415801561025c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102809190610491565b61028a91906104c0565b925061029683866104d3565b9150509250929050565b60006101738383670de0b6b3a764000060008080600019858709858702925082811083820303915050806000036102ea578382816102e0576102e06104e6565b0492505050610173565b8084116103355760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b604482015260640160405180910390fd5b600084868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203026000889003889004909101858311909403939093029303949094049190911702949350505050565b6000604082840312156103af57600080fd5b6040516040810181811067ffffffffffffffff821117156103e057634e487b7160e01b600052604160045260246000fd5b604052823581526020928301359281019290925250919050565b60006040828403121561040c57600080fd5b610173838361039d565b6000806080838503121561042957600080fd5b610433848461039d565b9150610442846040850161039d565b90509250929050565b6000806060838503121561045e57600080fd5b82359150610442846020850161039d565b6000806040838503121561048257600080fd5b50508035926020909101359150565b6000602082840312156104a357600080fd5b5051919050565b634e487b7160e01b600052601160045260246000fd5b80820180821115610153576101536104aa565b81810381811115610153576101536104aa565b634e487b7160e01b600052601260045260246000fdfea2646970667358221220ce43dac16f65baa3a831022a10e378d17dafa927733d7a7e1c52c57f847ba20664736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100615760003560e01c80632bd182d3146100665780638de0a4c2146100ac57806395248868146100cf578063c66fb3ae146100e2578063c7010dfa1461010a575b600080fd5b604080518082018252600080825260209182018190528251808401909352808352908201525b604080518251815260209283015192810192909252015b60405180910390f35b6100bf6100ba3660046103fa565b61013e565b60405190151581526020016100a3565b6100bf6100dd366004610416565b610159565b6100f56100f036600461044b565b61017a565b604080519283526020830191909152016100a3565b61008c61011836600461046f565b604080518082018252600080825260209182015281518083019092529281529182015290565b60008160200151600014801561015357508151155b92915050565b600081602001518360200151148015610173575082518251145b9392505050565b600080600061020373__$fa7f345063a1bf0cf2bd14a32ccc1b6018$__6345ebb61e876040518263ffffffff1660e01b81526004016101bb91815260200190565b602060405180830381865af41580156101d8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101fc9190610491565b85516102a0565b6020850151604051632255341b60e11b8152600481018390529192509073__$fa7f345063a1bf0cf2bd14a32ccc1b6018$__906344aa683690602401602060405180830381865af415801561025c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102809190610491565b61028a91906104c0565b925061029683866104d3565b9150509250929050565b60006101738383670de0b6b3a764000060008080600019858709858702925082811083820303915050806000036102ea578382816102e0576102e06104e6565b0492505050610173565b8084116103355760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b604482015260640160405180910390fd5b600084868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203026000889003889004909101858311909403939093029303949094049190911702949350505050565b6000604082840312156103af57600080fd5b6040516040810181811067ffffffffffffffff821117156103e057634e487b7160e01b600052604160045260246000fd5b604052823581526020928301359281019290925250919050565b60006040828403121561040c57600080fd5b610173838361039d565b6000806080838503121561042957600080fd5b610433848461039d565b9150610442846040850161039d565b90509250929050565b6000806060838503121561045e57600080fd5b82359150610442846020850161039d565b6000806040838503121561048257600080fd5b50508035926020909101359150565b6000602082840312156104a357600080fd5b5051919050565b634e487b7160e01b600052601160045260246000fd5b80820180821115610153576101536104aa565b81810381811115610153576101536104aa565b634e487b7160e01b600052601260045260246000fdfea2646970667358221220ce43dac16f65baa3a831022a10e378d17dafa927733d7a7e1c52c57f847ba20664736f6c63430008140033",
+  "bytecode": "0x61062361003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c806304baf60c146100715780632bd182d31461009e5780635faa955b146100df5780638de0a4c2146100f25780639524886814610115578063c7010dfa14610128575b600080fd5b61008461007f3660046104c1565b61015c565b604080519283526020830191909152015b60405180910390f35b604080518082018252600080825260209182018190528251808401909352808352908201525b60408051825181526020928301519281019290925201610095565b6100c46100ed3660046104ec565b610282565b61010561010036600461050f565b61032b565b6040519015158152602001610095565b61010561012336600461052b565b610346565b6100c4610136366004610560565b604080518082018252600080825260209182015281518083019092529281529182015290565b60008060006101e573__$5ac3274b8cf1e01ea223bf093142af05b0$__6345ebb61e866040518263ffffffff1660e01b815260040161019d91815260200190565b602060405180830381865af41580156101ba573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101de9190610582565b8651610367565b6020860151604051632255341b60e11b8152600481018390529192509073__$5ac3274b8cf1e01ea223bf093142af05b0$__906344aa683690602401602060405180830381865af415801561023e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102629190610582565b61026c91906105b1565b925061027883856105c4565b9150509250929050565b60408051808201825260008082526020820152815180830192839052631488c84560e01b90925260ff831660448301526001196064830152908073__$5ac3274b8cf1e01ea223bf093142af05b0$__631488c84560848301602060405180830381865af41580156102f7573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061031b9190610582565b8152600060209091015292915050565b60008160200151600014801561034057508151155b92915050565b600081602001518360200151148015610360575082518251145b9392505050565b60006103608383670de0b6b3a764000060008080600019858709858702925082811083820303915050806000036103b1578382816103a7576103a76105d7565b0492505050610360565b8084116103fc5760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b604482015260640160405180910390fd5b600084868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203026000889003889004909101858311909403939093029303949094049190911702949350505050565b60006040828403121561047657600080fd5b6040516040810181811067ffffffffffffffff821117156104a757634e487b7160e01b600052604160045260246000fd5b604052823581526020928301359281019290925250919050565b600080606083850312156104d457600080fd5b6104de8484610464565b946040939093013593505050565b6000602082840312156104fe57600080fd5b813560ff8116811461036057600080fd5b60006040828403121561052157600080fd5b6103608383610464565b6000806080838503121561053e57600080fd5b6105488484610464565b91506105578460408501610464565b90509250929050565b6000806040838503121561057357600080fd5b50508035926020909101359150565b60006020828403121561059457600080fd5b5051919050565b634e487b7160e01b600052601160045260246000fd5b808201808211156103405761034061059b565b818103818111156103405761034061059b565b634e487b7160e01b600052601260045260246000fdfea2646970667358221220c77a95dee494b2abcf575cdf95fd67f95e3ba1946af0cc3c46d0e454b9587ac064736f6c63430008140033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c806304baf60c146100715780632bd182d31461009e5780635faa955b146100df5780638de0a4c2146100f25780639524886814610115578063c7010dfa14610128575b600080fd5b61008461007f3660046104c1565b61015c565b604080519283526020830191909152015b60405180910390f35b604080518082018252600080825260209182018190528251808401909352808352908201525b60408051825181526020928301519281019290925201610095565b6100c46100ed3660046104ec565b610282565b61010561010036600461050f565b61032b565b6040519015158152602001610095565b61010561012336600461052b565b610346565b6100c4610136366004610560565b604080518082018252600080825260209182015281518083019092529281529182015290565b60008060006101e573__$5ac3274b8cf1e01ea223bf093142af05b0$__6345ebb61e866040518263ffffffff1660e01b815260040161019d91815260200190565b602060405180830381865af41580156101ba573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101de9190610582565b8651610367565b6020860151604051632255341b60e11b8152600481018390529192509073__$5ac3274b8cf1e01ea223bf093142af05b0$__906344aa683690602401602060405180830381865af415801561023e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102629190610582565b61026c91906105b1565b925061027883856105c4565b9150509250929050565b60408051808201825260008082526020820152815180830192839052631488c84560e01b90925260ff831660448301526001196064830152908073__$5ac3274b8cf1e01ea223bf093142af05b0$__631488c84560848301602060405180830381865af41580156102f7573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061031b9190610582565b8152600060209091015292915050565b60008160200151600014801561034057508151155b92915050565b600081602001518360200151148015610360575082518251145b9392505050565b60006103608383670de0b6b3a764000060008080600019858709858702925082811083820303915050806000036103b1578382816103a7576103a76105d7565b0492505050610360565b8084116103fc5760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b604482015260640160405180910390fd5b600084868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203026000889003889004909101858311909403939093029303949094049190911702949350505050565b60006040828403121561047657600080fd5b6040516040810181811067ffffffffffffffff821117156104a757634e487b7160e01b600052604160045260246000fd5b604052823581526020928301359281019290925250919050565b600080606083850312156104d457600080fd5b6104de8484610464565b946040939093013593505050565b6000602082840312156104fe57600080fd5b813560ff8116811461036057600080fd5b60006040828403121561052157600080fd5b6103608383610464565b6000806080838503121561053e57600080fd5b6105488484610464565b91506105578460408501610464565b90509250929050565b6000806040838503121561057357600080fd5b50508035926020909101359150565b60006020828403121561059457600080fd5b5051919050565b634e487b7160e01b600052601160045260246000fd5b808201808211156103405761034061059b565b818103818111156103405761034061059b565b634e487b7160e01b600052601260045260246000fdfea2646970667358221220c77a95dee494b2abcf575cdf95fd67f95e3ba1946af0cc3c46d0e454b9587ac064736f6c63430008140033",
   "linkReferences": {
     "contracts/types/UFixed.sol": {
-      "UFixedMathLib": [
+      "UFixedLib": [
+        {
+          "length": 20,
+          "start": 416
+        },
         {
           "length": 20,
-          "start": 446
+          "start": 574
         },
         {
           "length": 20,
-          "start": 604
+          "start": 760
         }
       ]
     }
   },
   "deployedLinkReferences": {
     "contracts/types/UFixed.sol": {
-      "UFixedMathLib": [
+      "UFixedLib": [
+        {
+          "length": 20,
+          "start": 358
+        },
         {
           "length": 20,
-          "start": 388
+          "start": 516
         },
         {
           "length": 20,
-          "start": 546
+          "start": 702
         }
       ]
     }

package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json

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

package/artifacts/contracts/types/Key32.sol/Key32Lib.json

@@ -57,14 +57,6 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "Key32",
-          "name": "key",
-          "type": "bytes32"
-        }
-      ],
-      "name": "toKey",
-      "outputs": [
         {
           "internalType": "ObjectType",
           "name": "objectType",
@@ -76,36 +68,58 @@
           "type": "bytes31"
         }
       ],
+      "name": "toKey32",
+      "outputs": [
+        {
+          "internalType": "Key32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
       "stateMutability": "pure",
       "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "ObjectType",
-          "name": "objectType",
-          "type": "uint8"
-        },
+          "internalType": "Key32",
+          "name": "key",
+          "type": "bytes32"
+        }
+      ],
+      "name": "toKeyId",
+      "outputs": [
         {
           "internalType": "KeyId",
           "name": "id",
           "type": "bytes31"
         }
       ],
-      "name": "toKey32",
-      "outputs": [
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
         {
           "internalType": "Key32",
-          "name": "",
+          "name": "key",
           "type": "bytes32"
         }
       ],
+      "name": "toObjectType",
+      "outputs": [
+        {
+          "internalType": "ObjectType",
+          "name": "objectType",
+          "type": "uint8"
+        }
+      ],
       "stateMutability": "pure",
       "type": "function"
     }
   ],
-  "bytecode": "0x61025b61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c80630f94cc501461007157806329e9b22614610093578063a4dc7d86146100ad578063d92bb60d146100dc578063da3fe412146100ea578063f48016ce146100f2575b600080fd5b6100806001600160f81b031981565b6040519081526020015b60405180910390f35b61009b60f881565b60405160ff909116815260200161008a565b6100c06100bb36600461017b565b610105565b6040805160ff909316835260ff1990911660208301520161008a565b6100806001600160f81b0381565b61009b61013b565b610080610100366004610194565b61014b565b60f881811c90600090839061011c906101006101f0565b60ff1660ff60f81b6001600160f81b031916198216901b915050915091565b61014860f86101006101f0565b81565b600060ff8316600883901c8261016f826001600160f81b031960f889901b16610212565b93505050505b92915050565b60006020828403121561018d57600080fd5b5035919050565b600080604083850312156101a757600080fd5b823560ff811681146101b857600080fd5b9150602083013560ff19811681146101cf57600080fd5b809150509250929050565b634e487b7160e01b600052601160045260246000fd5b61ffff82811682821603908082111561020b5761020b6101da565b5092915050565b80820180821115610175576101756101da56fea26469706673582212209f9359b88be2a0a160c8af25961ee9cdf5c01de76ffe18524c389bd9cbd8f6ec64736f6c63430008140033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c80630f94cc501461007157806329e9b22614610093578063a4dc7d86146100ad578063d92bb60d146100dc578063da3fe412146100ea578063f48016ce146100f2575b600080fd5b6100806001600160f81b031981565b6040519081526020015b60405180910390f35b61009b60f881565b60405160ff909116815260200161008a565b6100c06100bb36600461017b565b610105565b6040805160ff909316835260ff1990911660208301520161008a565b6100806001600160f81b0381565b61009b61013b565b610080610100366004610194565b61014b565b60f881811c90600090839061011c906101006101f0565b60ff1660ff60f81b6001600160f81b031916198216901b915050915091565b61014860f86101006101f0565b81565b600060ff8316600883901c8261016f826001600160f81b031960f889901b16610212565b93505050505b92915050565b60006020828403121561018d57600080fd5b5035919050565b600080604083850312156101a757600080fd5b823560ff811681146101b857600080fd5b9150602083013560ff19811681146101cf57600080fd5b809150509250929050565b634e487b7160e01b600052601160045260246000fd5b61ffff82811682821603908082111561020b5761020b6101da565b5092915050565b80820180821115610175576101756101da56fea26469706673582212209f9359b88be2a0a160c8af25961ee9cdf5c01de76ffe18524c389bd9cbd8f6ec64736f6c63430008140033",
+  "bytecode": "0x61027361003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c80639601d31e116100655780639601d31e146100ee578063d92bb60d14610102578063da3fe41214610110578063f48016ce1461011857600080fd5b80630f94cc501461008c57806329e9b226146100ae578063389e7d68146100c8575b600080fd5b61009b6001600160f81b031981565b6040519081526020015b60405180910390f35b6100b660f881565b60405160ff90911681526020016100a5565b6100db6100d6366004610193565b61012b565b60405160ff1990911681526020016100a5565b6100b66100fc366004610193565b60f81c90565b61009b6001600160f81b0381565b6100b6610153565b61009b6101263660046101ac565b610163565b60008161013b60f8610100610208565b6001600160f81b039190911660ff9091161b92915050565b61016060f8610100610208565b81565b600060ff8316600883901c82610187826001600160f81b031960f889901b1661022a565b93505050505b92915050565b6000602082840312156101a557600080fd5b5035919050565b600080604083850312156101bf57600080fd5b823560ff811681146101d057600080fd5b9150602083013560ff19811681146101e757600080fd5b809150509250929050565b634e487b7160e01b600052601160045260246000fd5b61ffff828116828216039080821115610223576102236101f2565b5092915050565b8082018082111561018d5761018d6101f256fea2646970667358221220fc2c078a79039b851ed1a97b716c4f273efc929a80af74af156e165fca4066db64736f6c63430008140033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c80639601d31e116100655780639601d31e146100ee578063d92bb60d14610102578063da3fe41214610110578063f48016ce1461011857600080fd5b80630f94cc501461008c57806329e9b226146100ae578063389e7d68146100c8575b600080fd5b61009b6001600160f81b031981565b6040519081526020015b60405180910390f35b6100b660f881565b60405160ff90911681526020016100a5565b6100db6100d6366004610193565b61012b565b60405160ff1990911681526020016100a5565b6100b66100fc366004610193565b60f81c90565b61009b6001600160f81b0381565b6100b6610153565b61009b6101263660046101ac565b610163565b60008161013b60f8610100610208565b6001600160f81b039190911660ff9091161b92915050565b61016060f8610100610208565b81565b600060ff8316600883901c82610187826001600160f81b031960f889901b1661022a565b93505050505b92915050565b6000602082840312156101a557600080fd5b5035919050565b600080604083850312156101bf57600080fd5b823560ff811681146101d057600080fd5b9150602083013560ff19811681146101e757600080fd5b809150509250929050565b634e487b7160e01b600052601160045260246000fd5b61ffff828116828216039080821115610223576102236101f2565b5092915050565b8082018082111561018d5761018d6101f256fea2646970667358221220fc2c078a79039b851ed1a97b716c4f273efc929a80af74af156e165fca4066db64736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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

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

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

@@ -128,8 +128,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x6102fa61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c806308dc895e1461007157806330b8415f1461009f5780633889a4c8146100cb57806340a8cd9e146100ec57806352694ee814610122578063c4cade9d1461013d575b600080fd5b61008261007f366004610220565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100bb6100ad366004610220565b6001600160601b0316151590565b6040519015158152602001610096565b6100de6100d936600461023b565b610161565b604051908152602001610096565b61010f6100fa366004610220565b60081b6cffffffffffffffffffffffff001690565b60405160ff199091168152602001610096565b6100bb610130366004610220565b6001600160601b03161590565b6100bb61014b366004610278565b60006001600160601b03808416908316146101fd565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101d9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101fd91906102ab565b9392505050565b80356001600160601b038116811461021b57600080fd5b919050565b60006020828403121561023257600080fd5b6101fd82610204565b6000806040838503121561024e57600080fd5b61025783610204565b9150602083013560ff8116811461026d57600080fd5b809150509250929050565b6000806040838503121561028b57600080fd5b61029483610204565b91506102a260208401610204565b90509250929050565b6000602082840312156102bd57600080fd5b505191905056fea2646970667358221220df26126a07b6b22c5aa899d018fa4432b5bd97173c5abb9e0c874c0310162a6864736f6c63430008140033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c806308dc895e1461007157806330b8415f1461009f5780633889a4c8146100cb57806340a8cd9e146100ec57806352694ee814610122578063c4cade9d1461013d575b600080fd5b61008261007f366004610220565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100bb6100ad366004610220565b6001600160601b0316151590565b6040519015158152602001610096565b6100de6100d936600461023b565b610161565b604051908152602001610096565b61010f6100fa366004610220565b60081b6cffffffffffffffffffffffff001690565b60405160ff199091168152602001610096565b6100bb610130366004610220565b6001600160601b03161590565b6100bb61014b366004610278565b60006001600160601b03808416908316146101fd565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101d9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101fd91906102ab565b9392505050565b80356001600160601b038116811461021b57600080fd5b919050565b60006020828403121561023257600080fd5b6101fd82610204565b6000806040838503121561024e57600080fd5b61025783610204565b9150602083013560ff8116811461026d57600080fd5b809150509250929050565b6000806040838503121561028b57600080fd5b61029483610204565b91506102a260208401610204565b90509250929050565b6000602082840312156102bd57600080fd5b505191905056fea2646970667358221220df26126a07b6b22c5aa899d018fa4432b5bd97173c5abb9e0c874c0310162a6864736f6c63430008140033",
+  "bytecode": "0x6102fa61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c806308dc895e1461007157806330b8415f1461009f5780633889a4c8146100cb57806340a8cd9e146100ec57806352694ee814610122578063c4cade9d1461013d575b600080fd5b61008261007f366004610220565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100bb6100ad366004610220565b6001600160601b0316151590565b6040519015158152602001610096565b6100de6100d936600461023b565b610161565b604051908152602001610096565b61010f6100fa366004610220565b60081b6cffffffffffffffffffffffff001690565b60405160ff199091168152602001610096565b6100bb610130366004610220565b6001600160601b03161590565b6100bb61014b366004610278565b60006001600160601b03808416908316146101fd565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101d9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101fd91906102ab565b9392505050565b80356001600160601b038116811461021b57600080fd5b919050565b60006020828403121561023257600080fd5b6101fd82610204565b6000806040838503121561024e57600080fd5b61025783610204565b9150602083013560ff8116811461026d57600080fd5b809150509250929050565b6000806040838503121561028b57600080fd5b61029483610204565b91506102a260208401610204565b90509250929050565b6000602082840312156102bd57600080fd5b505191905056fea2646970667358221220c1854ba353d599ea92c2bc434c766302432128fb99662446139943367f71224164736f6c63430008140033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c806308dc895e1461007157806330b8415f1461009f5780633889a4c8146100cb57806340a8cd9e146100ec57806352694ee814610122578063c4cade9d1461013d575b600080fd5b61008261007f366004610220565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100bb6100ad366004610220565b6001600160601b0316151590565b6040519015158152602001610096565b6100de6100d936600461023b565b610161565b604051908152602001610096565b61010f6100fa366004610220565b60081b6cffffffffffffffffffffffff001690565b60405160ff199091168152602001610096565b6100bb610130366004610220565b6001600160601b03161590565b6100bb61014b366004610278565b60006001600160601b03808416908316146101fd565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101d9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101fd91906102ab565b9392505050565b80356001600160601b038116811461021b57600080fd5b919050565b60006020828403121561023257600080fd5b6101fd82610204565b6000806040838503121561024e57600080fd5b61025783610204565b9150602083013560ff8116811461026d57600080fd5b809150509250929050565b6000806040838503121561028b57600080fd5b61029483610204565b91506102a260208401610204565b90509250929050565b6000602082840312156102bd57600080fd5b505191905056fea2646970667358221220c1854ba353d599ea92c2bc434c766302432128fb99662446139943367f71224164736f6c63430008140033",
   "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/ac8b1a0ba35c3a8a508882d70043ad3f.json"
+  "buildInfo": "../../../build-info/ba4420804dbe9aabd43dccaca2adf92c.json"
 }