@etherisc/gif-next 0.0.2-da77c50-824 → 0.0.2-e42b0ca-323

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

@@ -130,8 +130,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60e060405234801561001057600080fd5b506040516108b73803806108b783398101604081905261002f916102a3565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff1916600117905581816001600160a01b0382166100c85760405162461bcd60e51b815260206004820152601b60248201527f4552524f523a5247422d3031303a52454749535452595f5a45524f000000000060448201526064015b60405180910390fd5b6001600160a01b03821660808190526040516301ffc9a760e01b81526306ecd8ef60e01b60048201526301ffc9a790602401602060405180830381865afa158015610117573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061013b91906102f5565b6101875760405162461bcd60e51b815260206004820152601a60248201527f4552524f523a5247422d3031313a4e4f545f524547495354525900000000000060448201526064016100bf565b6001600160601b03811660a081905260805160405163e74d052f60e01b815260048101929092526001600160a01b03169063e74d052f90602401602060405180830381865afa1580156101de573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061020291906102f5565b61025a5760405162461bcd60e51b815260206004820152602360248201527f4552524f523a5247422d3031323a504152454e545f4e4f545f5245474953544560448201526214915160ea1b60648201526084016100bf565b3360c052631dfba64760e11b60009081526020527f95e5a2564f7af40498dc043c6da135e06324c5edb1f60c2bf4dcdf2da207fa45805460ff191660011790555050505061031e565b600080604083850312156102b657600080fd5b82516001600160a01b03811681146102cd57600080fd5b60208401519092506001600160601b03811681146102ea57600080fd5b809150509250929050565b60006020828403121561030757600080fd5b8151801515811461031757600080fd5b9392505050565b60805160a05160c05161054e610369600039600061038b01526000610100015260008181610140015281816102100152818161029d0152818161030e01526103ce015261054e6000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c80633bc5de301161005b5780633bc5de30146101245780635ab1bd531461013e578063644c45e014610178578063893d20e81461018057600080fd5b806301ffc9a71461008d57806315dae03e146100cf5780631aa3a008146100de57806331b62a3b146100fe575b600080fd5b6100ba61009b366004610447565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b604051601e81526020016100c6565b6100e661018d565b6040516001600160601b0390911681526020016100c6565b7f00000000000000000000000000000000000000000000000000000000000000006100e6565b604080516020810182526000815290516100c69190610478565b7f00000000000000000000000000000000000000000000000000000000000000005b6040516001600160a01b0390911681526020016100c6565b6100e6610285565b6101606102ec565b905090565b60006101976102ec565b6001600160a01b0316336001600160a01b0316146101fb5760405162461bcd60e51b815260206004820152601760248201527f4552524f523a5247422d3030313a4e4f545f4f574e4552000000000000000000604482015260640160405180910390fd5b604051632210724360e11b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690634420e486906024016020604051808303816000875af1158015610261573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018891906104c6565b604051636939560f60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063d272ac1e90602401602060405180830381865afa158015610261573d6000803e3d6000fd5b604051636939560f60e11b815230600482015260009081906001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063d272ac1e90602401602060405180830381865afa158015610355573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037991906104c6565b90506001600160601b0381166103b0577f000000000000000000000000000000000000000000000000000000000000000091505090565b60405163df33330b60e01b81526001600160601b03821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063df33330b90602401602060405180830381865afa15801561041d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061044191906104ef565b91505090565b60006020828403121561045957600080fd5b81356001600160e01b03198116811461047157600080fd5b9392505050565b600060208083528351808285015260005b818110156104a557858101830151858201604001528201610489565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156104d857600080fd5b81516001600160601b038116811461047157600080fd5b60006020828403121561050157600080fd5b81516001600160a01b038116811461047157600080fdfea264697066735822122092e87279c4ffd00b734dcc4efe20043f1fc124704def053725a4d6f4ea34a13f64736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100885760003560e01c80633bc5de301161005b5780633bc5de30146101245780635ab1bd531461013e578063644c45e014610178578063893d20e81461018057600080fd5b806301ffc9a71461008d57806315dae03e146100cf5780631aa3a008146100de57806331b62a3b146100fe575b600080fd5b6100ba61009b366004610447565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b604051601e81526020016100c6565b6100e661018d565b6040516001600160601b0390911681526020016100c6565b7f00000000000000000000000000000000000000000000000000000000000000006100e6565b604080516020810182526000815290516100c69190610478565b7f00000000000000000000000000000000000000000000000000000000000000005b6040516001600160a01b0390911681526020016100c6565b6100e6610285565b6101606102ec565b905090565b60006101976102ec565b6001600160a01b0316336001600160a01b0316146101fb5760405162461bcd60e51b815260206004820152601760248201527f4552524f523a5247422d3030313a4e4f545f4f574e4552000000000000000000604482015260640160405180910390fd5b604051632210724360e11b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690634420e486906024016020604051808303816000875af1158015610261573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018891906104c6565b604051636939560f60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063d272ac1e90602401602060405180830381865afa158015610261573d6000803e3d6000fd5b604051636939560f60e11b815230600482015260009081906001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063d272ac1e90602401602060405180830381865afa158015610355573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037991906104c6565b90506001600160601b0381166103b0577f000000000000000000000000000000000000000000000000000000000000000091505090565b60405163df33330b60e01b81526001600160601b03821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063df33330b90602401602060405180830381865afa15801561041d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061044191906104ef565b91505090565b60006020828403121561045957600080fd5b81356001600160e01b03198116811461047157600080fd5b9392505050565b600060208083528351808285015260005b818110156104a557858101830151858201604001528201610489565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156104d857600080fd5b81516001600160601b038116811461047157600080fd5b60006020828403121561050157600080fd5b81516001600160a01b038116811461047157600080fdfea264697066735822122092e87279c4ffd00b734dcc4efe20043f1fc124704def053725a4d6f4ea34a13f64736f6c63430008140033",
+  "bytecode": "0x60e060405234801561001057600080fd5b506040516108b73803806108b783398101604081905261002f916102a3565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff1916600117905581816001600160a01b0382166100c85760405162461bcd60e51b815260206004820152601b60248201527f4552524f523a5247422d3031303a52454749535452595f5a45524f000000000060448201526064015b60405180910390fd5b6001600160a01b03821660808190526040516301ffc9a760e01b81526306ecd8ef60e01b60048201526301ffc9a790602401602060405180830381865afa158015610117573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061013b91906102f5565b6101875760405162461bcd60e51b815260206004820152601a60248201527f4552524f523a5247422d3031313a4e4f545f524547495354525900000000000060448201526064016100bf565b6001600160601b03811660a081905260805160405163e74d052f60e01b815260048101929092526001600160a01b03169063e74d052f90602401602060405180830381865afa1580156101de573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061020291906102f5565b61025a5760405162461bcd60e51b815260206004820152602360248201527f4552524f523a5247422d3031323a504152454e545f4e4f545f5245474953544560448201526214915160ea1b60648201526084016100bf565b3360c052631dfba64760e11b60009081526020527f95e5a2564f7af40498dc043c6da135e06324c5edb1f60c2bf4dcdf2da207fa45805460ff191660011790555050505061031e565b600080604083850312156102b657600080fd5b82516001600160a01b03811681146102cd57600080fd5b60208401519092506001600160601b03811681146102ea57600080fd5b809150509250929050565b60006020828403121561030757600080fd5b8151801515811461031757600080fd5b9392505050565b60805160a05160c05161054e610369600039600061038b01526000610100015260008181610140015281816102100152818161029d0152818161030e01526103ce015261054e6000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c80633bc5de301161005b5780633bc5de30146101245780635ab1bd531461013e578063644c45e014610178578063893d20e81461018057600080fd5b806301ffc9a71461008d57806315dae03e146100cf5780631aa3a008146100de57806331b62a3b146100fe575b600080fd5b6100ba61009b366004610447565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b604051601e81526020016100c6565b6100e661018d565b6040516001600160601b0390911681526020016100c6565b7f00000000000000000000000000000000000000000000000000000000000000006100e6565b604080516020810182526000815290516100c69190610478565b7f00000000000000000000000000000000000000000000000000000000000000005b6040516001600160a01b0390911681526020016100c6565b6100e6610285565b6101606102ec565b905090565b60006101976102ec565b6001600160a01b0316336001600160a01b0316146101fb5760405162461bcd60e51b815260206004820152601760248201527f4552524f523a5247422d3030313a4e4f545f4f574e4552000000000000000000604482015260640160405180910390fd5b604051632210724360e11b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690634420e486906024016020604051808303816000875af1158015610261573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018891906104c6565b604051636939560f60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063d272ac1e90602401602060405180830381865afa158015610261573d6000803e3d6000fd5b604051636939560f60e11b815230600482015260009081906001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063d272ac1e90602401602060405180830381865afa158015610355573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037991906104c6565b90506001600160601b0381166103b0577f000000000000000000000000000000000000000000000000000000000000000091505090565b60405163df33330b60e01b81526001600160601b03821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063df33330b90602401602060405180830381865afa15801561041d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061044191906104ef565b91505090565b60006020828403121561045957600080fd5b81356001600160e01b03198116811461047157600080fd5b9392505050565b600060208083528351808285015260005b818110156104a557858101830151858201604001528201610489565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156104d857600080fd5b81516001600160601b038116811461047157600080fd5b60006020828403121561050157600080fd5b81516001600160a01b038116811461047157600080fdfea2646970667358221220b71b6348c1749a1401959f56e3a037fc052c167e77c7cb746e4eb1a95f2261e964736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100885760003560e01c80633bc5de301161005b5780633bc5de30146101245780635ab1bd531461013e578063644c45e014610178578063893d20e81461018057600080fd5b806301ffc9a71461008d57806315dae03e146100cf5780631aa3a008146100de57806331b62a3b146100fe575b600080fd5b6100ba61009b366004610447565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b604051601e81526020016100c6565b6100e661018d565b6040516001600160601b0390911681526020016100c6565b7f00000000000000000000000000000000000000000000000000000000000000006100e6565b604080516020810182526000815290516100c69190610478565b7f00000000000000000000000000000000000000000000000000000000000000005b6040516001600160a01b0390911681526020016100c6565b6100e6610285565b6101606102ec565b905090565b60006101976102ec565b6001600160a01b0316336001600160a01b0316146101fb5760405162461bcd60e51b815260206004820152601760248201527f4552524f523a5247422d3030313a4e4f545f4f574e4552000000000000000000604482015260640160405180910390fd5b604051632210724360e11b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690634420e486906024016020604051808303816000875af1158015610261573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018891906104c6565b604051636939560f60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063d272ac1e90602401602060405180830381865afa158015610261573d6000803e3d6000fd5b604051636939560f60e11b815230600482015260009081906001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063d272ac1e90602401602060405180830381865afa158015610355573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037991906104c6565b90506001600160601b0381166103b0577f000000000000000000000000000000000000000000000000000000000000000091505090565b60405163df33330b60e01b81526001600160601b03821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063df33330b90602401602060405180830381865afa15801561041d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061044191906104ef565b91505090565b60006020828403121561045957600080fd5b81356001600160e01b03198116811461047157600080fd5b9392505050565b600060208083528351808285015260005b818110156104a557858101830151858201604001528201610489565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156104d857600080fd5b81516001600160601b038116811461047157600080fd5b60006020828403121561050157600080fd5b81516001600160a01b038116811461047157600080fdfea2646970667358221220b71b6348c1749a1401959f56e3a037fc052c167e77c7cb746e4eb1a95f2261e964736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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

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

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

