@etherisc/gif-next 0.0.2-efef0ea-320 → 0.0.2-f034782-101

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

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

package/artifacts/contracts/test/TestToken.sol/TestUsdc.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": "0x60806040523480156200001157600080fd5b506040518060400160405280600b81526020016a1554d110c80b4815195cdd60aa1b815250604051806040016040528060048152602001635553444360e01b815250816003908162000064919062000227565b50600462000073828262000227565b505050620000ae6200008a620000b460201b60201c565b620000986006600a62000408565b620000a890633b9aca0062000420565b620000b8565b62000450565b3390565b6001600160a01b038216620001135760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015260640160405180910390fd5b80600260008282546200012791906200043a565b90915550506001600160a01b038216600081815260208181526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b505050565b634e487b7160e01b600052604160045260246000fd5b600181811c90821680620001ae57607f821691505b602082108103620001cf57634e487b7160e01b600052602260045260246000fd5b50919050565b601f8211156200017e57600081815260208120601f850160051c81016020861015620001fe5750805b601f850160051c820191505b818110156200021f578281556001016200020a565b505050505050565b81516001600160401b0381111562000243576200024362000183565b6200025b8162000254845462000199565b84620001d5565b602080601f8311600181146200029357600084156200027a5750858301515b600019600386901b1c1916600185901b1785556200021f565b600085815260208120601f198616915b82811015620002c457888601518255948401946001909101908401620002a3565b5085821015620002e35787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b634e487b7160e01b600052601160045260246000fd5b600181815b808511156200034a5781600019048211156200032e576200032e620002f3565b808516156200033c57918102915b93841c93908002906200030e565b509250929050565b600082620003635750600162000402565b81620003725750600062000402565b81600181146200038b57600281146200039657620003b6565b600191505062000402565b60ff841115620003aa57620003aa620002f3565b50506001821b62000402565b5060208310610133831016604e8410600b8410161715620003db575081810a62000402565b620003e7838362000309565b8060001904821115620003fe57620003fe620002f3565b0290505b92915050565b60006200041960ff84168362000352565b9392505050565b8082028115828204841417620004025762000402620002f3565b80820180821115620004025762000402620002f3565b610a3480620004606000396000f3fe608060405234801561001057600080fd5b50600436106100f55760003560e01c80633950935111610097578063a457c2d711610066578063a457c2d7146101f7578063a9059cbb1461020a578063dd62ed3e1461021d578063f76f8d781461023057600080fd5b8063395093511461018957806370a082311461019c57806395d89b41146101c5578063a3f4df7e146101cd57600080fd5b806323b872dd116100d357806323b872dd1461014d5780632e0f2625146101605780632ff2e9dc1461017a578063313ce5671461018257600080fd5b806306fdde03146100fa578063095ea7b31461011857806318160ddd1461013b575b600080fd5b610102610253565b60405161010f919061076c565b60405180910390f35b61012b6101263660046107d6565b6102e5565b604051901515815260200161010f565b6002545b60405190815260200161010f565b61012b61015b366004610800565b6102ff565b610168600681565b60405160ff909116815260200161010f565b61013f610323565b6006610168565b61012b6101973660046107d6565b610340565b61013f6101aa36600461083c565b6001600160a01b031660009081526020819052604090205490565b610102610362565b6101026040518060400160405280600b81526020016a1554d110c80b4815195cdd60aa1b81525081565b61012b6102053660046107d6565b610371565b61012b6102183660046107d6565b6103f1565b61013f61022b36600461085e565b6103ff565b610102604051806040016040528060048152602001635553444360e01b81525081565b60606003805461026290610891565b80601f016020809104026020016040519081016040528092919081815260200182805461028e90610891565b80156102db5780601f106102b0576101008083540402835291602001916102db565b820191906000526020600020905b8154815290600101906020018083116102be57829003601f168201915b5050505050905090565b6000336102f381858561042a565b60019150505b92915050565b60003361030d85828561054e565b6103188585856105c8565b506001949350505050565b61032f6006600a6109c5565b61033d90633b9aca006109d4565b81565b6000336102f381858561035383836103ff565b61035d91906109eb565b61042a565b60606004805461026290610891565b6000338161037f82866103ff565b9050838110156103e45760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b60648201526084015b60405180910390fd5b610318828686840361042a565b6000336102f38185856105c8565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6001600160a01b03831661048c5760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b60648201526084016103db565b6001600160a01b0382166104ed5760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b60648201526084016103db565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b600061055a84846103ff565b905060001981146105c257818110156105b55760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e636500000060448201526064016103db565b6105c2848484840361042a565b50505050565b6001600160a01b03831661062c5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b60648201526084016103db565b6001600160a01b03821661068e5760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b60648201526084016103db565b6001600160a01b038316600090815260208190526040902054818110156107065760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b60648201526084016103db565b6001600160a01b03848116600081815260208181526040808320878703905593871680835291849020805487019055925185815290927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a36105c2565b600060208083528351808285015260005b818110156107995785810183015185820160400152820161077d565b506000604082860101526040601f19601f8301168501019250505092915050565b80356001600160a01b03811681146107d157600080fd5b919050565b600080604083850312156107e957600080fd5b6107f2836107ba565b946020939093013593505050565b60008060006060848603121561081557600080fd5b61081e846107ba565b925061082c602085016107ba565b9150604084013590509250925092565b60006020828403121561084e57600080fd5b610857826107ba565b9392505050565b6000806040838503121561087157600080fd5b61087a836107ba565b9150610888602084016107ba565b90509250929050565b600181811c908216806108a557607f821691505b6020821081036108c557634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600181815b8085111561091c578160001904821115610902576109026108cb565b8085161561090f57918102915b93841c93908002906108e6565b509250929050565b600082610933575060016102f9565b81610940575060006102f9565b816001811461095657600281146109605761097c565b60019150506102f9565b60ff841115610971576109716108cb565b50506001821b6102f9565b5060208310610133831016604e8410600b841016171561099f575081810a6102f9565b6109a983836108e1565b80600019048211156109bd576109bd6108cb565b029392505050565b600061085760ff841683610924565b80820281158282048414176102f9576102f96108cb565b808201808211156102f9576102f96108cb56fea2646970667358221220f5bae286a22b700b52fd354d2d62092b6c97ab36290cdada62a88b4dc72512b864736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100f55760003560e01c80633950935111610097578063a457c2d711610066578063a457c2d7146101f7578063a9059cbb1461020a578063dd62ed3e1461021d578063f76f8d781461023057600080fd5b8063395093511461018957806370a082311461019c57806395d89b41146101c5578063a3f4df7e146101cd57600080fd5b806323b872dd116100d357806323b872dd1461014d5780632e0f2625146101605780632ff2e9dc1461017a578063313ce5671461018257600080fd5b806306fdde03146100fa578063095ea7b31461011857806318160ddd1461013b575b600080fd5b610102610253565b60405161010f919061076c565b60405180910390f35b61012b6101263660046107d6565b6102e5565b604051901515815260200161010f565b6002545b60405190815260200161010f565b61012b61015b366004610800565b6102ff565b610168600681565b60405160ff909116815260200161010f565b61013f610323565b6006610168565b61012b6101973660046107d6565b610340565b61013f6101aa36600461083c565b6001600160a01b031660009081526020819052604090205490565b610102610362565b6101026040518060400160405280600b81526020016a1554d110c80b4815195cdd60aa1b81525081565b61012b6102053660046107d6565b610371565b61012b6102183660046107d6565b6103f1565b61013f61022b36600461085e565b6103ff565b610102604051806040016040528060048152602001635553444360e01b81525081565b60606003805461026290610891565b80601f016020809104026020016040519081016040528092919081815260200182805461028e90610891565b80156102db5780601f106102b0576101008083540402835291602001916102db565b820191906000526020600020905b8154815290600101906020018083116102be57829003601f168201915b5050505050905090565b6000336102f381858561042a565b60019150505b92915050565b60003361030d85828561054e565b6103188585856105c8565b506001949350505050565b61032f6006600a6109c5565b61033d90633b9aca006109d4565b81565b6000336102f381858561035383836103ff565b61035d91906109eb565b61042a565b60606004805461026290610891565b6000338161037f82866103ff565b9050838110156103e45760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b60648201526084015b60405180910390fd5b610318828686840361042a565b6000336102f38185856105c8565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6001600160a01b03831661048c5760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b60648201526084016103db565b6001600160a01b0382166104ed5760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b60648201526084016103db565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b600061055a84846103ff565b905060001981146105c257818110156105b55760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e636500000060448201526064016103db565b6105c2848484840361042a565b50505050565b6001600160a01b03831661062c5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b60648201526084016103db565b6001600160a01b03821661068e5760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b60648201526084016103db565b6001600160a01b038316600090815260208190526040902054818110156107065760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b60648201526084016103db565b6001600160a01b03848116600081815260208181526040808320878703905593871680835291849020805487019055925185815290927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a36105c2565b600060208083528351808285015260005b818110156107995785810183015185820160400152820161077d565b506000604082860101526040601f19601f8301168501019250505092915050565b80356001600160a01b03811681146107d157600080fd5b919050565b600080604083850312156107e957600080fd5b6107f2836107ba565b946020939093013593505050565b60008060006060848603121561081557600080fd5b61081e846107ba565b925061082c602085016107ba565b9150604084013590509250925092565b60006020828403121561084e57600080fd5b610857826107ba565b9392505050565b6000806040838503121561087157600080fd5b61087a836107ba565b9150610888602084016107ba565b90509250929050565b600181811c908216806108a557607f821691505b6020821081036108c557634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600181815b8085111561091c578160001904821115610902576109026108cb565b8085161561090f57918102915b93841c93908002906108e6565b509250929050565b600082610933575060016102f9565b81610940575060006102f9565b816001811461095657600281146109605761097c565b60019150506102f9565b60ff841115610971576109716108cb565b50506001821b6102f9565b5060208310610133831016604e8410600b841016171561099f575081810a6102f9565b6109a983836108e1565b80600019048211156109bd576109bd6108cb565b029392505050565b600061085760ff841683610924565b80820281158282048414176102f9576102f96108cb565b808201808211156102f9576102f96108cb56fea2646970667358221220f5bae286a22b700b52fd354d2d62092b6c97ab36290cdada62a88b4dc72512b864736f6c63430008140033",
+  "bytecode": "0x60806040523480156200001157600080fd5b506040518060400160405280600b81526020016a1554d110c80b4815195cdd60aa1b815250604051806040016040528060048152602001635553444360e01b8152508160039081620000649190620002d2565b506004620000738282620002d2565b505050620000ae6200008a620000b460201b60201c565b620000986006600a620004b3565b620000a890633b9aca00620004cb565b620000b8565b620004fb565b3390565b6001600160a01b038216620000e85760405163ec442f0560e01b8152600060048201526024015b60405180910390fd5b620000f660008383620000fa565b5050565b6001600160a01b038316620001295780600260008282546200011d9190620004e5565b909155506200019d9050565b6001600160a01b038316600090815260208190526040902054818110156200017e5760405163391434e360e21b81526001600160a01b03851660048201526024810182905260448101839052606401620000df565b6001600160a01b03841660009081526020819052604090209082900390555b6001600160a01b038216620001bb57600280548290039055620001da565b6001600160a01b03821660009081526020819052604090208054820190555b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040516200022091815260200190565b60405180910390a3505050565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200025857607f821691505b6020821081036200027957634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620002cd57600081815260208120601f850160051c81016020861015620002a85750805b601f850160051c820191505b81811015620002c957828155600101620002b4565b5050505b505050565b81516001600160401b03811115620002ee57620002ee6200022d565b6200030681620002ff845462000243565b846200027f565b602080601f8311600181146200033e5760008415620003255750858301515b600019600386901b1c1916600185901b178555620002c9565b600085815260208120601f198616915b828110156200036f578886015182559484019460019091019084016200034e565b50858210156200038e5787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b634e487b7160e01b600052601160045260246000fd5b600181815b80851115620003f5578160001904821115620003d957620003d96200039e565b80851615620003e757918102915b93841c9390800290620003b9565b509250929050565b6000826200040e57506001620004ad565b816200041d57506000620004ad565b8160018114620004365760028114620004415762000461565b6001915050620004ad565b60ff8411156200045557620004556200039e565b50506001821b620004ad565b5060208310610133831016604e8410600b841016171562000486575081810a620004ad565b620004928383620003b4565b8060001904821115620004a957620004a96200039e565b0290505b92915050565b6000620004c460ff841683620003fd565b9392505050565b8082028115828204841417620004ad57620004ad6200039e565b80820180821115620004ad57620004ad6200039e565b6108f2806200050b6000396000f3fe608060405234801561001057600080fd5b50600436106100cf5760003560e01c8063313ce5671161008c578063a3f4df7e11610066578063a3f4df7e14610194578063a9059cbb146101be578063dd62ed3e146101d1578063f76f8d781461020a57600080fd5b8063313ce5671461015c57806370a082311461016357806395d89b411461018c57600080fd5b806306fdde03146100d4578063095ea7b3146100f257806318160ddd1461011557806323b872dd146101275780632e0f26251461013a5780632ff2e9dc14610154575b600080fd5b6100dc61022d565b6040516100e9919061062a565b60405180910390f35b610105610100366004610694565b6102bf565b60405190151581526020016100e9565b6002545b6040519081526020016100e9565b6101056101353660046106be565b6102d9565b610142600681565b60405160ff90911681526020016100e9565b6101196102fd565b6006610142565b6101196101713660046106fa565b6001600160a01b031660009081526020819052604090205490565b6100dc61031a565b6100dc6040518060400160405280600b81526020016a1554d110c80b4815195cdd60aa1b81525081565b6101056101cc366004610694565b610329565b6101196101df36600461071c565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6100dc604051806040016040528060048152602001635553444360e01b81525081565b60606003805461023c9061074f565b80601f01602080910402602001604051908101604052809291908181526020018280546102689061074f565b80156102b55780601f1061028a576101008083540402835291602001916102b5565b820191906000526020600020905b81548152906001019060200180831161029857829003601f168201915b5050505050905090565b6000336102cd818585610337565b60019150505b92915050565b6000336102e7858285610349565b6102f28585856103cc565b506001949350505050565b6103096006600a610883565b61031790633b9aca00610892565b81565b60606004805461023c9061074f565b6000336102cd8185856103cc565b610344838383600161042b565b505050565b6001600160a01b0383811660009081526001602090815260408083209386168352929052205460001981146103c657818110156103b757604051637dc7a0d960e11b81526001600160a01b038416600482015260248101829052604481018390526064015b60405180910390fd5b6103c68484848403600061042b565b50505050565b6001600160a01b0383166103f657604051634b637e8f60e11b8152600060048201526024016103ae565b6001600160a01b0382166104205760405163ec442f0560e01b8152600060048201526024016103ae565b610344838383610500565b6001600160a01b0384166104555760405163e602df0560e01b8152600060048201526024016103ae565b6001600160a01b03831661047f57604051634a1406b160e11b8152600060048201526024016103ae565b6001600160a01b03808516600090815260016020908152604080832093871683529290522082905580156103c657826001600160a01b0316846001600160a01b03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040516104f291815260200190565b60405180910390a350505050565b6001600160a01b03831661052b57806002600082825461052091906108a9565b9091555061059d9050565b6001600160a01b0383166000908152602081905260409020548181101561057e5760405163391434e360e21b81526001600160a01b038516600482015260248101829052604481018390526064016103ae565b6001600160a01b03841660009081526020819052604090209082900390555b6001600160a01b0382166105b9576002805482900390556105d8565b6001600160a01b03821660009081526020819052604090208054820190555b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8360405161061d91815260200190565b60405180910390a3505050565b600060208083528351808285015260005b818110156106575785810183015185820160400152820161063b565b506000604082860101526040601f19601f8301168501019250505092915050565b80356001600160a01b038116811461068f57600080fd5b919050565b600080604083850312156106a757600080fd5b6106b083610678565b946020939093013593505050565b6000806000606084860312156106d357600080fd5b6106dc84610678565b92506106ea60208501610678565b9150604084013590509250925092565b60006020828403121561070c57600080fd5b61071582610678565b9392505050565b6000806040838503121561072f57600080fd5b61073883610678565b915061074660208401610678565b90509250929050565b600181811c9082168061076357607f821691505b60208210810361078357634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600181815b808511156107da5781600019048211156107c0576107c0610789565b808516156107cd57918102915b93841c93908002906107a4565b509250929050565b6000826107f1575060016102d3565b816107fe575060006102d3565b8160018114610814576002811461081e5761083a565b60019150506102d3565b60ff84111561082f5761082f610789565b50506001821b6102d3565b5060208310610133831016604e8410600b841016171561085d575081810a6102d3565b610867838361079f565b806000190482111561087b5761087b610789565b029392505050565b600061071560ff8416836107e2565b80820281158282048414176102d3576102d3610789565b808201808211156102d3576102d361078956fea2646970667358221220ce285ac8359b39ea9974e26ea7d0f956b6b879df7ebf8ae43077c020f2fd566864736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100cf5760003560e01c8063313ce5671161008c578063a3f4df7e11610066578063a3f4df7e14610194578063a9059cbb146101be578063dd62ed3e146101d1578063f76f8d781461020a57600080fd5b8063313ce5671461015c57806370a082311461016357806395d89b411461018c57600080fd5b806306fdde03146100d4578063095ea7b3146100f257806318160ddd1461011557806323b872dd146101275780632e0f26251461013a5780632ff2e9dc14610154575b600080fd5b6100dc61022d565b6040516100e9919061062a565b60405180910390f35b610105610100366004610694565b6102bf565b60405190151581526020016100e9565b6002545b6040519081526020016100e9565b6101056101353660046106be565b6102d9565b610142600681565b60405160ff90911681526020016100e9565b6101196102fd565b6006610142565b6101196101713660046106fa565b6001600160a01b031660009081526020819052604090205490565b6100dc61031a565b6100dc6040518060400160405280600b81526020016a1554d110c80b4815195cdd60aa1b81525081565b6101056101cc366004610694565b610329565b6101196101df36600461071c565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6100dc604051806040016040528060048152602001635553444360e01b81525081565b60606003805461023c9061074f565b80601f01602080910402602001604051908101604052809291908181526020018280546102689061074f565b80156102b55780601f1061028a576101008083540402835291602001916102b5565b820191906000526020600020905b81548152906001019060200180831161029857829003601f168201915b5050505050905090565b6000336102cd818585610337565b60019150505b92915050565b6000336102e7858285610349565b6102f28585856103cc565b506001949350505050565b6103096006600a610883565b61031790633b9aca00610892565b81565b60606004805461023c9061074f565b6000336102cd8185856103cc565b610344838383600161042b565b505050565b6001600160a01b0383811660009081526001602090815260408083209386168352929052205460001981146103c657818110156103b757604051637dc7a0d960e11b81526001600160a01b038416600482015260248101829052604481018390526064015b60405180910390fd5b6103c68484848403600061042b565b50505050565b6001600160a01b0383166103f657604051634b637e8f60e11b8152600060048201526024016103ae565b6001600160a01b0382166104205760405163ec442f0560e01b8152600060048201526024016103ae565b610344838383610500565b6001600160a01b0384166104555760405163e602df0560e01b8152600060048201526024016103ae565b6001600160a01b03831661047f57604051634a1406b160e11b8152600060048201526024016103ae565b6001600160a01b03808516600090815260016020908152604080832093871683529290522082905580156103c657826001600160a01b0316846001600160a01b03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040516104f291815260200190565b60405180910390a350505050565b6001600160a01b03831661052b57806002600082825461052091906108a9565b9091555061059d9050565b6001600160a01b0383166000908152602081905260409020548181101561057e5760405163391434e360e21b81526001600160a01b038516600482015260248101829052604481018390526064016103ae565b6001600160a01b03841660009081526020819052604090209082900390555b6001600160a01b0382166105b9576002805482900390556105d8565b6001600160a01b03821660009081526020819052604090208054820190555b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8360405161061d91815260200190565b60405180910390a3505050565b600060208083528351808285015260005b818110156106575785810183015185820160400152820161063b565b506000604082860101526040601f19601f8301168501019250505092915050565b80356001600160a01b038116811461068f57600080fd5b919050565b600080604083850312156106a757600080fd5b6106b083610678565b946020939093013593505050565b6000806000606084860312156106d357600080fd5b6106dc84610678565b92506106ea60208501610678565b9150604084013590509250925092565b60006020828403121561070c57600080fd5b61071582610678565b9392505050565b6000806040838503121561072f57600080fd5b61073883610678565b915061074660208401610678565b90509250929050565b600181811c9082168061076357607f821691505b60208210810361078357634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600181815b808511156107da5781600019048211156107c0576107c0610789565b808516156107cd57918102915b93841c93908002906107a4565b509250929050565b6000826107f1575060016102d3565b816107fe575060006102d3565b8160018114610814576002811461081e5761083a565b60019150506102d3565b60ff84111561082f5761082f610789565b50506001821b6102d3565b5060208310610133831016604e8410600b841016171561085d575081810a6102d3565b610867838361079f565b806000190482111561087b5761087b610789565b029392505050565b600061071560ff8416836107e2565b80820281158282048414176102d3576102d3610789565b808201808211156102d3576102d361078956fea2646970667358221220ce285ac8359b39ea9974e26ea7d0f956b6b879df7ebf8ae43077c020f2fd566864736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5ac43d71ce34a4d504e0bec066491786.json"
+  "buildInfo": "../../../build-info/95371df5f28c49f1193e96df62dcfc87.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$__9063c9e66e2990602401610336565b6000806000606084860312156103e357600080fd5b505081359360208301359350604090920135919050565b62ffffff8116811461040b57600080fd5b50565b60006020828403121561042057600080fd5b81356102f6816103fa565b6000806040838503121561043e57600080fd5b8235610449816103fa565b91506020830135610459816103fa565b809150509250929050565b60006020828403121561047657600080fd5b5035919050565b60006020828403121561048f57600080fd5b81516102f6816103fa565b805160ff811681146104ab57600080fd5b919050565b6000806000606084860312156104c557600080fd5b6104ce8461049a565b92506104dc6020850161049a565b91506104ea6040850161049a565b90509250925092565b60006020828403121561050557600080fd5b6102f68261049a56fea2646970667358221220f19043d0a02e1b8e1b6b65109d61c8a46b38352b73b29196b595115cec87eae664736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80636a3dc0ee1161005b5780636a3dc0ee146100ed57806389818c3c1461011057806389d5976814610135578063e038c6251461014857600080fd5b80630f40f5951461008257806312cf04de146100a357806364d4e5d8146100b6575b600080fd5b61008a61015b565b60405162ffffff90911681526020015b60405180910390f35b61008a6100b13660046103ce565b6101cf565b6100c96100c436600461040e565b61025c565b6040805160ff9485168152928416602084015292169181019190915260600161009a565b6101006100fb36600461042b565b6102e8565b604051901515815260200161009a565b61012361011e366004610464565b6102fd565b60405160ff909116815260200161009a565b61010061014336600461042b565b61037d565b61012361015636600461040e565b61038f565b600073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af41580156101a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ca919061047d565b905090565b604051632efe011360e01b815260048101849052602481018390526044810182905260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610230573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610254919061047d565b949350505050565b6040516324d3888d60e11b815262ffffff821660048201526000908190819073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__906349a7111a90602401606060405180830381865af41580156102b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102db91906104b0565b9250925092509193909250565b600062ffffff808316908416115b9392505050565b604051632392b61b60e21b815260ff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90638e4ad86c906024015b602060405180830381865af4158015610353573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037791906104f3565b92915050565b600062ffffff808416908316146102f6565b60405163c9e66e2960e01b815262ffffff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401610336565b6000806000606084860312156103e357600080fd5b505081359360208301359350604090920135919050565b62ffffff8116811461040b57600080fd5b50565b60006020828403121561042057600080fd5b81356102f6816103fa565b6000806040838503121561043e57600080fd5b8235610449816103fa565b91506020830135610459816103fa565b809150509250929050565b60006020828403121561047657600080fd5b5035919050565b60006020828403121561048f57600080fd5b81516102f6816103fa565b805160ff811681146104ab57600080fd5b919050565b6000806000606084860312156104c557600080fd5b6104ce8461049a565b92506104dc6020850161049a565b91506104ea6040850161049a565b90509250925092565b60006020828403121561050557600080fd5b6102f68261049a56fea2646970667358221220f19043d0a02e1b8e1b6b65109d61c8a46b38352b73b29196b595115cec87eae664736f6c63430008140033",
+  "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/5ac43d71ce34a4d504e0bec066491786.json"
+  "buildInfo": "../../../build-info/95371df5f28c49f1193e96df62dcfc87.json"
 }

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

