@etherisc/gif-next 0.0.2-e9148e0-933 → 0.0.2-e94f4c7-084

package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/1171c99cc3729fb17e48e0451f9fdfda.json"
+  "buildInfo": "../../../build-info/2ea2e3eeb4bd2b2d7ce18fce7ac55a0f.json"
 }

package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/1171c99cc3729fb17e48e0451f9fdfda.json"
+  "buildInfo": "../../../build-info/2ea2e3eeb4bd2b2d7ce18fce7ac55a0f.json"
 }

package/artifacts/contracts/test/TestVersion.sol/TestVersion.json

@@ -161,8 +161,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610544806100206000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80636a3dc0ee1161005b5780636a3dc0ee146100ed57806389818c3c1461011057806389d5976814610135578063e038c6251461014857600080fd5b80630f40f5951461008257806312cf04de146100a357806364d4e5d8146100b6575b600080fd5b61008a61015b565b60405162ffffff90911681526020015b60405180910390f35b61008a6100b13660046103ce565b6101cf565b6100c96100c436600461040e565b61025c565b6040805160ff9485168152928416602084015292169181019190915260600161009a565b6101006100fb36600461042b565b6102e8565b604051901515815260200161009a565b61012361011e366004610464565b6102fd565b60405160ff909116815260200161009a565b61010061014336600461042b565b61037d565b61012361015636600461040e565b61038f565b600073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af41580156101a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ca919061047d565b905090565b604051632efe011360e01b815260048101849052602481018390526044810182905260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610230573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610254919061047d565b949350505050565b6040516324d3888d60e11b815262ffffff821660048201526000908190819073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__906349a7111a90602401606060405180830381865af41580156102b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102db91906104b0565b9250925092509193909250565b600062ffffff808316908416115b9392505050565b604051632392b61b60e21b815260ff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90638e4ad86c906024015b602060405180830381865af4158015610353573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037791906104f3565b92915050565b600062ffffff808416908316146102f6565b60405163c9e66e2960e01b815262ffffff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401610336565b6000806000606084860312156103e357600080fd5b505081359360208301359350604090920135919050565b62ffffff8116811461040b57600080fd5b50565b60006020828403121561042057600080fd5b81356102f6816103fa565b6000806040838503121561043e57600080fd5b8235610449816103fa565b91506020830135610459816103fa565b809150509250929050565b60006020828403121561047657600080fd5b5035919050565b60006020828403121561048f57600080fd5b81516102f6816103fa565b805160ff811681146104ab57600080fd5b919050565b6000806000606084860312156104c557600080fd5b6104ce8461049a565b92506104dc6020850161049a565b91506104ea6040850161049a565b90509250925092565b60006020828403121561050557600080fd5b6102f68261049a56fea26469706673582212206e529886c2f8439684af8bc60c7d7762a41afcce6ceef512fc94376b5fe8009e64736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80636a3dc0ee1161005b5780636a3dc0ee146100ed57806389818c3c1461011057806389d5976814610135578063e038c6251461014857600080fd5b80630f40f5951461008257806312cf04de146100a357806364d4e5d8146100b6575b600080fd5b61008a61015b565b60405162ffffff90911681526020015b60405180910390f35b61008a6100b13660046103ce565b6101cf565b6100c96100c436600461040e565b61025c565b6040805160ff9485168152928416602084015292169181019190915260600161009a565b6101006100fb36600461042b565b6102e8565b604051901515815260200161009a565b61012361011e366004610464565b6102fd565b60405160ff909116815260200161009a565b61010061014336600461042b565b61037d565b61012361015636600461040e565b61038f565b600073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af41580156101a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ca919061047d565b905090565b604051632efe011360e01b815260048101849052602481018390526044810182905260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610230573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610254919061047d565b949350505050565b6040516324d3888d60e11b815262ffffff821660048201526000908190819073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__906349a7111a90602401606060405180830381865af41580156102b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102db91906104b0565b9250925092509193909250565b600062ffffff808316908416115b9392505050565b604051632392b61b60e21b815260ff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90638e4ad86c906024015b602060405180830381865af4158015610353573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037791906104f3565b92915050565b600062ffffff808416908316146102f6565b60405163c9e66e2960e01b815262ffffff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401610336565b6000806000606084860312156103e357600080fd5b505081359360208301359350604090920135919050565b62ffffff8116811461040b57600080fd5b50565b60006020828403121561042057600080fd5b81356102f6816103fa565b6000806040838503121561043e57600080fd5b8235610449816103fa565b91506020830135610459816103fa565b809150509250929050565b60006020828403121561047657600080fd5b5035919050565b60006020828403121561048f57600080fd5b81516102f6816103fa565b805160ff811681146104ab57600080fd5b919050565b6000806000606084860312156104c557600080fd5b6104ce8461049a565b92506104dc6020850161049a565b91506104ea6040850161049a565b90509250925092565b60006020828403121561050557600080fd5b6102f68261049a56fea26469706673582212206e529886c2f8439684af8bc60c7d7762a41afcce6ceef512fc94376b5fe8009e64736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b50610544806100206000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80636a3dc0ee1161005b5780636a3dc0ee146100ed57806389818c3c1461011057806389d5976814610135578063e038c6251461014857600080fd5b80630f40f5951461008257806312cf04de146100a357806364d4e5d8146100b6575b600080fd5b61008a61015b565b60405162ffffff90911681526020015b60405180910390f35b61008a6100b13660046103ce565b6101cf565b6100c96100c436600461040e565b61025c565b6040805160ff9485168152928416602084015292169181019190915260600161009a565b6101006100fb36600461042b565b6102e8565b604051901515815260200161009a565b61012361011e366004610464565b6102fd565b60405160ff909116815260200161009a565b61010061014336600461042b565b61037d565b61012361015636600461040e565b61038f565b600073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af41580156101a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ca919061047d565b905090565b604051632efe011360e01b815260048101849052602481018390526044810182905260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610230573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610254919061047d565b949350505050565b6040516324d3888d60e11b815262ffffff821660048201526000908190819073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__906349a7111a90602401606060405180830381865af41580156102b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102db91906104b0565b9250925092509193909250565b600062ffffff808316908416115b9392505050565b604051632392b61b60e21b815260ff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90638e4ad86c906024015b602060405180830381865af4158015610353573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037791906104f3565b92915050565b600062ffffff808416908316146102f6565b60405163c9e66e2960e01b815262ffffff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401610336565b6000806000606084860312156103e357600080fd5b505081359360208301359350604090920135919050565b62ffffff8116811461040b57600080fd5b50565b60006020828403121561042057600080fd5b81356102f6816103fa565b6000806040838503121561043e57600080fd5b8235610449816103fa565b91506020830135610459816103fa565b809150509250929050565b60006020828403121561047657600080fd5b5035919050565b60006020828403121561048f57600080fd5b81516102f6816103fa565b805160ff811681146104ab57600080fd5b919050565b6000806000606084860312156104c557600080fd5b6104ce8461049a565b92506104dc6020850161049a565b91506104ea6040850161049a565b90509250925092565b60006020828403121561050557600080fd5b6102f68261049a56fea26469706673582212208286c3481b0874449419d947ca5683c89309e4a9c9e994977c831577dc4dd3a164736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80636a3dc0ee1161005b5780636a3dc0ee146100ed57806389818c3c1461011057806389d5976814610135578063e038c6251461014857600080fd5b80630f40f5951461008257806312cf04de146100a357806364d4e5d8146100b6575b600080fd5b61008a61015b565b60405162ffffff90911681526020015b60405180910390f35b61008a6100b13660046103ce565b6101cf565b6100c96100c436600461040e565b61025c565b6040805160ff9485168152928416602084015292169181019190915260600161009a565b6101006100fb36600461042b565b6102e8565b604051901515815260200161009a565b61012361011e366004610464565b6102fd565b60405160ff909116815260200161009a565b61010061014336600461042b565b61037d565b61012361015636600461040e565b61038f565b600073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af41580156101a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ca919061047d565b905090565b604051632efe011360e01b815260048101849052602481018390526044810182905260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610230573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610254919061047d565b949350505050565b6040516324d3888d60e11b815262ffffff821660048201526000908190819073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__906349a7111a90602401606060405180830381865af41580156102b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102db91906104b0565b9250925092509193909250565b600062ffffff808316908416115b9392505050565b604051632392b61b60e21b815260ff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90638e4ad86c906024015b602060405180830381865af4158015610353573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037791906104f3565b92915050565b600062ffffff808416908316146102f6565b60405163c9e66e2960e01b815262ffffff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401610336565b6000806000606084860312156103e357600080fd5b505081359360208301359350604090920135919050565b62ffffff8116811461040b57600080fd5b50565b60006020828403121561042057600080fd5b81356102f6816103fa565b6000806040838503121561043e57600080fd5b8235610449816103fa565b91506020830135610459816103fa565b809150509250929050565b60006020828403121561047657600080fd5b5035919050565b60006020828403121561048f57600080fd5b81516102f6816103fa565b805160ff811681146104ab57600080fd5b919050565b6000806000606084860312156104c557600080fd5b6104ce8461049a565b92506104dc6020850161049a565b91506104ea6040850161049a565b90509250925092565b60006020828403121561050557600080fd5b6102f68261049a56fea26469706673582212208286c3481b0874449419d947ca5683c89309e4a9c9e994977c831577dc4dd3a164736f6c63430008140033",
   "linkReferences": {
     "contracts/types/Version.sol": {
       "VersionLib": [

package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/1171c99cc3729fb17e48e0451f9fdfda.json"
+  "buildInfo": "../../../build-info/2ea2e3eeb4bd2b2d7ce18fce7ac55a0f.json"
 }

package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json

@@ -26,44 +26,6 @@
       "name": "Initialized",
       "type": "event"
     },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "Version",
-          "name": "version",
-          "type": "uint24"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
-        }
-      ],
-      "name": "LogVersionableInitialized",
-      "type": "event"
-    },
-    {
-      "inputs": [],
-      "name": "getInitializedVersion",
-      "outputs": [
-        {
-          "internalType": "uint64",
-          "name": "",
-          "type": "uint64"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "getVersion",
@@ -79,89 +41,6 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "idx",
-          "type": "uint256"
-        }
-      ],
-      "name": "getVersion",
-      "outputs": [
-        {
-          "internalType": "Version",
-          "name": "",
-          "type": "uint24"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getVersionCount",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "Version",
-          "name": "_version",
-          "type": "uint24"
-        }
-      ],
-      "name": "getVersionInfo",
-      "outputs": [
-        {
-          "components": [
-            {
-              "internalType": "Version",
-              "name": "version",
-              "type": "uint24"
-            },
-            {
-              "internalType": "address",
-              "name": "implementation",
-              "type": "address"
-            },
-            {
-              "internalType": "address",
-              "name": "activatedBy",
-              "type": "address"
-            },
-            {
-              "internalType": "Timestamp",
-              "name": "activatedAt",
-              "type": "uint40"
-            },
-            {
-              "internalType": "Blocknumber",
-              "name": "activatedIn",
-              "type": "uint32"
-            }
-          ],
-          "internalType": "struct IVersionable.VersionInfo",
-          "name": "",
-          "type": "tuple"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
         {
           "internalType": "address",
           "name": "activatedBy",
@@ -173,112 +52,51 @@
           "type": "bytes"
         }
       ],
-      "name": "initialize",
+      "name": "initializeVersionable",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [
-        {
-          "internalType": "Version",
-          "name": "_version",
-          "type": "uint24"
-        }
-      ],
-      "name": "isInitialized",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
-        },
         {
           "internalType": "bytes",
           "name": "data",
           "type": "bytes"
         }
       ],