@@ -75,8 +75,42 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610319806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80631fa8a7301461005c5780636e9067fb14610082578063775a404814610095578063b844f20e1461009d578063c4ce6e5b146100b2575b600080fd5b6100646100ba565b6040516001600160c01b031990911681526020015b60405180910390f35b6100646100903660046101e4565b6100c9565b6100646100da565b6100a56100e4565b6040516100799190610295565b6100a5610113565b60006100c461013f565b905090565b60006100d48261016b565b92915050565b60006100c461019b565b60606100c460408051808201909152601081526f50726f647563744f776e6572526f6c6560801b602082015290565b60606100c460408051808201909152600d81526c506f6f6c4f776e6572526f6c6560981b602082015290565b60006100c46040518060400160405280600d81526020016c506f6f6c4f776e6572526f6c6560981b8152505b60008160405160200161017e9190610295565b604051602081830303815290604052805190602001209050919050565b60006100c46040518060400160405280601081526020016f50726f647563744f776e6572526f6c6560801b81525061016b565b634e487b7160e01b600052604160045260246000fd5b6000602082840312156101f657600080fd5b813567ffffffffffffffff8082111561020e57600080fd5b818401915084601f83011261022257600080fd5b813581811115610234576102346101ce565b604051601f8201601f19908116603f0116810190838211818310171561025c5761025c6101ce565b8160405282815287602084870101111561027557600080fd5b826020860160208301376000928101602001929092525095945050505050565b600060208083528351808285015260005b818110156102c2578581018301518582016040015282016102a6565b506000604082860101526040601f19601f830116850101925050509291505056fea26469706673582212208e11ea22383900714d73888742cf4daf68809c7b8306f93d2a739af6de499a7e64736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100575760003560e01c80631fa8a7301461005c5780636e9067fb14610082578063775a404814610095578063b844f20e1461009d578063c4ce6e5b146100b2575b600080fd5b6100646100ba565b6040516001600160c01b031990911681526020015b60405180910390f35b6100646100903660046101e4565b6100c9565b6100646100da565b6100a56100e4565b6040516100799190610295565b6100a5610113565b60006100c461013f565b905090565b60006100d48261016b565b92915050565b60006100c461019b565b60606100c460408051808201909152601081526f50726f647563744f776e6572526f6c6560801b602082015290565b60606100c460408051808201909152600d81526c506f6f6c4f776e6572526f6c6560981b602082015290565b60006100c46040518060400160405280600d81526020016c506f6f6c4f776e6572526f6c6560981b8152505b60008160405160200161017e9190610295565b604051602081830303815290604052805190602001209050919050565b60006100c46040518060400160405280601081526020016f50726f647563744f776e6572526f6c6560801b81525061016b565b634e487b7160e01b600052604160045260246000fd5b6000602082840312156101f657600080fd5b813567ffffffffffffffff8082111561020e57600080fd5b818401915084601f83011261022257600080fd5b813581811115610234576102346101ce565b604051601f8201601f19908116603f0116810190838211818310171561025c5761025c6101ce565b8160405282815287602084870101111561027557600080fd5b826020860160208301376000928101602001929092525095945050505050565b600060208083528351808285015260005b818110156102c2578581018301518582016040015282016102a6565b506000604082860101526040601f19601f830116850101925050509291505056fea26469706673582212208e11ea22383900714d73888742cf4daf68809c7b8306f93d2a739af6de499a7e64736f6c63430008140033",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
+  "bytecode": "0x608060405234801561001057600080fd5b50610426806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80631fa8a7301461005c5780636e9067fb14610082578063775a404814610095578063b844f20e1461009d578063c4ce6e5b146100b2575b600080fd5b6100646100ba565b6040516001600160c01b031990911681526020015b60405180910390f35b6100646100903660046102b5565b6100c9565b61006461014a565b6100a5610154565b60405161007991906103ac565b6100a5610183565b60006100c46101af565b905090565b60405163e14787cb60e01b815260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__9063e14787cb906101039085906004016103ac565b602060405180830381865af4158015610120573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061014491906103c6565b92915050565b60006100c4610244565b60606100c460408051808201909152601081526f50726f647563744f776e6572526f6c6560801b602082015290565b60606100c460408051808201909152600d81526c506f6f6c4f776e6572526f6c6560981b602082015290565b60405163e14787cb60e01b815260206004820152600d60248201526c506f6f6c4f776e6572526f6c6560981b604482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__9063e14787cb906064015b602060405180830381865af4158015610220573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100c491906103c6565b60405163e14787cb60e01b815260206004820152601060248201526f50726f647563744f776e6572526f6c6560801b604482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__9063e14787cb90606401610203565b634e487b7160e01b600052604160045260246000fd5b6000602082840312156102c757600080fd5b813567ffffffffffffffff808211156102df57600080fd5b818401915084601f8301126102f357600080fd5b8135818111156103055761030561029f565b604051601f8201601f19908116603f0116810190838211818310171561032d5761032d61029f565b8160405282815287602084870101111561034657600080fd5b826020860160208301376000928101602001929092525095945050505050565b6000815180845260005b8181101561038c57602081850181015186830182015201610370565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103bf6020830184610366565b9392505050565b6000602082840312156103d857600080fd5b81516001600160c01b0319811681146103bf57600080fdfea2646970667358221220a727e8fcc31792587c46ff46201a7a209190924f0c9a476aa382f00729e2c3bb64736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100575760003560e01c80631fa8a7301461005c5780636e9067fb14610082578063775a404814610095578063b844f20e1461009d578063c4ce6e5b146100b2575b600080fd5b6100646100ba565b6040516001600160c01b031990911681526020015b60405180910390f35b6100646100903660046102b5565b6100c9565b61006461014a565b6100a5610154565b60405161007991906103ac565b6100a5610183565b60006100c46101af565b905090565b60405163e14787cb60e01b815260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__9063e14787cb906101039085906004016103ac565b602060405180830381865af4158015610120573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061014491906103c6565b92915050565b60006100c4610244565b60606100c460408051808201909152601081526f50726f647563744f776e6572526f6c6560801b602082015290565b60606100c460408051808201909152600d81526c506f6f6c4f776e6572526f6c6560981b602082015290565b60405163e14787cb60e01b815260206004820152600d60248201526c506f6f6c4f776e6572526f6c6560981b604482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__9063e14787cb906064015b602060405180830381865af4158015610220573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100c491906103c6565b60405163e14787cb60e01b815260206004820152601060248201526f50726f647563744f776e6572526f6c6560801b604482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__9063e14787cb90606401610203565b634e487b7160e01b600052604160045260246000fd5b6000602082840312156102c757600080fd5b813567ffffffffffffffff808211156102df57600080fd5b818401915084601f8301126102f357600080fd5b8135818111156103055761030561029f565b604051601f8201601f19908116603f0116810190838211818310171561032d5761032d61029f565b8160405282815287602084870101111561034657600080fd5b826020860160208301376000928101602001929092525095945050505050565b6000815180845260005b8181101561038c57602081850181015186830182015201610370565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103bf6020830184610366565b9392505050565b6000602082840312156103d857600080fd5b81516001600160c01b0319811681146103bf57600080fdfea2646970667358221220a727e8fcc31792587c46ff46201a7a209190924f0c9a476aa382f00729e2c3bb64736f6c63430008140033",
+  "linkReferences": {
+    "contracts/types/RoleId.sol": {
+      "RoleIdLib": [
+        {
+          "length": 20,
+          "start": 251
+        },
+        {
+          "length": 20,
+          "start": 517
+        },
+        {
+          "length": 20,
+          "start": 669
+        }
+      ]
+    }
+  },
+  "deployedLinkReferences": {
+    "contracts/types/RoleId.sol": {
+      "RoleIdLib": [
+        {
+          "length": 20,
+          "start": 219
+        },
+        {
+          "length": 20,
+          "start": 485
+        },
+        {
+          "length": 20,
+          "start": 637
+        }
+      ]
+    }
+  }
 }

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

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

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