@@ -26,67 +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": "LogVersionableActivated",
-      "type": "event"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
-        },
-        {
-          "internalType": "bytes",
-          "name": "activatinData",
-          "type": "bytes"
-        }
-      ],
-      "name": "activate",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getInitializedVersion",
-      "outputs": [
-        {
-          "internalType": "uint64",
-          "name": "",
-          "type": "uint64"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "getVersion",
@@ -100,91 +39,8 @@
       "stateMutability": "pure",
       "type": "function"
     },
-    {
-      "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",
@@ -192,100 +48,55 @@
         },
         {
           "internalType": "bytes",
-          "name": "initializationData",
+          "name": "data",
           "type": "bytes"
         }
       ],
-      "name": "initialize",
+      "name": "initializeVersionable",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [
-        {
-          "internalType": "Version",
-          "name": "_version",
-          "type": "uint24"
-        }
-      ],
-      "name": "isActivated",
-      "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": "upgradeData",
+          "name": "data",
           "type": "bytes"
         }
       ],
-      "name": "upgrade",
+      "name": "upgradeVersionable",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
     }
   ],
-  "bytecode": "0x60806040523480156200001157600080fd5b506200001f60003362000025565b620004c3565b60006200003162000300565b90506200003e816200038d565b15620000a15760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b60648201526084015b60405180910390fd5b6001541562000161576001805460009190620000bf90829062000443565b81548110620000d257620000d262000465565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff16905062000105828262000431565b6200015f5760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b606482015260840162000098565b505b600180548082018255600091909152600a8082047fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf601805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b03808616602084015284169082015260608101620001ea4290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602081815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d441990620002f39083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af415801562000362573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200038891906200047b565b905090565b62ffffff8116600090815260208190526040808220600101549051631bbffab160e21b8152600160c81b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af415801562000404573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200042a9190620004a9565b1192915050565b62ffffff808216908316115b92915050565b818103818111156200043d57634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b6000602082840312156200048e57600080fd5b815162ffffff81168114620004a257600080fd5b9392505050565b600060208284031215620004bc57600080fd5b5051919050565b6108cf80620004d36000396000f3fe608060405234801561001057600080fd5b50600436106100935760003560e01c8063946dfcfe11610066578063946dfcfe146101fe578063a745e3df146101e9578063b3c650151461020f578063b88da75914610230578063cf7a1d771461024357600080fd5b80630abd8434146100985780630d8e6e2c146100c05780634d459c90146100dc5780635b5b48f5146101e9575b600080fd5b6100ab6100a63660046106eb565b610256565b60405190151581526020015b60405180910390f35b6100c86102f7565b60405162ffffff90911681526020016100b7565b61018c6100ea3660046106eb565b6040805160a0810182526000808252602082018190529181018290526060810182905260808101919091525062ffffff90811660009081526020818152604091829020825160a0810184528154948516815263010000009094046001600160a01b03908116928501929092526001015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a0016100b7565b6101fc6101f7366004610741565b505050565b005b6001546040519081526020016100b7565b610217610381565b60405167ffffffffffffffff90911681526020016100b7565b6100c861023e366004610813565b6103b5565b6101fc610251366004610741565b6103f6565b62ffffff8116600090815260208190526040808220600101549051631bbffab160e21b8152600160c81b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156102cc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102f0919061082c565b1192915050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610358573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037c9190610845565b905090565b600061037c7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005467ffffffffffffffff1690565b6000600182815481106103ca576103ca610862565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6101f7838360006104056102f7565b905061041081610256565b156104725760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b60648201526084015b60405180910390fd5b6001541561052857600180546000919061048d908290610878565b8154811061049d5761049d610862565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff1690506104ce82826106c5565b6105265760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b6064820152608401610469565b505b600180548082018255600091909152600a8082047fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf601805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038086166020840152841690820152606081016105b04290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602081815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d4419906106b89083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b62ffffff808216908316115b92915050565b62ffffff811681146106e857600080fd5b50565b6000602082840312156106fd57600080fd5b8135610708816106d7565b9392505050565b80356001600160a01b038116811461072657600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561075657600080fd5b61075f8461070f565b925061076d6020850161070f565b9150604084013567ffffffffffffffff8082111561078a57600080fd5b818601915086601f83011261079e57600080fd5b8135818111156107b0576107b061072b565b604051601f8201601f19908116603f011681019083821181831017156107d8576107d861072b565b816040528281528960208487010111156107f157600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b60006020828403121561082557600080fd5b5035919050565b60006020828403121561083e57600080fd5b5051919050565b60006020828403121561085757600080fd5b8151610708816106d7565b634e487b7160e01b600052603260045260246000fd5b818103818111156106d157634e487b7160e01b600052601160045260246000fdfea2646970667358221220b2b63268094880b37c7335e8a2610d88fdb1513b2efcdcbcfb3e0255e8f4b68164736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100935760003560e01c8063946dfcfe11610066578063946dfcfe146101fe578063a745e3df146101e9578063b3c650151461020f578063b88da75914610230578063cf7a1d771461024357600080fd5b80630abd8434146100985780630d8e6e2c146100c05780634d459c90146100dc5780635b5b48f5146101e9575b600080fd5b6100ab6100a63660046106eb565b610256565b60405190151581526020015b60405180910390f35b6100c86102f7565b60405162ffffff90911681526020016100b7565b61018c6100ea3660046106eb565b6040805160a0810182526000808252602082018190529181018290526060810182905260808101919091525062ffffff90811660009081526020818152604091829020825160a0810184528154948516815263010000009094046001600160a01b03908116928501929092526001015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a0016100b7565b6101fc6101f7366004610741565b505050565b005b6001546040519081526020016100b7565b610217610381565b60405167ffffffffffffffff90911681526020016100b7565b6100c861023e366004610813565b6103b5565b6101fc610251366004610741565b6103f6565b62ffffff8116600090815260208190526040808220600101549051631bbffab160e21b8152600160c81b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156102cc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102f0919061082c565b1192915050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610358573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037c9190610845565b905090565b600061037c7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005467ffffffffffffffff1690565b6000600182815481106103ca576103ca610862565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6101f7838360006104056102f7565b905061041081610256565b156104725760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b60648201526084015b60405180910390fd5b6001541561052857600180546000919061048d908290610878565b8154811061049d5761049d610862565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff1690506104ce82826106c5565b6105265760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b6064820152608401610469565b505b600180548082018255600091909152600a8082047fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf601805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038086166020840152841690820152606081016105b04290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602081815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d4419906106b89083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b62ffffff808216908316115b92915050565b62ffffff811681146106e857600080fd5b50565b6000602082840312156106fd57600080fd5b8135610708816106d7565b9392505050565b80356001600160a01b038116811461072657600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561075657600080fd5b61075f8461070f565b925061076d6020850161070f565b9150604084013567ffffffffffffffff8082111561078a57600080fd5b818601915086601f83011261079e57600080fd5b8135818111156107b0576107b061072b565b604051601f8201601f19908116603f011681019083821181831017156107d8576107d861072b565b816040528281528960208487010111156107f157600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b60006020828403121561082557600080fd5b5035919050565b60006020828403121561083e57600080fd5b5051919050565b60006020828403121561085757600080fd5b8151610708816106d7565b634e487b7160e01b600052603260045260246000fd5b818103818111156106d157634e487b7160e01b600052601160045260246000fdfea2646970667358221220b2b63268094880b37c7335e8a2610d88fdb1513b2efcdcbcfb3e0255e8f4b68164736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b5061001961001e565b6100d0565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000900460ff161561006e5760405163f92ee8a960e01b815260040160405180910390fd5b80546001600160401b03908116146100cd5780546001600160401b0319166001600160401b0390811782556040519081527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50565b6105a3806100df6000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80630d8e6e2c14610046578063329d6e741461006657806349bb9e4b1461007b575b600080fd5b61004e61008e565b60405162ffffff909116815260200160405180910390f35b61007961007436600461047e565b610118565b005b6100796100893660046104bb565b61027a565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156100ef573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101139190610517565b905090565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c61013a61008e565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af415801561017a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019e9190610543565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b900460ff16806101e45750805467ffffffffffffffff808416911610155b156102025760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b17815561022d8361038c565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a1505050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff166000811580156102c05750825b905060008267ffffffffffffffff1660011480156102dd5750303b155b9050811580156102eb575080155b156103095760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561033357845460ff60401b1916600160401b1785555b61033d878761038c565b831561038357845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005461004190600160401b900460ff166103d957604051631afcd79f60e31b815260040160405180910390fd5b565b634e487b7160e01b600052604160045260246000fd5b600082601f83011261040257600080fd5b813567ffffffffffffffff8082111561041d5761041d6103db565b604051601f8301601f19908116603f01168101908282118183101715610445576104456103db565b8160405283815286602085880101111561045e57600080fd5b836020870160208301376000602085830101528094505050505092915050565b60006020828403121561049057600080fd5b813567ffffffffffffffff8111156104a757600080fd5b6104b3848285016103f1565b949350505050565b600080604083850312156104ce57600080fd5b82356001600160a01b03811681146104e557600080fd5b9150602083013567ffffffffffffffff81111561050157600080fd5b61050d858286016103f1565b9150509250929050565b60006020828403121561052957600080fd5b815162ffffff8116811461053c57600080fd5b9392505050565b60006020828403121561055557600080fd5b815167ffffffffffffffff8116811461053c57600080fdfea26469706673582212202d9c7665b4615e0c8c31254efc15a85f41535f0273041f41de0ae96c8bd1d58364736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80630d8e6e2c14610046578063329d6e741461006657806349bb9e4b1461007b575b600080fd5b61004e61008e565b60405162ffffff909116815260200160405180910390f35b61007961007436600461047e565b610118565b005b6100796100893660046104bb565b61027a565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156100ef573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101139190610517565b905090565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c61013a61008e565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af415801561017a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019e9190610543565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b900460ff16806101e45750805467ffffffffffffffff808416911610155b156102025760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b17815561022d8361038c565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a1505050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff166000811580156102c05750825b905060008267ffffffffffffffff1660011480156102dd5750303b155b9050811580156102eb575080155b156103095760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561033357845460ff60401b1916600160401b1785555b61033d878761038c565b831561038357845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005461004190600160401b900460ff166103d957604051631afcd79f60e31b815260040160405180910390fd5b565b634e487b7160e01b600052604160045260246000fd5b600082601f83011261040257600080fd5b813567ffffffffffffffff8082111561041d5761041d6103db565b604051601f8301601f19908116603f01168101908282118183101715610445576104456103db565b8160405283815286602085880101111561045e57600080fd5b836020870160208301376000602085830101528094505050505092915050565b60006020828403121561049057600080fd5b813567ffffffffffffffff8111156104a757600080fd5b6104b3848285016103f1565b949350505050565b600080604083850312156104ce57600080fd5b82356001600160a01b03811681146104e557600080fd5b9150602083013567ffffffffffffffff81111561050157600080fd5b61050d858286016103f1565b9150509250929050565b60006020828403121561052957600080fd5b815162ffffff8116811461053c57600080fd5b9392505050565b60006020828403121561055557600080fd5b815167ffffffffffffffff8116811461053c57600080fdfea26469706673582212202d9c7665b4615e0c8c31254efc15a85f41535f0273041f41de0ae96c8bd1d58364736f6c63430008140033",
   "linkReferences": {
-    "contracts/types/Blocknumber.sol": {
-      "BlocknumberLib": [
-        {
-          "length": 20,
-          "start": 969
-        },
-        {
-          "length": 20,
-          "start": 1893
-        }
-      ]
-    },
     "contracts/types/Version.sol": {
       "VersionLib": [
         {
           "length": 20,
-          "start": 807
+          "start": 404
         },
         {
           "length": 20,
-          "start": 2033
+          "start": 505
         }
       ]
     }
   },
   "deployedLinkReferences": {
-    "contracts/types/Blocknumber.sol": {
-      "BlocknumberLib": [
-        {
-          "length": 20,
-          "start": 658
-        }
-      ]
-    },
     "contracts/types/Version.sol": {
       "VersionLib": [
         {
           "length": 20,
-          "start": 798
+          "start": 181
+        },
+        {
+          "length": 20,
+          "start": 282
         }
       ]
     }

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

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