-      "name": "upgrade",
+      "name": "upgradeVersionable",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b5061001961001e565b6100d0565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000900460ff161561006e5760405163f92ee8a960e01b815260040160405180910390fd5b80546001600160401b03908116146100cd5780546001600160401b0319166001600160401b0390811782556040519081527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50565b610bd8806100df6000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c8063a745e3df1161005b578063a745e3df1461021a578063b3c650151461022f578063b88da75914610250578063cf7a1d771461026357600080fd5b80630d8e6e2c1461008d5780634d459c90146100ae5780634f421333146101c7578063946dfcfe146101ea575b600080fd5b610095610276565b60405162ffffff90911681526020015b60405180910390f35b61016a6100bc366004610984565b6040805160a081018252600080825260208201819052918101829052606081018290526080810191909152600080516020610b8383398151915262ffffff92831660009081526020918252604090819020815160a0810183528154958616815263010000009095046001600160a01b03908116938601939093526001015491821690840152600160a01b810464ffffffffff166060840152600160c81b900463ffffffff1660808301525090565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a0016100a5565b6101da6101d5366004610984565b610300565b60405190151581526020016100a5565b7f4f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed901546040519081526020016100a5565b61022d6102283660046109da565b6103b3565b005b610237610510565b60405167ffffffffffffffff90911681526020016100a5565b61009561025e366004610aac565b610532565b61022d6102713660046109da565b610583565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156102d7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102fb9190610ac5565b905090565b600080600080516020610b8383398151915262ffffff84166000908152602091909152604090819020600101549051631bbffab160e21b8152600160c81b90910463ffffffff16600482015273__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af4158015610388573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103ac9190610ae2565b1192915050565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c6103d5610276565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af4158015610415573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104399190610afb565b600080516020610b638339815191528054600160401b900460ff168061046d5750805467ffffffffffffffff808416911610155b1561048b5760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b1781556104b7858561068e565b6104c083610933565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2906020015b60405180910390a15050505050565b60006102fb600080516020610b638339815191525467ffffffffffffffff1690565b6000600080516020610b83833981519152600101828154811061055757610557610b25565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b600080516020610b638339815191528054600160401b810460ff16159067ffffffffffffffff166000811580156105b75750825b905060008267ffffffffffffffff1660011480156105d45750303b155b9050811580156105e2575080155b156106005760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561062a57845460ff60401b1916600160401b1785555b610634888861068e565b61063e8787610933565b831561068457845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050505050565b610696610937565b600080516020610b8383398151915260006106c7600080516020610b638339815191525467ffffffffffffffff1690565b905060006106d3610276565b90508167ffffffffffffffff166001036107015760028301805462ffffff191662ffffff8316179055610753565b600283015462ffffff908116908216116107535760405162461bcd60e51b815260206004820152600f60248201526e24a72b20a624a2102b22a929a4a7a760891b604482015260640160405180910390fd5b6001808401805491820181556000908152602090819020600a808404909101805462ffffff808716600394909606939093026101000a858102930219169190911790556040805160a0810182529283526001600160a01b038089168484015287168382015280516356db0c1960e11b81529051606084019273__$d53880c81dc91c20799140d711e5ab8718$__9263adb6183292600480830193928290030181865af4158015610807573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061082b9190610b3b565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602087815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517fad0a0fc10465a8dd9da3ad5f43e1a7fff4b4578551c76f0ae8deb844f0d0bf68906105019083908890889062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b6100885b600080516020610b6383398151915254600160401b900460ff1661096e57604051631afcd79f60e31b815260040160405180910390fd5b565b62ffffff8116811461098157600080fd5b50565b60006020828403121561099657600080fd5b81356109a181610970565b9392505050565b80356001600160a01b03811681146109bf57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b6000806000606084860312156109ef57600080fd5b6109f8846109a8565b9250610a06602085016109a8565b9150604084013567ffffffffffffffff80821115610a2357600080fd5b818601915086601f830112610a3757600080fd5b813581811115610a4957610a496109c4565b604051601f8201601f19908116603f01168101908382118183101715610a7157610a716109c4565b81604052828152896020848701011115610a8a57600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b600060208284031215610abe57600080fd5b5035919050565b600060208284031215610ad757600080fd5b81516109a181610970565b600060208284031215610af457600080fd5b5051919050565b600060208284031215610b0d57600080fd5b815167ffffffffffffffff811681146109a157600080fd5b634e487b7160e01b600052603260045260246000fd5b600060208284031215610b4d57600080fd5b815164ffffffffff811681146109a157600080fdfef0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a004f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed900a264697066735822122036c2436a636388b08a2d568ba9d2982ad1e4c316093f1ecd22f3561fa8794c0264736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100885760003560e01c8063a745e3df1161005b578063a745e3df1461021a578063b3c650151461022f578063b88da75914610250578063cf7a1d771461026357600080fd5b80630d8e6e2c1461008d5780634d459c90146100ae5780634f421333146101c7578063946dfcfe146101ea575b600080fd5b610095610276565b60405162ffffff90911681526020015b60405180910390f35b61016a6100bc366004610984565b6040805160a081018252600080825260208201819052918101829052606081018290526080810191909152600080516020610b8383398151915262ffffff92831660009081526020918252604090819020815160a0810183528154958616815263010000009095046001600160a01b03908116938601939093526001015491821690840152600160a01b810464ffffffffff166060840152600160c81b900463ffffffff1660808301525090565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a0016100a5565b6101da6101d5366004610984565b610300565b60405190151581526020016100a5565b7f4f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed901546040519081526020016100a5565b61022d6102283660046109da565b6103b3565b005b610237610510565b60405167ffffffffffffffff90911681526020016100a5565b61009561025e366004610aac565b610532565b61022d6102713660046109da565b610583565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156102d7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102fb9190610ac5565b905090565b600080600080516020610b8383398151915262ffffff84166000908152602091909152604090819020600101549051631bbffab160e21b8152600160c81b90910463ffffffff16600482015273__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af4158015610388573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103ac9190610ae2565b1192915050565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c6103d5610276565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af4158015610415573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104399190610afb565b600080516020610b638339815191528054600160401b900460ff168061046d5750805467ffffffffffffffff808416911610155b1561048b5760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b1781556104b7858561068e565b6104c083610933565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2906020015b60405180910390a15050505050565b60006102fb600080516020610b638339815191525467ffffffffffffffff1690565b6000600080516020610b83833981519152600101828154811061055757610557610b25565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b600080516020610b638339815191528054600160401b810460ff16159067ffffffffffffffff166000811580156105b75750825b905060008267ffffffffffffffff1660011480156105d45750303b155b9050811580156105e2575080155b156106005760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561062a57845460ff60401b1916600160401b1785555b610634888861068e565b61063e8787610933565b831561068457845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050505050565b610696610937565b600080516020610b8383398151915260006106c7600080516020610b638339815191525467ffffffffffffffff1690565b905060006106d3610276565b90508167ffffffffffffffff166001036107015760028301805462ffffff191662ffffff8316179055610753565b600283015462ffffff908116908216116107535760405162461bcd60e51b815260206004820152600f60248201526e24a72b20a624a2102b22a929a4a7a760891b604482015260640160405180910390fd5b6001808401805491820181556000908152602090819020600a808404909101805462ffffff808716600394909606939093026101000a858102930219169190911790556040805160a0810182529283526001600160a01b038089168484015287168382015280516356db0c1960e11b81529051606084019273__$d53880c81dc91c20799140d711e5ab8718$__9263adb6183292600480830193928290030181865af4158015610807573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061082b9190610b3b565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602087815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517fad0a0fc10465a8dd9da3ad5f43e1a7fff4b4578551c76f0ae8deb844f0d0bf68906105019083908890889062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b6100885b600080516020610b6383398151915254600160401b900460ff1661096e57604051631afcd79f60e31b815260040160405180910390fd5b565b62ffffff8116811461098157600080fd5b50565b60006020828403121561099657600080fd5b81356109a181610970565b9392505050565b80356001600160a01b03811681146109bf57600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b6000806000606084860312156109ef57600080fd5b6109f8846109a8565b9250610a06602085016109a8565b9150604084013567ffffffffffffffff80821115610a2357600080fd5b818601915086601f830112610a3757600080fd5b813581811115610a4957610a496109c4565b604051601f8201601f19908116603f01168101908382118183101715610a7157610a716109c4565b81604052828152896020848701011115610a8a57600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b600060208284031215610abe57600080fd5b5035919050565b600060208284031215610ad757600080fd5b81516109a181610970565b600060208284031215610af457600080fd5b5051919050565b600060208284031215610b0d57600080fd5b815167ffffffffffffffff811681146109a157600080fd5b634e487b7160e01b600052603260045260246000fd5b600060208284031215610b4d57600080fd5b815164ffffffffff811681146109a157600080fdfef0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a004f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed900a264697066735822122036c2436a636388b08a2d568ba9d2982ad1e4c316093f1ecd22f3561fa8794c0264736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b5061001961001e565b6100d0565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000900460ff161561006e5760405163f92ee8a960e01b815260040160405180910390fd5b80546001600160401b03908116146100cd5780546001600160401b0319166001600160401b0390811782556040519081527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50565b6105a3806100df6000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80630d8e6e2c14610046578063329d6e741461006657806349bb9e4b1461007b575b600080fd5b61004e61008e565b60405162ffffff909116815260200160405180910390f35b61007961007436600461047e565b610118565b005b6100796100893660046104bb565b61027a565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156100ef573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101139190610517565b905090565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c61013a61008e565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af415801561017a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019e9190610543565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b900460ff16806101e45750805467ffffffffffffffff808416911610155b156102025760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b17815561022d8361038c565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a1505050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff166000811580156102c05750825b905060008267ffffffffffffffff1660011480156102dd5750303b155b9050811580156102eb575080155b156103095760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561033357845460ff60401b1916600160401b1785555b61033d878761038c565b831561038357845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005461004190600160401b900460ff166103d957604051631afcd79f60e31b815260040160405180910390fd5b565b634e487b7160e01b600052604160045260246000fd5b600082601f83011261040257600080fd5b813567ffffffffffffffff8082111561041d5761041d6103db565b604051601f8301601f19908116603f01168101908282118183101715610445576104456103db565b8160405283815286602085880101111561045e57600080fd5b836020870160208301376000602085830101528094505050505092915050565b60006020828403121561049057600080fd5b813567ffffffffffffffff8111156104a757600080fd5b6104b3848285016103f1565b949350505050565b600080604083850312156104ce57600080fd5b82356001600160a01b03811681146104e557600080fd5b9150602083013567ffffffffffffffff81111561050157600080fd5b61050d858286016103f1565b9150509250929050565b60006020828403121561052957600080fd5b815162ffffff8116811461053c57600080fd5b9392505050565b60006020828403121561055557600080fd5b815167ffffffffffffffff8116811461053c57600080fdfea26469706673582212202d9c7665b4615e0c8c31254efc15a85f41535f0273041f41de0ae96c8bd1d58364736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80630d8e6e2c14610046578063329d6e741461006657806349bb9e4b1461007b575b600080fd5b61004e61008e565b60405162ffffff909116815260200160405180910390f35b61007961007436600461047e565b610118565b005b6100796100893660046104bb565b61027a565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156100ef573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101139190610517565b905090565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c61013a61008e565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af415801561017a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019e9190610543565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b900460ff16806101e45750805467ffffffffffffffff808416911610155b156102025760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b17815561022d8361038c565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a1505050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff166000811580156102c05750825b905060008267ffffffffffffffff1660011480156102dd5750303b155b9050811580156102eb575080155b156103095760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561033357845460ff60401b1916600160401b1785555b61033d878761038c565b831561038357845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005461004190600160401b900460ff166103d957604051631afcd79f60e31b815260040160405180910390fd5b565b634e487b7160e01b600052604160045260246000fd5b600082601f83011261040257600080fd5b813567ffffffffffffffff8082111561041d5761041d6103db565b604051601f8301601f19908116603f01168101908282118183101715610445576104456103db565b8160405283815286602085880101111561045e57600080fd5b836020870160208301376000602085830101528094505050505092915050565b60006020828403121561049057600080fd5b813567ffffffffffffffff8111156104a757600080fd5b6104b3848285016103f1565b949350505050565b600080604083850312156104ce57600080fd5b82356001600160a01b03811681146104e557600080fd5b9150602083013567ffffffffffffffff81111561050157600080fd5b61050d858286016103f1565b9150509250929050565b60006020828403121561052957600080fd5b815162ffffff8116811461053c57600080fd5b9392505050565b60006020828403121561055557600080fd5b815167ffffffffffffffff8116811461053c57600080fdfea26469706673582212202d9c7665b4615e0c8c31254efc15a85f41535f0273041f41de0ae96c8bd1d58364736f6c63430008140033",
   "linkReferences": {
-    "contracts/types/Blocknumber.sol": {
-      "BlocknumberLib": [
-        {
-          "length": 20,
-          "start": 1069
-        }
-      ]
-    },
-    "contracts/types/Timestamp.sol": {
-      "TimestampLib": [
-        {
-          "length": 20,
-          "start": 2220
-        }
-      ]
-    },
     "contracts/types/Version.sol": {
       "VersionLib": [
         {
           "length": 20,
-          "start": 892
+          "start": 404
         },
         {
           "length": 20,
-          "start": 1172
+          "start": 505
         }
       ]
     }
   },
   "deployedLinkReferences": {
-    "contracts/types/Blocknumber.sol": {
-      "BlocknumberLib": [
-        {
-          "length": 20,
-          "start": 846
-        }
-      ]
-    },
-    "contracts/types/Timestamp.sol": {
-      "TimestampLib": [
-        {
-          "length": 20,
-          "start": 1997
-        }
-      ]
-    },
     "contracts/types/Version.sol": {
       "VersionLib": [
         {
           "length": 20,
-          "start": 669
+          "start": 181
         },
         {
           "length": 20,
-          "start": 949
+          "start": 282
         }
       ]
     }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/1171c99cc3729fb17e48e0451f9fdfda.json"
+  "buildInfo": "../../../build-info/2ea2e3eeb4bd2b2d7ce18fce7ac55a0f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/1171c99cc3729fb17e48e0451f9fdfda.json"
+  "buildInfo": "../../../build-info/2ea2e3eeb4bd2b2d7ce18fce7ac55a0f.json"
 }