@@ -251,15 +251,15 @@
               "name": "activatedBy",
               "type": "address"
             },
-            {
-              "internalType": "Blocknumber",
-              "name": "activatedIn",
-              "type": "uint32"
-            },
             {
               "internalType": "Timestamp",
               "name": "activatedAt",
               "type": "uint40"
+            },
+            {
+              "internalType": "Blocknumber",
+              "name": "activatedIn",
+              "type": "uint32"
             }
           ],
           "internalType": "struct IVersionable.VersionInfo",
@@ -322,18 +322,18 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60e06040523480156200001157600080fd5b506040516200198a3803806200198a833981016040819052620000349162000852565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055818181816001600160a01b038216620000d05760405162461bcd60e51b815260206004820152601b60248201527f4552524f523a5247422d3031303a52454749535452595f5a45524f000000000060448201526064015b60405180910390fd5b6001600160a01b03821660808190526040516301ffc9a760e01b81526306ecd8ef60e01b60048201526301ffc9a790602401602060405180830381865afa15801562000120573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001469190620008a7565b620001945760405162461bcd60e51b815260206004820152601a60248201527f4552524f523a5247422d3031313a4e4f545f52454749535452590000000000006044820152606401620000c7565b6001600160601b03811660a081905260805160405163e74d052f60e01b815260048101929092526001600160a01b03169063e74d052f90602401602060405180830381865afa158015620001ec573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620002129190620008a7565b6200026c5760405162461bcd60e51b815260206004820152602360248201527f4552524f523a5247422d3031323a504152454e545f4e4f545f5245474953544560448201526214915160ea1b6064820152608401620000c7565b3360c052631dfba64760e11b60009081526020527f95e5a2564f7af40498dc043c6da135e06324c5edb1f60c2bf4dcdf2da207fa45805460ff1916600117905550620002bc905060003362000302565b631b4612f160e31b60009081526020527ffc58a5a01198e68c5a5d0bcd463f9ab550fc4337b1df271aed6dbb33d25fef25805460ff191660011790555050505062000944565b60006200030e620005da565b90506200031b81620005f0565b156200037a5760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b6064820152608401620000c7565b600254156200043b5760028054600091906200039990600190620008e8565b81548110620003ac57620003ac620008fe565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050620003df828262000696565b620004395760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b6064820152608401620000c7565b505b60028054600181018255600091909152600a8082047f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace01805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b03808616602084015284169082015260608101620004c54390565b63ffffffff1681526020014264ffffffffff90811690915262ffffff80841660009081526001602081815260409283902086518154928801516001600160a01b039081166301000000026001600160b81b0319909416919096161791909117815585830151910180546060870151608090970151909516600160c01b0264ffffffffff60c01b1963ffffffff909716600160a01b026001600160c01b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d441990620005cd9083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b6000620005eb6003600080620006a8565b905090565b62ffffff81166000908152600160208190526040808320909101549051631bbffab160e21b8152600160a01b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af415801562000669573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200068f919062000914565b1192915050565b62ffffff808216908316115b92915050565b604051632b10f60d60e21b815260ff84166004820152600090819073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af415801562000700573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019062000726919062000914565b604051632b10f60d60e21b815260ff8616600482015290915060009073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af41580156200077f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620007a5919062000914565b604051632b10f60d60e21b815260ff8616600482015290915060009073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af4158015620007fe573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019062000824919062000914565b9050806200083b600884901b601086901b6200092e565b6200084791906200092e565b979650505050505050565b600080604083850312156200086657600080fd5b82516001600160a01b03811681146200087e57600080fd5b60208401519092506001600160601b03811681146200089c57600080fd5b809150509250929050565b600060208284031215620008ba57600080fd5b81518015158114620008cb57600080fd5b9392505050565b634e487b7160e01b600052601160045260246000fd5b81810381811115620006a257620006a2620008d2565b634e487b7160e01b600052603260045260246000fd5b6000602082840312156200092757600080fd5b5051919050565b80820180821115620006a257620006a2620008d2565b60805160a05160c051610ffa6200099060003960006106f6015260006101e801526000818161029201528181610480015281816106060152818161067701526107390152610ffa6000f3fe608060405234801561001057600080fd5b506004361061010b5760003560e01c80634d459c90116100a2578063946dfcfe11610071578063946dfcfe146102da5780639555c4db146102eb578063a3f4df7e14610300578063b88da7591461032a578063cde749f41461033d57600080fd5b80634d459c90146102205780635ab1bd5314610290578063644c45e0146102ca578063893d20e8146102d257600080fd5b806317d7de7c116100de57806317d7de7c146101965780631aa3a008146101c657806331b62a3b146101e65780633bc5de301461020c57600080fd5b806301ffc9a7146101105780630abd8434146101525780630d8e6e2c1461016557806315dae03e14610181575b600080fd5b61013d61011e366004610db1565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b61013d610160366004610df6565b610345565b61016d6103e8565b60405162ffffff9091168152602001610149565b60285b60405160ff9091168152602001610149565b60408051808201909152600b81526a546573745365727669636560a81b60208201525b6040516101499190610e59565b6101ce6103fc565b6040516001600160601b039091168152602001610149565b7f00000000000000000000000000000000000000000000000000000000000000006101ce565b6040805160208101909152600081526101b9565b61023361022e366004610df6565b6104f5565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015163ffffffff169082015260809182015164ffffffffff169181019190915260a001610149565b7f00000000000000000000000000000000000000000000000000000000000000005b6040516001600160a01b039091168152602001610149565b6101ce6105ee565b6102b2610655565b600254604051908152602001610149565b6102fe6102f9366004610e81565b6107b2565b005b6101b96040518060400160405280600b81526020016a546573745365727669636560a81b81525081565b61016d610338366004610eba565b6107c0565b610184610853565b62ffffff81166000908152600160208190526040808320909101549051631bbffab160e21b8152600160a01b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156103bd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103e19190610ed3565b1192915050565b60006103f76003600080610930565b905090565b6000610406610655565b6001600160a01b0316336001600160a01b03161461046b5760405162461bcd60e51b815260206004820152601760248201527f4552524f523a5247422d3030313a4e4f545f4f574e455200000000000000000060448201526064015b60405180910390fd5b604051632210724360e11b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690634420e486906024016020604051808303816000875af11580156104d1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103f79190610eec565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915261052982610345565b6105755760405162461bcd60e51b815260206004820152601d60248201527f4552524f523a56524e2d3032303a56455253494f4e5f554e4b4e4f574e0000006044820152606401610462565b5062ffffff908116600090815260016020818152604092839020835160a0810185528154958616815263010000009095046001600160a01b03908116928601929092529091015490811691830191909152600160a01b810463ffffffff166060830152600160c01b900464ffffffffff16608082015290565b604051636939560f60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063d272ac1e90602401602060405180830381865afa1580156104d1573d6000803e3d6000fd5b604051636939560f60e11b815230600482015260009081906001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063d272ac1e90602401602060405180830381865afa1580156106be573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106e29190610eec565b90506106ef816000610acd565b1561071b577f000000000000000000000000000000000000000000000000000000000000000091505090565b60405163df33330b60e01b81526001600160601b03821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063df33330b90602401602060405180830381865afa158015610788573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107ac9190610f15565b91505090565b6107bc8282610ae3565b5050565b60025460009082106108145760405162461bcd60e51b815260206004820152601d60248201527f4552524f523a56524e2d3031303a494e4445585f544f4f5f4c415247450000006044820152606401610462565b6002828154811061082757610827610f32565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6000306001600160a01b0316630d8e6e2c6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610893573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108b79190610f48565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af415801561090c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103f79190610f65565b604051632b10f60d60e21b815260ff84166004820152600090819073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af4158015610987573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109ab9190610ed3565b604051632b10f60d60e21b815260ff8616600482015290915060009073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af4158015610a03573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a279190610ed3565b604051632b10f60d60e21b815260ff8616600482015290915060009073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af4158015610a7f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610aa39190610ed3565b905080610ab8600884901b601086901b610f9e565b610ac29190610f9e565b979650505050505050565b6001600160601b03828116908216145b92915050565b6000610aed6103e8565b9050610af881610345565b15610b555760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b6064820152608401610462565b60025415610c14576002805460009190610b7190600190610fb1565b81548110610b8157610b81610f32565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050610bba828262ffffff90811691161190565b610c125760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b6064820152608401610462565b505b60028054600181018255600091909152600a8082047f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace01805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b03808616602084015284169082015260608101610c9d4390565b63ffffffff1681526020014264ffffffffff90811690915262ffffff80841660009081526001602081815260409283902086518154928801516001600160a01b039081166301000000026001600160b81b0319909416919096161791909117815585830151910180546060870151608090970151909516600160c01b0264ffffffffff60c01b1963ffffffff909716600160a01b026001600160c01b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d441990610da49083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b600060208284031215610dc357600080fd5b81356001600160e01b031981168114610ddb57600080fd5b9392505050565b62ffffff81168114610df357600080fd5b50565b600060208284031215610e0857600080fd5b8135610ddb81610de2565b6000815180845260005b81811015610e3957602081850181015186830182015201610e1d565b506000602082860101526020601f19601f83011685010191505092915050565b602081526000610ddb6020830184610e13565b6001600160a01b0381168114610df357600080fd5b60008060408385031215610e9457600080fd5b8235610e9f81610e6c565b91506020830135610eaf81610e6c565b809150509250929050565b600060208284031215610ecc57600080fd5b5035919050565b600060208284031215610ee557600080fd5b5051919050565b600060208284031215610efe57600080fd5b81516001600160601b0381168114610ddb57600080fd5b600060208284031215610f2757600080fd5b8151610ddb81610e6c565b634e487b7160e01b600052603260045260246000fd5b600060208284031215610f5a57600080fd5b8151610ddb81610de2565b600060208284031215610f7757600080fd5b815160ff81168114610ddb57600080fd5b634e487b7160e01b600052601160045260246000fd5b80820180821115610add57610add610f88565b81810381811115610add57610add610f8856fea2646970667358221220858101abb0d1ec329d0da3892531c0417610d06c65081d0e6521dc5710196bde64736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061010b5760003560e01c80634d459c90116100a2578063946dfcfe11610071578063946dfcfe146102da5780639555c4db146102eb578063a3f4df7e14610300578063b88da7591461032a578063cde749f41461033d57600080fd5b80634d459c90146102205780635ab1bd5314610290578063644c45e0146102ca578063893d20e8146102d257600080fd5b806317d7de7c116100de57806317d7de7c146101965780631aa3a008146101c657806331b62a3b146101e65780633bc5de301461020c57600080fd5b806301ffc9a7146101105780630abd8434146101525780630d8e6e2c1461016557806315dae03e14610181575b600080fd5b61013d61011e366004610db1565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b61013d610160366004610df6565b610345565b61016d6103e8565b60405162ffffff9091168152602001610149565b60285b60405160ff9091168152602001610149565b60408051808201909152600b81526a546573745365727669636560a81b60208201525b6040516101499190610e59565b6101ce6103fc565b6040516001600160601b039091168152602001610149565b7f00000000000000000000000000000000000000000000000000000000000000006101ce565b6040805160208101909152600081526101b9565b61023361022e366004610df6565b6104f5565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015163ffffffff169082015260809182015164ffffffffff169181019190915260a001610149565b7f00000000000000000000000000000000000000000000000000000000000000005b6040516001600160a01b039091168152602001610149565b6101ce6105ee565b6102b2610655565b600254604051908152602001610149565b6102fe6102f9366004610e81565b6107b2565b005b6101b96040518060400160405280600b81526020016a546573745365727669636560a81b81525081565b61016d610338366004610eba565b6107c0565b610184610853565b62ffffff81166000908152600160208190526040808320909101549051631bbffab160e21b8152600160a01b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156103bd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103e19190610ed3565b1192915050565b60006103f76003600080610930565b905090565b6000610406610655565b6001600160a01b0316336001600160a01b03161461046b5760405162461bcd60e51b815260206004820152601760248201527f4552524f523a5247422d3030313a4e4f545f4f574e455200000000000000000060448201526064015b60405180910390fd5b604051632210724360e11b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690634420e486906024016020604051808303816000875af11580156104d1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103f79190610eec565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915261052982610345565b6105755760405162461bcd60e51b815260206004820152601d60248201527f4552524f523a56524e2d3032303a56455253494f4e5f554e4b4e4f574e0000006044820152606401610462565b5062ffffff908116600090815260016020818152604092839020835160a0810185528154958616815263010000009095046001600160a01b03908116928601929092529091015490811691830191909152600160a01b810463ffffffff166060830152600160c01b900464ffffffffff16608082015290565b604051636939560f60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063d272ac1e90602401602060405180830381865afa1580156104d1573d6000803e3d6000fd5b604051636939560f60e11b815230600482015260009081906001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063d272ac1e90602401602060405180830381865afa1580156106be573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106e29190610eec565b90506106ef816000610acd565b1561071b577f000000000000000000000000000000000000000000000000000000000000000091505090565b60405163df33330b60e01b81526001600160601b03821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063df33330b90602401602060405180830381865afa158015610788573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107ac9190610f15565b91505090565b6107bc8282610ae3565b5050565b60025460009082106108145760405162461bcd60e51b815260206004820152601d60248201527f4552524f523a56524e2d3031303a494e4445585f544f4f5f4c415247450000006044820152606401610462565b6002828154811061082757610827610f32565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6000306001600160a01b0316630d8e6e2c6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610893573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108b79190610f48565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af415801561090c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103f79190610f65565b604051632b10f60d60e21b815260ff84166004820152600090819073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af4158015610987573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109ab9190610ed3565b604051632b10f60d60e21b815260ff8616600482015290915060009073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af4158015610a03573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a279190610ed3565b604051632b10f60d60e21b815260ff8616600482015290915060009073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af4158015610a7f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610aa39190610ed3565b905080610ab8600884901b601086901b610f9e565b610ac29190610f9e565b979650505050505050565b6001600160601b03828116908216145b92915050565b6000610aed6103e8565b9050610af881610345565b15610b555760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b6064820152608401610462565b60025415610c14576002805460009190610b7190600190610fb1565b81548110610b8157610b81610f32565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050610bba828262ffffff90811691161190565b610c125760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b6064820152608401610462565b505b60028054600181018255600091909152600a8082047f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace01805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b03808616602084015284169082015260608101610c9d4390565b63ffffffff1681526020014264ffffffffff90811690915262ffffff80841660009081526001602081815260409283902086518154928801516001600160a01b039081166301000000026001600160b81b0319909416919096161791909117815585830151910180546060870151608090970151909516600160c01b0264ffffffffff60c01b1963ffffffff909716600160a01b026001600160c01b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d441990610da49083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b600060208284031215610dc357600080fd5b81356001600160e01b031981168114610ddb57600080fd5b9392505050565b62ffffff81168114610df357600080fd5b50565b600060208284031215610e0857600080fd5b8135610ddb81610de2565b6000815180845260005b81811015610e3957602081850181015186830182015201610e1d565b506000602082860101526020601f19601f83011685010191505092915050565b602081526000610ddb6020830184610e13565b6001600160a01b0381168114610df357600080fd5b60008060408385031215610e9457600080fd5b8235610e9f81610e6c565b91506020830135610eaf81610e6c565b809150509250929050565b600060208284031215610ecc57600080fd5b5035919050565b600060208284031215610ee557600080fd5b5051919050565b600060208284031215610efe57600080fd5b81516001600160601b0381168114610ddb57600080fd5b600060208284031215610f2757600080fd5b8151610ddb81610e6c565b634e487b7160e01b600052603260045260246000fd5b600060208284031215610f5a57600080fd5b8151610ddb81610de2565b600060208284031215610f7757600080fd5b815160ff81168114610ddb57600080fd5b634e487b7160e01b600052601160045260246000fd5b80820180821115610add57610add610f88565b81810381811115610add57610add610f8856fea2646970667358221220858101abb0d1ec329d0da3892531c0417610d06c65081d0e6521dc5710196bde64736f6c63430008140033",
+  "bytecode": "0x60e06040523480156200001157600080fd5b50604051620016703803806200167083398101604081905262000034916200071f565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055818181816001600160a01b038216620000d05760405162461bcd60e51b815260206004820152601b60248201527f4552524f523a5247422d3031303a52454749535452595f5a45524f000000000060448201526064015b60405180910390fd5b6001600160a01b03821660808190526040516301ffc9a760e01b81526306ecd8ef60e01b60048201526301ffc9a790602401602060405180830381865afa15801562000120573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019062000146919062000774565b620001945760405162461bcd60e51b815260206004820152601a60248201527f4552524f523a5247422d3031313a4e4f545f52454749535452590000000000006044820152606401620000c7565b6001600160601b03811660a081905260805160405163e74d052f60e01b815260048101929092526001600160a01b03169063e74d052f90602401602060405180830381865afa158015620001ec573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019062000212919062000774565b6200026c5760405162461bcd60e51b815260206004820152602360248201527f4552524f523a5247422d3031323a504152454e545f4e4f545f5245474953544560448201526214915160ea1b6064820152608401620000c7565b3360c052631dfba64760e11b60009081526020527f95e5a2564f7af40498dc043c6da135e06324c5edb1f60c2bf4dcdf2da207fa45805460ff1916600117905550620002bc905060003362000302565b631b4612f160e31b60009081526020527ffc58a5a01198e68c5a5d0bcd463f9ab550fc4337b1df271aed6dbb33d25fef25805460ff191660011790555050505062000818565b60006200030e620005da565b90506200031b8162000667565b156200037a5760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b6064820152608401620000c7565b600254156200043b57600280546000919062000399906001906200079f565b81548110620003ac57620003ac620007c1565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050620003df82826200070d565b620004395760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b6064820152608401620000c7565b505b60028054600181018255600091909152600a8082047f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace01805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b03808616602084015284169082015260608101620004c54290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff80841660009081526001602081815260409283902086518154928801516001600160a01b039081166301000000026001600160b81b0319909416919096161791909117815585830151910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d441990620005cd9083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156200063c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620006629190620007d7565b905090565b62ffffff81166000908152600160208190526040808320909101549051631bbffab160e21b8152600160c81b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af4158015620006e0573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620007069190620007fe565b1192915050565b62ffffff808216908316115b92915050565b600080604083850312156200073357600080fd5b82516001600160a01b03811681146200074b57600080fd5b60208401519092506001600160601b03811681146200076957600080fd5b809150509250929050565b6000602082840312156200078757600080fd5b815180151581146200079857600080fd5b9392505050565b818103818111156200071957634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b600060208284031215620007ea57600080fd5b815162ffffff811681146200079857600080fd5b6000602082840312156200081157600080fd5b5051919050565b60805160a05160c051610e0c620008646000396000610712015260006101e801526000818161033101528181610595015281816106220152818161069301526107550152610e0c6000f3fe608060405234801561001057600080fd5b506004361061010b5760003560e01c80634d459c90116100a2578063946dfcfe11610071578063946dfcfe146103795780639555c4db1461038a578063a3f4df7e1461039f578063b88da759146103c9578063cde749f4146103dc57600080fd5b80634d459c90146102205780635ab1bd531461032f578063644c45e014610369578063893d20e81461037157600080fd5b806317d7de7c116100de57806317d7de7c146101965780631aa3a008146101c657806331b62a3b146101e65780633bc5de301461020c57600080fd5b806301ffc9a7146101105780630abd8434146101525780630d8e6e2c1461016557806315dae03e14610181575b600080fd5b61013d61011e366004610bde565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b61013d610160366004610c23565b6103e4565b61016d610487565b60405162ffffff9091168152602001610149565b60285b60405160ff9091168152602001610149565b60408051808201909152600b81526a546573745365727669636560a81b60208201525b6040516101499190610c86565b6101ce610511565b6040516001600160601b039091168152602001610149565b7f00000000000000000000000000000000000000000000000000000000000000006101ce565b6040805160208101909152600081526101b9565b6102d261022e366004610c23565b6040805160a0810182526000808252602082018190529181018290526060810182905260808101919091525062ffffff908116600090815260016020818152604092839020835160a0810185528154958616815263010000009095046001600160a01b03908116928601929092529091015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a001610149565b7f00000000000000000000000000000000000000000000000000000000000000005b6040516001600160a01b039091168152602001610149565b6101ce61060a565b610351610671565b600254604051908152602001610149565b61039d610398366004610cae565b6107ce565b005b6101b96040518060400160405280600b81526020016a546573745365727669636560a81b81525081565b61016d6103d7366004610ce7565b6107dc565b61018461081d565b62ffffff81166000908152600160208190526040808320909101549051631bbffab160e21b8152600160c81b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af415801561045c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104809190610d00565b1192915050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156104e8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061050c9190610d19565b905090565b600061051b610671565b6001600160a01b0316336001600160a01b0316146105805760405162461bcd60e51b815260206004820152601760248201527f4552524f523a5247422d3030313a4e4f545f4f574e455200000000000000000060448201526064015b60405180910390fd5b604051632210724360e11b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690634420e486906024016020604051808303816000875af11580156105e6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061050c9190610d36565b604051636939560f60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063d272ac1e90602401602060405180830381865afa1580156105e6573d6000803e3d6000fd5b604051636939560f60e11b815230600482015260009081906001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063d272ac1e90602401602060405180830381865afa1580156106da573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106fe9190610d36565b905061070b8160006108fa565b15610737577f000000000000000000000000000000000000000000000000000000000000000091505090565b60405163df33330b60e01b81526001600160601b03821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063df33330b90602401602060405180830381865afa1580156107a4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107c89190610d5f565b91505090565b6107d88282610910565b5050565b6000600282815481106107f1576107f1610d7c565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6000306001600160a01b0316630d8e6e2c6040518163ffffffff1660e01b8152600401602060405180830381865afa15801561085d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108819190610d19565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af41580156108d6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061050c9190610d92565b6001600160601b03828116908216145b92915050565b600061091a610487565b9050610925816103e4565b156109825760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b6064820152608401610577565b60025415610a4157600280546000919061099e90600190610db5565b815481106109ae576109ae610d7c565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff1690506109e7828262ffffff90811691161190565b610a3f5760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b6064820152608401610577565b505b60028054600181018255600091909152600a8082047f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace01805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b03808616602084015284169082015260608101610aca4290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff80841660009081526001602081815260409283902086518154928801516001600160a01b039081166301000000026001600160b81b0319909416919096161791909117815585830151910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d441990610bd19083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b600060208284031215610bf057600080fd5b81356001600160e01b031981168114610c0857600080fd5b9392505050565b62ffffff81168114610c2057600080fd5b50565b600060208284031215610c3557600080fd5b8135610c0881610c0f565b6000815180845260005b81811015610c6657602081850181015186830182015201610c4a565b506000602082860101526020601f19601f83011685010191505092915050565b602081526000610c086020830184610c40565b6001600160a01b0381168114610c2057600080fd5b60008060408385031215610cc157600080fd5b8235610ccc81610c99565b91506020830135610cdc81610c99565b809150509250929050565b600060208284031215610cf957600080fd5b5035919050565b600060208284031215610d1257600080fd5b5051919050565b600060208284031215610d2b57600080fd5b8151610c0881610c0f565b600060208284031215610d4857600080fd5b81516001600160601b0381168114610c0857600080fd5b600060208284031215610d7157600080fd5b8151610c0881610c99565b634e487b7160e01b600052603260045260246000fd5b600060208284031215610da457600080fd5b815160ff81168114610c0857600080fd5b8181038181111561090a57634e487b7160e01b600052601160045260246000fdfea2646970667358221220cf53b83d60ef211931181e29e4190fc3472384102bfb073672ec9548eae94c9364736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061010b5760003560e01c80634d459c90116100a2578063946dfcfe11610071578063946dfcfe146103795780639555c4db1461038a578063a3f4df7e1461039f578063b88da759146103c9578063cde749f4146103dc57600080fd5b80634d459c90146102205780635ab1bd531461032f578063644c45e014610369578063893d20e81461037157600080fd5b806317d7de7c116100de57806317d7de7c146101965780631aa3a008146101c657806331b62a3b146101e65780633bc5de301461020c57600080fd5b806301ffc9a7146101105780630abd8434146101525780630d8e6e2c1461016557806315dae03e14610181575b600080fd5b61013d61011e366004610bde565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b61013d610160366004610c23565b6103e4565b61016d610487565b60405162ffffff9091168152602001610149565b60285b60405160ff9091168152602001610149565b60408051808201909152600b81526a546573745365727669636560a81b60208201525b6040516101499190610c86565b6101ce610511565b6040516001600160601b039091168152602001610149565b7f00000000000000000000000000000000000000000000000000000000000000006101ce565b6040805160208101909152600081526101b9565b6102d261022e366004610c23565b6040805160a0810182526000808252602082018190529181018290526060810182905260808101919091525062ffffff908116600090815260016020818152604092839020835160a0810185528154958616815263010000009095046001600160a01b03908116928601929092529091015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a001610149565b7f00000000000000000000000000000000000000000000000000000000000000005b6040516001600160a01b039091168152602001610149565b6101ce61060a565b610351610671565b600254604051908152602001610149565b61039d610398366004610cae565b6107ce565b005b6101b96040518060400160405280600b81526020016a546573745365727669636560a81b81525081565b61016d6103d7366004610ce7565b6107dc565b61018461081d565b62ffffff81166000908152600160208190526040808320909101549051631bbffab160e21b8152600160c81b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af415801561045c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104809190610d00565b1192915050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156104e8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061050c9190610d19565b905090565b600061051b610671565b6001600160a01b0316336001600160a01b0316146105805760405162461bcd60e51b815260206004820152601760248201527f4552524f523a5247422d3030313a4e4f545f4f574e455200000000000000000060448201526064015b60405180910390fd5b604051632210724360e11b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690634420e486906024016020604051808303816000875af11580156105e6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061050c9190610d36565b604051636939560f60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063d272ac1e90602401602060405180830381865afa1580156105e6573d6000803e3d6000fd5b604051636939560f60e11b815230600482015260009081906001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063d272ac1e90602401602060405180830381865afa1580156106da573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106fe9190610d36565b905061070b8160006108fa565b15610737577f000000000000000000000000000000000000000000000000000000000000000091505090565b60405163df33330b60e01b81526001600160601b03821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063df33330b90602401602060405180830381865afa1580156107a4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107c89190610d5f565b91505090565b6107d88282610910565b5050565b6000600282815481106107f1576107f1610d7c565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6000306001600160a01b0316630d8e6e2c6040518163ffffffff1660e01b8152600401602060405180830381865afa15801561085d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108819190610d19565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af41580156108d6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061050c9190610d92565b6001600160601b03828116908216145b92915050565b600061091a610487565b9050610925816103e4565b156109825760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b6064820152608401610577565b60025415610a4157600280546000919061099e90600190610db5565b815481106109ae576109ae610d7c565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff1690506109e7828262ffffff90811691161190565b610a3f5760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b6064820152608401610577565b505b60028054600181018255600091909152600a8082047f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace01805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b03808616602084015284169082015260608101610aca4290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff80841660009081526001602081815260409283902086518154928801516001600160a01b039081166301000000026001600160b81b0319909416919096161791909117815585830151910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d441990610bd19083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b600060208284031215610bf057600080fd5b81356001600160e01b031981168114610c0857600080fd5b9392505050565b62ffffff81168114610c2057600080fd5b50565b600060208284031215610c3557600080fd5b8135610c0881610c0f565b6000815180845260005b81811015610c6657602081850181015186830182015201610c4a565b506000602082860101526020601f19601f83011685010191505092915050565b602081526000610c086020830184610c40565b6001600160a01b0381168114610c2057600080fd5b60008060408385031215610cc157600080fd5b8235610ccc81610c99565b91506020830135610cdc81610c99565b809150509250929050565b600060208284031215610cf957600080fd5b5035919050565b600060208284031215610d1257600080fd5b5051919050565b600060208284031215610d2b57600080fd5b8151610c0881610c0f565b600060208284031215610d4857600080fd5b81516001600160601b0381168114610c0857600080fd5b600060208284031215610d7157600080fd5b8151610c0881610c99565b634e487b7160e01b600052603260045260246000fd5b600060208284031215610da457600080fd5b815160ff81168114610c0857600080fd5b8181038181111561090a57634e487b7160e01b600052601160045260246000fdfea2646970667358221220cf53b83d60ef211931181e29e4190fc3472384102bfb073672ec9548eae94c9364736f6c63430008140033",
   "linkReferences": {
     "contracts/types/Blocknumber.sol": {
       "BlocknumberLib": [
         {
           "length": 20,
-          "start": 1582
+          "start": 1701
         },
         {
           "length": 20,
-          "start": 3347
+          "start": 3206
         }
       ]
     },
@@ -341,33 +341,15 @@
       "VersionLib": [
         {
           "length": 20,
-          "start": 4706
-        }
-      ],
-      "VersionPartLib": [
-        {
-          "length": 20,
-          "start": 1733
-        },
-        {
-          "length": 20,
-          "start": 1860
-        },
-        {
-          "length": 20,
-          "start": 1987
-        },
-        {
-          "length": 20,
-          "start": 4829
+          "start": 1537
         },
         {
           "length": 20,
-          "start": 4953
+          "start": 3346
         },
         {
           "length": 20,
-          "start": 5077
+          "start": 4352
         }
       ]
     }
@@ -377,7 +359,7 @@
       "BlocknumberLib": [
         {
           "length": 20,
-          "start": 899
+          "start": 1058
         }
       ]
     },
@@ -385,21 +367,11 @@
       "VersionLib": [
         {
           "length": 20,
-          "start": 2258
-        }
-      ],
-      "VersionPartLib": [
-        {
-          "length": 20,
-          "start": 2381
-        },
-        {
-          "length": 20,
-          "start": 2505
+          "start": 1198
         },
         {
           "length": 20,
-          "start": 2629
+          "start": 2204
         }
       ]
     }

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

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

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

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

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

@@ -161,32 +161,30 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b506105e8806100206000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80636a3dc0ee1161005b5780636a3dc0ee146100ed57806389818c3c1461011057806389d5976814610135578063e038c6251461014857600080fd5b80630f40f5951461008257806312cf04de146100a357806364d4e5d8146100b6575b600080fd5b61008a61015b565b60405162ffffff90911681526020015b60405180910390f35b61008a6100b136600461045e565b61016a565b6100c96100c43660046104a2565b61017f565b6040805160ff9485168152928416602084015292169181019190915260600161009a565b6101006100fb3660046104bd565b61020b565b604051901515815260200161009a565b61012361011e3660046104f0565b610222565b60405160ff909116815260200161009a565b6101006101433660046104bd565b61022a565b6101236101563660046104a2565b61023c565b60006101656102b7565b905090565b60006101778484846102c1565b949350505050565b6040516324d3888d60e11b815262ffffff821660048201526000908190819073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__906349a7111a90602401606060405180830381865af41580156101da573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101fe919061051a565b9250925092509193909250565b600062ffffff808316908416115b90505b92915050565b60008161021c565b600062ffffff80841690831614610219565b60405163c9e66e2960e01b815262ffffff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af4158015610293573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061021c919061055d565b6000610165816000805b604051632b10f60d60e21b815260ff84166004820152600090819073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af4158015610318573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061033c9190610578565b604051632b10f60d60e21b815260ff8616600482015290915060009073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af4158015610394573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103b89190610578565b604051632b10f60d60e21b815260ff8616600482015290915060009073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af4158015610410573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104349190610578565b905080610449600884901b601086901b610591565b6104539190610591565b979650505050505050565b60008060006060848603121561047357600080fd5b505081359360208301359350604090920135919050565b803562ffffff8116811461049d57600080fd5b919050565b6000602082840312156104b457600080fd5b6102198261048a565b600080604083850312156104d057600080fd5b6104d98361048a565b91506104e76020840161048a565b90509250929050565b60006020828403121561050257600080fd5b5035919050565b805160ff8116811461049d57600080fd5b60008060006060848603121561052f57600080fd5b61053884610509565b925061054660208501610509565b915061055460408501610509565b90509250925092565b60006020828403121561056f57600080fd5b61021982610509565b60006020828403121561058a57600080fd5b5051919050565b8082018082111561021c57634e487b7160e01b600052601160045260246000fdfea264697066735822122007961488b058c17d9c7d38ca31e3ae2460b413b26a3833789c46f412ab81aac964736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80636a3dc0ee1161005b5780636a3dc0ee146100ed57806389818c3c1461011057806389d5976814610135578063e038c6251461014857600080fd5b80630f40f5951461008257806312cf04de146100a357806364d4e5d8146100b6575b600080fd5b61008a61015b565b60405162ffffff90911681526020015b60405180910390f35b61008a6100b136600461045e565b61016a565b6100c96100c43660046104a2565b61017f565b6040805160ff9485168152928416602084015292169181019190915260600161009a565b6101006100fb3660046104bd565b61020b565b604051901515815260200161009a565b61012361011e3660046104f0565b610222565b60405160ff909116815260200161009a565b6101006101433660046104bd565b61022a565b6101236101563660046104a2565b61023c565b60006101656102b7565b905090565b60006101778484846102c1565b949350505050565b6040516324d3888d60e11b815262ffffff821660048201526000908190819073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__906349a7111a90602401606060405180830381865af41580156101da573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101fe919061051a565b9250925092509193909250565b600062ffffff808316908416115b90505b92915050565b60008161021c565b600062ffffff80841690831614610219565b60405163c9e66e2960e01b815262ffffff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af4158015610293573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061021c919061055d565b6000610165816000805b604051632b10f60d60e21b815260ff84166004820152600090819073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af4158015610318573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061033c9190610578565b604051632b10f60d60e21b815260ff8616600482015290915060009073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af4158015610394573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103b89190610578565b604051632b10f60d60e21b815260ff8616600482015290915060009073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af4158015610410573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104349190610578565b905080610449600884901b601086901b610591565b6104539190610591565b979650505050505050565b60008060006060848603121561047357600080fd5b505081359360208301359350604090920135919050565b803562ffffff8116811461049d57600080fd5b919050565b6000602082840312156104b457600080fd5b6102198261048a565b600080604083850312156104d057600080fd5b6104d98361048a565b91506104e76020840161048a565b90509250929050565b60006020828403121561050257600080fd5b5035919050565b805160ff8116811461049d57600080fd5b60008060006060848603121561052f57600080fd5b61053884610509565b925061054660208501610509565b915061055460408501610509565b90509250925092565b60006020828403121561056f57600080fd5b61021982610509565b60006020828403121561058a57600080fd5b5051919050565b8082018082111561021c57634e487b7160e01b600052601160045260246000fdfea264697066735822122007961488b058c17d9c7d38ca31e3ae2460b413b26a3833789c46f412ab81aac964736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b50610544806100206000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80636a3dc0ee1161005b5780636a3dc0ee146100ed57806389818c3c1461011057806389d5976814610135578063e038c6251461014857600080fd5b80630f40f5951461008257806312cf04de146100a357806364d4e5d8146100b6575b600080fd5b61008a61015b565b60405162ffffff90911681526020015b60405180910390f35b61008a6100b13660046103ce565b6101cf565b6100c96100c436600461040e565b61025c565b6040805160ff9485168152928416602084015292169181019190915260600161009a565b6101006100fb36600461042b565b6102e8565b604051901515815260200161009a565b61012361011e366004610464565b6102fd565b60405160ff909116815260200161009a565b61010061014336600461042b565b61037d565b61012361015636600461040e565b61038f565b600073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af41580156101a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ca919061047d565b905090565b604051632efe011360e01b815260048101849052602481018390526044810182905260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610230573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610254919061047d565b949350505050565b6040516324d3888d60e11b815262ffffff821660048201526000908190819073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__906349a7111a90602401606060405180830381865af41580156102b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102db91906104b0565b9250925092509193909250565b600062ffffff808316908416115b9392505050565b604051632392b61b60e21b815260ff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90638e4ad86c906024015b602060405180830381865af4158015610353573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037791906104f3565b92915050565b600062ffffff808416908316146102f6565b60405163c9e66e2960e01b815262ffffff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401610336565b6000806000606084860312156103e357600080fd5b505081359360208301359350604090920135919050565b62ffffff8116811461040b57600080fd5b50565b60006020828403121561042057600080fd5b81356102f6816103fa565b6000806040838503121561043e57600080fd5b8235610449816103fa565b91506020830135610459816103fa565b809150509250929050565b60006020828403121561047657600080fd5b5035919050565b60006020828403121561048f57600080fd5b81516102f6816103fa565b805160ff811681146104ab57600080fd5b919050565b6000806000606084860312156104c557600080fd5b6104ce8461049a565b92506104dc6020850161049a565b91506104ea6040850161049a565b90509250925092565b60006020828403121561050557600080fd5b6102f68261049a56fea2646970667358221220e7ab9e648ca57bf5a21b568f2de7fdc9394255326f72ded8733945ad082848b564736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80636a3dc0ee1161005b5780636a3dc0ee146100ed57806389818c3c1461011057806389d5976814610135578063e038c6251461014857600080fd5b80630f40f5951461008257806312cf04de146100a357806364d4e5d8146100b6575b600080fd5b61008a61015b565b60405162ffffff90911681526020015b60405180910390f35b61008a6100b13660046103ce565b6101cf565b6100c96100c436600461040e565b61025c565b6040805160ff9485168152928416602084015292169181019190915260600161009a565b6101006100fb36600461042b565b6102e8565b604051901515815260200161009a565b61012361011e366004610464565b6102fd565b60405160ff909116815260200161009a565b61010061014336600461042b565b61037d565b61012361015636600461040e565b61038f565b600073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af41580156101a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ca919061047d565b905090565b604051632efe011360e01b815260048101849052602481018390526044810182905260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610230573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610254919061047d565b949350505050565b6040516324d3888d60e11b815262ffffff821660048201526000908190819073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__906349a7111a90602401606060405180830381865af41580156102b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102db91906104b0565b9250925092509193909250565b600062ffffff808316908416115b9392505050565b604051632392b61b60e21b815260ff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90638e4ad86c906024015b602060405180830381865af4158015610353573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037791906104f3565b92915050565b600062ffffff808416908316146102f6565b60405163c9e66e2960e01b815262ffffff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401610336565b6000806000606084860312156103e357600080fd5b505081359360208301359350604090920135919050565b62ffffff8116811461040b57600080fd5b50565b60006020828403121561042057600080fd5b81356102f6816103fa565b6000806040838503121561043e57600080fd5b8235610449816103fa565b91506020830135610459816103fa565b809150509250929050565b60006020828403121561047657600080fd5b5035919050565b60006020828403121561048f57600080fd5b81516102f6816103fa565b805160ff811681146104ab57600080fd5b919050565b6000806000606084860312156104c557600080fd5b6104ce8461049a565b92506104dc6020850161049a565b91506104ea6040850161049a565b90509250925092565b60006020828403121561050557600080fd5b6102f68261049a56fea2646970667358221220e7ab9e648ca57bf5a21b568f2de7fdc9394255326f72ded8733945ad082848b564736f6c63430008140033",
   "linkReferences": {
     "contracts/types/Version.sol": {
       "VersionLib": [
         {
           "length": 20,
-          "start": 448
+          "start": 383
         },
         {
           "length": 20,
-          "start": 633
-        }
-      ],
-      "VersionPartLib": [
+          "start": 534
+        },
         {
           "length": 20,
-          "start": 766
+          "start": 669
         },
         {
           "length": 20,
-          "start": 890
+          "start": 824
         },
         {
           "length": 20,
-          "start": 1014
+          "start": 972
         }
       ]
     }