package/artifacts/contracts/types/Amount.sol/AmountLib.dbg.json

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

package/artifacts/contracts/types/Amount.sol/AmountLib.json

@@ -0,0 +1,209 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "AmountLib",
+  "sourceName": "contracts/types/Amount.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        }
+      ],
+      "name": "ErrorAmountLibValueTooBig",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "Amount",
+          "name": "a1",
+          "type": "uint96"
+        },
+        {
+          "internalType": "Amount",
+          "name": "a2",
+          "type": "uint96"
+        }
+      ],
+      "name": "add",
+      "outputs": [
+        {
+          "internalType": "Amount",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "Amount",
+          "name": "amount1",
+          "type": "uint96"
+        },
+        {
+          "internalType": "Amount",
+          "name": "amount2",
+          "type": "uint96"
+        }
+      ],
+      "name": "eq",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "Amount",
+          "name": "amount",
+          "type": "uint96"
+        }
+      ],
+      "name": "eqz",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "Amount",
+          "name": "amount",
+          "type": "uint96"
+        }
+      ],
+      "name": "gtz",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "max",
+      "outputs": [
+        {
+          "internalType": "Amount",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        }
+      ],
+      "name": "toAmount",
+      "outputs": [
+        {
+          "internalType": "Amount",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "Amount",
+          "name": "amount",
+          "type": "uint96"
+        }
+      ],
+      "name": "toInt",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "Amount",
+          "name": "amount",
+          "type": "uint96"
+        }
+      ],
+      "name": "toUFixed",
+      "outputs": [
+        {
+          "internalType": "UFixed",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "zero",
+      "outputs": [
+        {
+          "internalType": "Amount",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x61036e61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061009d5760003560e01c806352694ee81161007057806352694ee81461013957806355205f0f146101545780636ac5db1914610167578063bc1b392d14610174578063c4cade9d1461017b57600080fd5b806308dc895e146100a2578063274acb35146100cf57806330b8415f146100fa5780634c41dd9614610126575b600080fd5b6100bc6100b0366004610283565b6001600160601b031690565b6040519081526020015b60405180910390f35b6100e26100dd36600461029e565b61019a565b6040516001600160601b0390911681526020016100c6565b610116610108366004610283565b6001600160601b0316151590565b60405190151581526020016100c6565b6100e26101343660046102d1565b6101ad565b610116610147366004610283565b6001600160601b03161590565b6100bc610162366004610283565b6101e2565b6001600160601b036100e2565b60006100e2565b61011661018936600461029e565b6001600160601b0390811691161490565b60006101a682846102ea565b9392505050565b60006001600160601b038211156101de57604051635a1bd76760e01b81526004810183905260240160405180910390fd5b5090565b6040516322f5db0f60e11b81526001600160601b038216600482015260009073__$5ac3274b8cf1e01ea223bf093142af05b0$__906345ebb61e90602401602060405180830381865af415801561023d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610261919061031f565b92915050565b80356001600160601b038116811461027e57600080fd5b919050565b60006020828403121561029557600080fd5b6101a682610267565b600080604083850312156102b157600080fd5b6102ba83610267565b91506102c860208401610267565b90509250929050565b6000602082840312156102e357600080fd5b5035919050565b6001600160601b0381811683821601908082111561031857634e487b7160e01b600052601160045260246000fd5b5092915050565b60006020828403121561033157600080fd5b505191905056fea2646970667358221220b8d1af0bf137a8d2349358e54229e9eed27e0099d70914e7582ea8e4b3b6364664736f6c63430008140033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061009d5760003560e01c806352694ee81161007057806352694ee81461013957806355205f0f146101545780636ac5db1914610167578063bc1b392d14610174578063c4cade9d1461017b57600080fd5b806308dc895e146100a2578063274acb35146100cf57806330b8415f146100fa5780634c41dd9614610126575b600080fd5b6100bc6100b0366004610283565b6001600160601b031690565b6040519081526020015b60405180910390f35b6100e26100dd36600461029e565b61019a565b6040516001600160601b0390911681526020016100c6565b610116610108366004610283565b6001600160601b0316151590565b60405190151581526020016100c6565b6100e26101343660046102d1565b6101ad565b610116610147366004610283565b6001600160601b03161590565b6100bc610162366004610283565b6101e2565b6001600160601b036100e2565b60006100e2565b61011661018936600461029e565b6001600160601b0390811691161490565b60006101a682846102ea565b9392505050565b60006001600160601b038211156101de57604051635a1bd76760e01b81526004810183905260240160405180910390fd5b5090565b6040516322f5db0f60e11b81526001600160601b038216600482015260009073__$5ac3274b8cf1e01ea223bf093142af05b0$__906345ebb61e90602401602060405180830381865af415801561023d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610261919061031f565b92915050565b80356001600160601b038116811461027e57600080fd5b919050565b60006020828403121561029557600080fd5b6101a682610267565b600080604083850312156102b157600080fd5b6102ba83610267565b91506102c860208401610267565b90509250929050565b6000602082840312156102e357600080fd5b5035919050565b6001600160601b0381811683821601908082111561031857634e487b7160e01b600052601160045260246000fd5b5092915050565b60006020828403121561033157600080fd5b505191905056fea2646970667358221220b8d1af0bf137a8d2349358e54229e9eed27e0099d70914e7582ea8e4b3b6364664736f6c63430008140033",
+  "linkReferences": {
+    "contracts/types/UFixed.sol": {
+      "UFixedLib": [
+        {
+          "length": 20,
+          "start": 573
+        }
+      ]
+    }
+  },
+  "deployedLinkReferences": {
+    "contracts/types/UFixed.sol": {
+      "UFixedLib": [
+        {
+          "length": 20,
+          "start": 515
+        }
+      ]
+    }
+  }
+}

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/1171c99cc3729fb17e48e0451f9fdfda.json"
+  "buildInfo": "../../../build-info/2ea2e3eeb4bd2b2d7ce18fce7ac55a0f.json"
 }

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

@@ -167,8 +167,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61024d61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c80636303db59116100655780636303db59146100da5780636effeac4146100ed5780637b4f5d3b14610112578063946428041461012557600080fd5b8063012340281461008c578063559cbd25146100b457806356b0a7d4146100c7575b600080fd5b61009f61009a3660046101c9565b610138565b60405190151581526020015b60405180910390f35b61009f6100c23660046101c9565b61014f565b61009f6100d53660046101c9565b610162565b61009f6100e83660046101c9565b610175565b6101046100fb3660046101fc565b63ffffffff1690565b6040519081526020016100ab565b61009f6101203660046101c9565b610188565b61009f6101333660046101c9565b61019c565b600063ffffffff80831690841610155b9392505050565b600063ffffffff80841690831614610148565b600063ffffffff80831690841611610148565b600063ffffffff80831690841610610148565b600063ffffffff8084169083161415610148565b600063ffffffff8083169084161115610148565b803563ffffffff811681146101c457600080fd5b919050565b600080604083850312156101dc57600080fd5b6101e5836101b0565b91506101f3602084016101b0565b90509250929050565b60006020828403121561020e57600080fd5b610148826101b056fea26469706673582212209c3b15caeec0e7d5334a5985f9d00378c7d311267beffff2b7358b7f5af08c7764736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c80636303db59116100655780636303db59146100da5780636effeac4146100ed5780637b4f5d3b14610112578063946428041461012557600080fd5b8063012340281461008c578063559cbd25146100b457806356b0a7d4146100c7575b600080fd5b61009f61009a3660046101c9565b610138565b60405190151581526020015b60405180910390f35b61009f6100c23660046101c9565b61014f565b61009f6100d53660046101c9565b610162565b61009f6100e83660046101c9565b610175565b6101046100fb3660046101fc565b63ffffffff1690565b6040519081526020016100ab565b61009f6101203660046101c9565b610188565b61009f6101333660046101c9565b61019c565b600063ffffffff80831690841610155b9392505050565b600063ffffffff80841690831614610148565b600063ffffffff80831690841611610148565b600063ffffffff80831690841610610148565b600063ffffffff8084169083161415610148565b600063ffffffff8083169084161115610148565b803563ffffffff811681146101c457600080fd5b919050565b600080604083850312156101dc57600080fd5b6101e5836101b0565b91506101f3602084016101b0565b90509250929050565b60006020828403121561020e57600080fd5b610148826101b056fea26469706673582212209c3b15caeec0e7d5334a5985f9d00378c7d311267beffff2b7358b7f5af08c7764736f6c63430008140033",
+  "bytecode": "0x61024d61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c80636303db59116100655780636303db59146100da5780636effeac4146100ed5780637b4f5d3b14610112578063946428041461012557600080fd5b8063012340281461008c578063559cbd25146100b457806356b0a7d4146100c7575b600080fd5b61009f61009a3660046101c9565b610138565b60405190151581526020015b60405180910390f35b61009f6100c23660046101c9565b61014f565b61009f6100d53660046101c9565b610162565b61009f6100e83660046101c9565b610175565b6101046100fb3660046101fc565b63ffffffff1690565b6040519081526020016100ab565b61009f6101203660046101c9565b610188565b61009f6101333660046101c9565b61019c565b600063ffffffff80831690841610155b9392505050565b600063ffffffff80841690831614610148565b600063ffffffff80831690841611610148565b600063ffffffff80831690841610610148565b600063ffffffff8084169083161415610148565b600063ffffffff8083169084161115610148565b803563ffffffff811681146101c457600080fd5b919050565b600080604083850312156101dc57600080fd5b6101e5836101b0565b91506101f3602084016101b0565b90509250929050565b60006020828403121561020e57600080fd5b610148826101b056fea2646970667358221220735eeb30184d071ec07b1d1dbe8435aaf017e3cfa6ac2bbee0cf0a1c6ebad86764736f6c63430008140033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c80636303db59116100655780636303db59146100da5780636effeac4146100ed5780637b4f5d3b14610112578063946428041461012557600080fd5b8063012340281461008c578063559cbd25146100b457806356b0a7d4146100c7575b600080fd5b61009f61009a3660046101c9565b610138565b60405190151581526020015b60405180910390f35b61009f6100c23660046101c9565b61014f565b61009f6100d53660046101c9565b610162565b61009f6100e83660046101c9565b610175565b6101046100fb3660046101fc565b63ffffffff1690565b6040519081526020016100ab565b61009f6101203660046101c9565b610188565b61009f6101333660046101c9565b61019c565b600063ffffffff80831690841610155b9392505050565b600063ffffffff80841690831614610148565b600063ffffffff80831690841611610148565b600063ffffffff80831690841610610148565b600063ffffffff8084169083161415610148565b600063ffffffff8083169084161115610148565b803563ffffffff811681146101c457600080fd5b919050565b600080604083850312156101dc57600080fd5b6101e5836101b0565b91506101f3602084016101b0565b90509250929050565b60006020828403121561020e57600080fd5b610148826101b056fea2646970667358221220735eeb30184d071ec07b1d1dbe8435aaf017e3cfa6ac2bbee0cf0a1c6ebad86764736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/1171c99cc3729fb17e48e0451f9fdfda.json"
+  "buildInfo": "../../../build-info/2ea2e3eeb4bd2b2d7ce18fce7ac55a0f.json"
 }

package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json

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