@@ -196,25 +194,23 @@
       "VersionLib": [
         {
           "length": 20,
-          "start": 416
+          "start": 351
         },
         {
           "length": 20,
-          "start": 601
-        }
-      ],
-      "VersionPartLib": [
+          "start": 502
+        },
         {
           "length": 20,
-          "start": 734
+          "start": 637
         },
         {
           "length": 20,
-          "start": 858
+          "start": 792
         },
         {
           "length": 20,
-          "start": 982
+          "start": 940
         }
       ]
     }

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

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

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

@@ -118,15 +118,15 @@
               "name": "activatedBy",
               "type": "address"
             },
-            {
-              "internalType": "Blocknumber",
-              "name": "activatedIn",
-              "type": "uint32"
-            },
             {
               "internalType": "Timestamp",
               "name": "activatedAt",
               "type": "uint40"
+            },
+            {
+              "internalType": "Blocknumber",
+              "name": "activatedIn",
+              "type": "uint32"
             }
           ],
           "internalType": "struct IVersionable.VersionInfo",
@@ -157,46 +157,30 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60806040523480156200001157600080fd5b506200001f60003362000025565b620005e8565b60006200003162000300565b90506200003e8162000316565b15620000a15760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b60648201526084015b60405180910390fd5b6001541562000161576001805460009190620000bf9082906200058c565b81548110620000d257620000d2620005a2565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050620001058282620003ba565b6200015f5760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b606482015260840162000098565b505b600180548082018255600091909152600a8082047fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf601805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b03808616602084015284169082015260608101620001ea4390565b63ffffffff1681526020014264ffffffffff90811690915262ffffff8084166000908152602081815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c01b0264ffffffffff60c01b1963ffffffff909716600160a01b026001600160c01b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d441990620002f39083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b6000620003116003600080620003cc565b905090565b62ffffff8116600090815260208190526040808220600101549051631bbffab160e21b8152600160a01b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156200038d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620003b39190620005b8565b1192915050565b62ffffff808216908316115b92915050565b604051632b10f60d60e21b815260ff84166004820152600090819073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af415801562000424573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200044a9190620005b8565b604051632b10f60d60e21b815260ff8616600482015290915060009073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af4158015620004a3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620004c99190620005b8565b604051632b10f60d60e21b815260ff8616600482015290915060009073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af415801562000522573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620005489190620005b8565b9050806200055f600884901b601086901b620005d2565b6200056b9190620005d2565b979650505050505050565b634e487b7160e01b600052601160045260246000fd5b81810381811115620003c657620003c662000576565b634e487b7160e01b600052603260045260246000fd5b600060208284031215620005cb57600080fd5b5051919050565b80820180821115620003c657620003c662000576565b61094f80620005f86000396000f3fe608060405234801561001057600080fd5b50600436106100625760003560e01c80630abd8434146100675780630d8e6e2c1461008f5780634d459c90146100ab578063946dfcfe1461011b5780639555c4db1461012c578063b88da75914610141575b600080fd5b61007a61007536600461081a565b610154565b60405190151581526020015b60405180910390f35b6100976101f5565b60405162ffffff9091168152602001610086565b6100be6100b936600461081a565b610209565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015163ffffffff169082015260809182015164ffffffffff169181019190915260a001610086565b600154604051908152602001610086565b61013f61013a366004610862565b610305565b005b61009761014f366004610895565b610313565b62ffffff8116600090815260208190526040808220600101549051631bbffab160e21b8152600160a01b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156101ca573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ee91906108ae565b1192915050565b600061020460036000806103a6565b905090565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915261023d82610154565b61028e5760405162461bcd60e51b815260206004820152601d60248201527f4552524f523a56524e2d3032303a56455253494f4e5f554e4b4e4f574e00000060448201526064015b60405180910390fd5b5062ffffff90811660009081526020818152604091829020825160a0810184528154948516815263010000009094046001600160a01b03908116928501929092526001015490811691830191909152600160a01b810463ffffffff166060830152600160c01b900464ffffffffff16608082015290565b61030f8282610543565b5050565b60015460009082106103675760405162461bcd60e51b815260206004820152601d60248201527f4552524f523a56524e2d3031303a494e4445585f544f4f5f4c415247450000006044820152606401610285565b6001828154811061037a5761037a6108c7565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b604051632b10f60d60e21b815260ff84166004820152600090819073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af41580156103fd573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061042191906108ae565b604051632b10f60d60e21b815260ff8616600482015290915060009073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af4158015610479573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061049d91906108ae565b604051632b10f60d60e21b815260ff8616600482015290915060009073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af41580156104f5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061051991906108ae565b90508061052e600884901b601086901b6108f3565b61053891906108f3565b979650505050505050565b600061054d6101f5565b905061055881610154565b156105b55760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b6064820152608401610285565b6001541561066b5760018054600091906105d0908290610906565b815481106105e0576105e06108c7565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff1690506106118282610808565b6106695760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b6064820152608401610285565b505b600180548082018255600091909152600a8082047fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf601805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038086166020840152841690820152606081016106f34390565b63ffffffff1681526020014264ffffffffff90811690915262ffffff8084166000908152602081815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c01b0264ffffffffff60c01b1963ffffffff909716600160a01b026001600160c01b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d4419906107fb9083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b62ffffff808216908316115b92915050565b60006020828403121561082c57600080fd5b813562ffffff8116811461083f57600080fd5b9392505050565b80356001600160a01b038116811461085d57600080fd5b919050565b6000806040838503121561087557600080fd5b61087e83610846565b915061088c60208401610846565b90509250929050565b6000602082840312156108a757600080fd5b5035919050565b6000602082840312156108c057600080fd5b5051919050565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b80820180821115610814576108146108dd565b81810381811115610814576108146108dd56fea264697066735822122075dcdab95ff1a62e9286ed07cfd806cdaa5ae715612809a07e2311029db7c1ad64736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100625760003560e01c80630abd8434146100675780630d8e6e2c1461008f5780634d459c90146100ab578063946dfcfe1461011b5780639555c4db1461012c578063b88da75914610141575b600080fd5b61007a61007536600461081a565b610154565b60405190151581526020015b60405180910390f35b6100976101f5565b60405162ffffff9091168152602001610086565b6100be6100b936600461081a565b610209565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015163ffffffff169082015260809182015164ffffffffff169181019190915260a001610086565b600154604051908152602001610086565b61013f61013a366004610862565b610305565b005b61009761014f366004610895565b610313565b62ffffff8116600090815260208190526040808220600101549051631bbffab160e21b8152600160a01b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156101ca573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ee91906108ae565b1192915050565b600061020460036000806103a6565b905090565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915261023d82610154565b61028e5760405162461bcd60e51b815260206004820152601d60248201527f4552524f523a56524e2d3032303a56455253494f4e5f554e4b4e4f574e00000060448201526064015b60405180910390fd5b5062ffffff90811660009081526020818152604091829020825160a0810184528154948516815263010000009094046001600160a01b03908116928501929092526001015490811691830191909152600160a01b810463ffffffff166060830152600160c01b900464ffffffffff16608082015290565b61030f8282610543565b5050565b60015460009082106103675760405162461bcd60e51b815260206004820152601d60248201527f4552524f523a56524e2d3031303a494e4445585f544f4f5f4c415247450000006044820152606401610285565b6001828154811061037a5761037a6108c7565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b604051632b10f60d60e21b815260ff84166004820152600090819073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af41580156103fd573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061042191906108ae565b604051632b10f60d60e21b815260ff8616600482015290915060009073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af4158015610479573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061049d91906108ae565b604051632b10f60d60e21b815260ff8616600482015290915060009073__$9dab98ad7ae1a426029e5739f922230a41$__9063ac43d83490602401602060405180830381865af41580156104f5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061051991906108ae565b90508061052e600884901b601086901b6108f3565b61053891906108f3565b979650505050505050565b600061054d6101f5565b905061055881610154565b156105b55760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b6064820152608401610285565b6001541561066b5760018054600091906105d0908290610906565b815481106105e0576105e06108c7565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff1690506106118282610808565b6106695760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b6064820152608401610285565b505b600180548082018255600091909152600a8082047fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf601805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038086166020840152841690820152606081016106f34390565b63ffffffff1681526020014264ffffffffff90811690915262ffffff8084166000908152602081815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c01b0264ffffffffff60c01b1963ffffffff909716600160a01b026001600160c01b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d4419906107fb9083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b62ffffff808216908316115b92915050565b60006020828403121561082c57600080fd5b813562ffffff8116811461083f57600080fd5b9392505050565b80356001600160a01b038116811461085d57600080fd5b919050565b6000806040838503121561087557600080fd5b61087e83610846565b915061088c60208401610846565b90509250929050565b6000602082840312156108a757600080fd5b5035919050565b6000602082840312156108c057600080fd5b5051919050565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b80820180821115610814576108146108dd565b81810381811115610814576108146108dd56fea264697066735822122075dcdab95ff1a62e9286ed07cfd806cdaa5ae715612809a07e2311029db7c1ad64736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b5061001c600033610021565b6104a4565b600061002b6102eb565b905061003681610375565b156100985760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b60648201526084015b60405180910390fd5b6001541561014e5760018054600091906100b3908290610428565b815481106100c3576100c3610449565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff1690506100f48282610416565b61014c5760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b606482015260840161008f565b505b600180548082018255600091909152600a8082047fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf601805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038086166020840152841690820152606081016101d64290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602081815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d4419906102de9083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af415801561034c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610370919061045f565b905090565b62ffffff8116600090815260208190526040808220600101549051631bbffab160e21b8152600160c81b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156103eb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061040f919061048b565b1192915050565b62ffffff808216908316115b92915050565b8181038181111561042257634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b60006020828403121561047157600080fd5b815162ffffff8116811461048457600080fd5b9392505050565b60006020828403121561049d57600080fd5b5051919050565b61078a806104b36000396000f3fe608060405234801561001057600080fd5b50600436106100625760003560e01c80630abd8434146100675780630d8e6e2c1461008f5780634d459c90146100ab578063946dfcfe146101b85780639555c4db146101c9578063b88da759146101de575b600080fd5b61007a61007536600461065b565b6101f1565b60405190151581526020015b60405180910390f35b610097610292565b60405162ffffff9091168152602001610086565b61015b6100b936600461065b565b6040805160a0810182526000808252602082018190529181018290526060810182905260808101919091525062ffffff90811660009081526020818152604091829020825160a0810184528154948516815263010000009094046001600160a01b03908116928501929092526001015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a001610086565b600154604051908152602001610086565b6101dc6101d736600461069b565b61031c565b005b6100976101ec3660046106ce565b61032a565b62ffffff8116600090815260208190526040808220600101549051631bbffab160e21b8152600160c81b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af4158015610267573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028b91906106e7565b1192915050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156102f3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103179190610700565b905090565b610326828261036b565b5050565b60006001828154811061033f5761033f61071d565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6000610375610292565b9050610380816101f1565b156103e25760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b60648201526084015b60405180910390fd5b600154156104985760018054600091906103fd908290610733565b8154811061040d5761040d61071d565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff16905061043e8282610635565b6104965760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b60648201526084016103d9565b505b600180548082018255600091909152600a8082047fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf601805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038086166020840152841690820152606081016105204290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602081815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d4419906106289083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b62ffffff808216908316115b92915050565b62ffffff8116811461065857600080fd5b50565b60006020828403121561066d57600080fd5b813561067881610647565b9392505050565b80356001600160a01b038116811461069657600080fd5b919050565b600080604083850312156106ae57600080fd5b6106b78361067f565b91506106c56020840161067f565b90509250929050565b6000602082840312156106e057600080fd5b5035919050565b6000602082840312156106f957600080fd5b5051919050565b60006020828403121561071257600080fd5b815161067881610647565b634e487b7160e01b600052603260045260246000fd5b8181038181111561064157634e487b7160e01b600052601160045260246000fdfea26469706673582212205748938f581545f49967b579140bce52039bc11bd23ce00d0e3ae960810d59a564736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100625760003560e01c80630abd8434146100675780630d8e6e2c1461008f5780634d459c90146100ab578063946dfcfe146101b85780639555c4db146101c9578063b88da759146101de575b600080fd5b61007a61007536600461065b565b6101f1565b60405190151581526020015b60405180910390f35b610097610292565b60405162ffffff9091168152602001610086565b61015b6100b936600461065b565b6040805160a0810182526000808252602082018190529181018290526060810182905260808101919091525062ffffff90811660009081526020818152604091829020825160a0810184528154948516815263010000009094046001600160a01b03908116928501929092526001015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a001610086565b600154604051908152602001610086565b6101dc6101d736600461069b565b61031c565b005b6100976101ec3660046106ce565b61032a565b62ffffff8116600090815260208190526040808220600101549051631bbffab160e21b8152600160c81b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af4158015610267573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028b91906106e7565b1192915050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156102f3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103179190610700565b905090565b610326828261036b565b5050565b60006001828154811061033f5761033f61071d565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6000610375610292565b9050610380816101f1565b156103e25760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b60648201526084015b60405180910390fd5b600154156104985760018054600091906103fd908290610733565b8154811061040d5761040d61071d565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff16905061043e8282610635565b6104965760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b60648201526084016103d9565b505b600180548082018255600091909152600a8082047fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf601805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038086166020840152841690820152606081016105204290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602081815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d4419906106289083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b62ffffff808216908316115b92915050565b62ffffff8116811461065857600080fd5b50565b60006020828403121561066d57600080fd5b813561067881610647565b9392505050565b80356001600160a01b038116811461069657600080fd5b919050565b600080604083850312156106ae57600080fd5b6106b78361067f565b91506106c56020840161067f565b90509250929050565b6000602082840312156106e057600080fd5b5035919050565b6000602082840312156106f957600080fd5b5051919050565b60006020828403121561071257600080fd5b815161067881610647565b634e487b7160e01b600052603260045260246000fd5b8181038181111561064157634e487b7160e01b600052601160045260246000fdfea26469706673582212205748938f581545f49967b579140bce52039bc11bd23ce00d0e3ae960810d59a564736f6c63430008140033",
   "linkReferences": {
     "contracts/types/Blocknumber.sol": {
       "BlocknumberLib": [
         {
           "length": 20,
-          "start": 850
+          "start": 945
         },
         {
           "length": 20,
-          "start": 1928
+          "start": 1760
         }
       ]
     },
     "contracts/types/Version.sol": {
-      "VersionPartLib": [
-        {
-          "length": 20,
-          "start": 1001
-        },
-        {
-          "length": 20,
-          "start": 1128
-        },
-        {
-          "length": 20,
-          "start": 1255
-        },
-        {
-          "length": 20,
-          "start": 2491
-        },
+      "VersionLib": [
         {
           "length": 20,
-          "start": 2615
+          "start": 786
         },
         {
           "length": 20,
-          "start": 2739
+          "start": 1900
         }
       ]
     }
@@ -206,23 +190,15 @@
       "BlocknumberLib": [
         {
           "length": 20,
-          "start": 400
+          "start": 557
         }
       ]
     },
     "contracts/types/Version.sol": {
-      "VersionPartLib": [
-        {
-          "length": 20,
-          "start": 963
-        },
-        {
-          "length": 20,
-          "start": 1087
-        },
+      "VersionLib": [
         {
           "length": 20,
-          "start": 1211
+          "start": 697
         }
       ]
     }

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

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