@ensuro/core 2.3.0 → 2.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/build/contracts/ERC4626AssetManager.sol/ERC4626AssetManager.json +2 -2
  2. package/build/contracts/EToken.sol/EToken.json +2 -2
  3. package/build/contracts/PremiumsAccount.sol/PremiumsAccount.json +41 -2
  4. package/build/contracts/TimeScaled.sol/TimeScaled.json +2 -2
  5. package/build/contracts/mocks/FixedRateVault.sol/FixedRateVault.json +2 -2
  6. package/build/contracts/mocks/InterfaceIdCalculator.sol/InterfaceIdCalculator.json +2 -2
  7. package/contracts/ERC4626AssetManager.sol +1 -1
  8. package/contracts/LiquidityThresholdAssetManager.sol +7 -0
  9. package/contracts/PremiumsAccount.sol +61 -56
  10. package/contracts/Reserve.sol +5 -0
  11. package/contracts/TimeScaled.sol +4 -0
  12. package/contracts/interfaces/IAssetManager.sol +5 -0
  13. package/package.json +1 -1
package/build/contracts/mocks/FixedRateVault.sol/FixedRateVault.json CHANGED
@@ -729,8 +729,8 @@
729
729
  "type": "function"
730
730
  }
731
731
  ],
732
- "bytecode": "0x60c06040523480156200001157600080fd5b506040516200231a3803806200231a83398101604081905262000034916200028b565b8184846003620000458382620003ad565b506004620000548282620003ad565b5050506000806200006b83620000ba60201b60201c565b91509150816200007d5760126200007f565b805b60ff1660a05250506001600160a01b03166080526005819055620000b060066200019f602090811b6200083717901c565b50505050620004b1565b60408051600481526024810182526020810180516001600160e01b031663313ce56760e01b17905290516000918291829182916001600160a01b03871691620001039162000479565b600060405180830381855afa9150503d806000811462000140576040519150601f19603f3d011682016040523d82523d6000602084013e62000145565b606091505b50915091508180156200015a57506020815110155b15620001925760008180602001905181019062000178919062000497565b905060ff811162000190576001969095509350505050565b505b5060009485945092505050565b63ffffffff4216600160e01b026b033b2e3c9fd0803ce8000000179055565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620001f1578181015183820152602001620001d7565b50506000910152565b600082601f8301126200020c57600080fd5b81516001600160401b0380821115620002295762000229620001be565b604051601f8301601f19908116603f01168101908282118183101715620002545762000254620001be565b816040528381528660208588010111156200026e57600080fd5b62000281846020830160208901620001d4565b9695505050505050565b60008060008060808587031215620002a257600080fd5b84516001600160401b0380821115620002ba57600080fd5b620002c888838901620001fa565b95506020870151915080821115620002df57600080fd5b50620002ee87828801620001fa565b604087015190945090506001600160a01b03811681146200030e57600080fd5b6060959095015193969295505050565b600181811c908216806200033357607f821691505b6020821081036200035457634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620003a857600081815260208120601f850160051c81016020861015620003835750805b601f850160051c820191505b81811015620003a4578281556001016200038f565b5050505b505050565b81516001600160401b03811115620003c957620003c9620001be565b620003e181620003da84546200031e565b846200035a565b602080601f831160018114620004195760008415620004005750858301515b600019600386901b1c1916600185901b178555620003a4565b600085815260208120601f198616915b828110156200044a5788860151825594840194600190910190840162000429565b5085821015620004695787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b600082516200048d818460208701620001d4565b9190910192915050565b600060208284031215620004aa57600080fd5b5051919050565b60805160a051611e27620004f3600039600061056a01526000818161029a01528181610cb401528181610d49015281816110b601526111760152611e276000f3fe608060405234801561001057600080fd5b50600436106101da5760003560e01c806386de9e4f11610104578063ba087652116100a2578063ce96cb7711610071578063ce96cb77146103f6578063d905777e14610409578063dd62ed3e1461041c578063ef8b30f7146103d057600080fd5b8063ba087652146103bd578063c63d75b6146102d7578063c6e6f592146103d0578063c7361ed2146103e357600080fd5b8063a457c2d7116100de578063a457c2d714610371578063a9059cbb14610384578063b3d7f6b914610397578063b460af94146103aa57600080fd5b806386de9e4f1461033357806394bf804d1461035657806395d89b411461036957600080fd5b8063313ce5671161017c5780634cdad5061161014b5780634cdad5061461020f5780636e553f65146102ec57806370a08231146102ff5780637fb1ad621461032857600080fd5b8063313ce5671461027357806338d52e0f1461028d57806339509351146102c4578063402d267d146102d757600080fd5b8063095ea7b3116101b8578063095ea7b3146102225780630a28a4771461024557806318160ddd1461025857806323b872dd1461026057600080fd5b806301e1d114146101df57806306fdde03146101fa57806307a2d13a1461020f575b600080fd5b6101e761042f565b6040519081526020015b60405180910390f35b610202610472565b6040516101f1919061196c565b6101e761021d36600461199f565b610504565b6102356102303660046119cf565b610517565b60405190151581526020016101f1565b6101e761025336600461199f565b61052f565b6002546101e7565b61023561026e3660046119f9565b61053c565b61027b610562565b60405160ff90911681526020016101f1565b6040516001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001681526020016101f1565b6102356102d23660046119cf565b61058e565b6101e76102e5366004611a35565b5060001990565b6101e76102fa366004611a50565b6105b0565b6101e761030d366004611a35565b6001600160a01b031660009081526020819052604090205490565b60075460ff16610235565b610354610341366004611a8a565b6007805460ff1916911515919091179055565b005b6101e7610364366004611a50565b6105ca565b6102026105e4565b61023561037f3660046119cf565b6105f3565b6102356103923660046119cf565b610679565b6101e76103a536600461199f565b610687565b6101e76103b8366004611aa7565b610694565b6101e76103cb366004611aa7565b610710565b6101e76103de36600461199f565b610784565b6103546103f136600461199f565b610791565b6101e7610404366004611a35565b6107ca565b6101e7610417366004611a35565b6107ee565b6101e761042a366004611ae3565b61080c565b60075460009060ff161561045e5760405162461bcd60e51b815260040161045590611b0d565b60405180910390fd5b60055461046d90600690610856565b905090565b60606003805461048190611b36565b80601f01602080910402602001604051908101604052809291908181526020018280546104ad90611b36565b80156104fa5780601f106104cf576101008083540402835291602001916104fa565b820191906000526020600020905b8154815290600101906020018083116104dd57829003601f168201915b5050505050905090565b600061051182600061088e565b92915050565b6000336105258185856108c8565b5060019392505050565b60006105118260016109ec565b60003361054a858285610a1c565b610555858585610a96565b60019150505b9392505050565b600061046d817f0000000000000000000000000000000000000000000000000000000000000000611b80565b6000336105258185856105a1838361080c565b6105ab9190611b99565b6108c8565b6000806105bc84610784565b905061055b33848684610c3a565b6000806105d684610687565b905061055b33848387610c3a565b60606004805461048190611b36565b60003381610601828661080c565b9050838110156106615760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b6064820152608401610455565b61066e82868684036108c8565b506001949350505050565b600033610525818585610a96565b600061051182600161088e565b600061069f826107ca565b8411156106ee5760405162461bcd60e51b815260206004820152601f60248201527f455243343632363a207769746864726177206d6f7265207468616e206d6178006044820152606401610455565b60006106f98561052f565b90506107083385858885610c7b565b949350505050565b600061071b826107ee565b84111561076a5760405162461bcd60e51b815260206004820152601d60248201527f455243343632363a2072656465656d206d6f7265207468616e206d61780000006044820152606401610455565b600061077585610504565b90506107083385858489610c7b565b60006105118260006109ec565b60008113156107af576005546107ab906006908390610df5565b5050565b6107ab6107bb82611bac565b60055460069190610e75565b50565b6001600160a01b03811660009081526020819052604081205461051190600061088e565b6001600160a01b038116600090815260208190526040812054610511565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b63ffffffff4216600160e01b026b033b2e3c9fd0803ce8000000179055565b600061055b6108896108688585610f25565b855461088390600160701b90046001600160701b0316610fcf565b90610fea565b61102e565b600061055b61089b61042f565b6108a6906001611b99565b6108b26000600a611cac565b6002546108bf9190611b99565b85919085611051565b6001600160a01b03831661092a5760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b6064820152608401610455565b6001600160a01b03821661098b5760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b6064820152608401610455565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b600061055b6109fc82600a611cac565b600254610a099190611b99565b610a1161042f565b6108bf906001611b99565b6000610a28848461080c565b90506000198114610a905781811015610a835760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e63650000006044820152606401610455565b610a9084848484036108c8565b50505050565b6001600160a01b038316610afa5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b6064820152608401610455565b6001600160a01b038216610b5c5760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b6064820152608401610455565b6001600160a01b03831660009081526020819052604090205481811015610bd45760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b6064820152608401610455565b6001600160a01b03848116600081815260208181526040808320878703905593871680835291849020805487019055925185815290927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a3610a90565b60075460ff1615610c5d5760405162461bcd60e51b815260040161045590611b0d565b600554610c6e906006908490610df5565b50610a90848484846110b1565b60075460ff1615610c9e5760405162461bcd60e51b815260040161045590611b0d565b600554610caf906006908490610e75565b5060007f00000000000000000000000000000000000000000000000000000000000000006040516370a0823160e01b81523060048201526001600160a01b0391909116906370a0823190602401602060405180830381865afa158015610d19573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d3d9190611cbb565b905082811015610de0577f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166340c10f1930610d818487611cd4565b6040516001600160e01b031960e085901b1681526001600160a01b0390921660048301526024820152604401600060405180830381600087803b158015610dc757600080fd5b505af1158015610ddb573d6000803e3d6000fd5b505050505b610ded8686868686611143565b505050505050565b6000610e018483611203565b6000610e0d85856112a1565b9050610e18816112c6565b6001600160601b031685600001600e8282829054906101000a90046001600160701b0316610e469190611ce7565b92506101000a8154816001600160701b0302191690836001600160701b03160217905550809150509392505050565b6000610e818483611203565b6000610e8d85856112a1565b9050610e98816112c6565b6001600160601b031685600001600e8282829054906101000a90046001600160701b0316610ec69190611d0e565b82546101009290920a6001600160701b038181021990931691831602179091558654600160701b90041660000390506107085784546dffffffffffffffffffffffffffff19166b033b2e3c9fd0803ce800000017855590509392505050565b8154600090429063ffffffff808316600160e01b9092041610610f5457505081546001600160701b0316610511565b8354600090610f7090600160e01b900463ffffffff1683611d2e565b63ffffffff169050610fc66b033b2e3c9fd0803ce80000006301e1338083610f9788610fcf565b610fa19190611d4b565b610fab9190611d80565b610fb59190611b99565b86546001600160701b031690610fea565b95945050505050565b633b9aca008181029081048214610fe557600080fd5b919050565b600081156b019d971e4fe8401e74000000198390048411151761100c57600080fd5b506b033b2e3c9fd0803ce800000091026b019d971e4fe8401e74000000010490565b633b9aca00808204908206631dcd6500811061104b576001820191505b50919050565b60008061105f868686611332565b9050600183600281111561107557611075611da2565b14801561109257506000848061108d5761108d611d6a565b868809115b15610fc6576110a2600182611b99565b9695505050505050565b505050565b6110dd7f000000000000000000000000000000000000000000000000000000000000000085308561141c565b6110e78382611487565b826001600160a01b0316846001600160a01b03167fdcbc1c05240f31ff3ad067ef1ee35ce4997762752e3a095284754544f4c709d78484604051611135929190918252602082015260400190565b60405180910390a350505050565b826001600160a01b0316856001600160a01b03161461116757611167838683610a1c565b6111718382611546565b61119c7f00000000000000000000000000000000000000000000000000000000000000008584611678565b826001600160a01b0316846001600160a01b0316866001600160a01b03167ffbde797d201c681b91056529119e0b02407c7bb96a4a2c75c01fc9667232c8db85856040516111f4929190918252602082015260400190565b60405180910390a45050505050565b815463ffffffff428116600160e01b909204161061121f575050565b8154600160701b90046001600160701b03166000036112575781546001600160e01b0316600160e01b4263ffffffff16021782555050565b6112696112648383610f25565b6116a8565b82546001600160701b03919091166dffffffffffffffffffffffffffff60701b90911617600160e01b4263ffffffff16021790915550565b815460009061055b90610889906001600160701b03166112c085610fcf565b90611711565b60006001600160601b0382111561132e5760405162461bcd60e51b815260206004820152602660248201527f53616665436173743a2076616c756520646f65736e27742066697420696e203960448201526536206269747360d01b6064820152608401610455565b5090565b600080806000198587098587029250828110838203039150508060000361136c5783828161136257611362611d6a565b049250505061055b565b8084116113b35760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b6044820152606401610455565b60008486880960026001871981018816978890046003810283188082028403028082028403028082028403028082028403028082028403029081029092039091026000889003889004909101858311909403939093029303949094049190911702949350505050565b6040516001600160a01b0380851660248301528316604482015260648101829052610a909085906323b872dd60e01b906084015b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b031990931692909217909152611750565b6001600160a01b0382166114dd5760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f2061646472657373006044820152606401610455565b80600260008282546114ef9190611b99565b90915550506001600160a01b038216600081815260208181526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b6001600160a01b0382166115a65760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b6064820152608401610455565b6001600160a01b0382166000908152602081905260409020548181101561161a5760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b6064820152608401610455565b6001600160a01b0383166000818152602081815260408083208686039055600280548790039055518581529192917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a3505050565b6040516001600160a01b0383166024820152604481018290526110ac90849063a9059cbb60e01b90606401611450565b60006001600160701b0382111561132e5760405162461bcd60e51b815260206004820152602760248201527f53616665436173743a2076616c756520646f65736e27742066697420696e20316044820152663132206269747360c81b6064820152608401610455565b600081156b033b2e3c9fd0803ce80000006002840419048411171561173557600080fd5b506b033b2e3c9fd0803ce80000009190910260028204010490565b60006117a5826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166118259092919063ffffffff16565b90508051600014806117c65750808060200190518101906117c69190611db8565b6110ac5760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152608401610455565b6060610708848460008585600080866001600160a01b0316858760405161184c9190611dd5565b60006040518083038185875af1925050503d8060008114611889576040519150601f19603f3d011682016040523d82523d6000602084013e61188e565b606091505b509150915061189f878383876118aa565b979650505050505050565b60608315611919578251600003611912576001600160a01b0385163b6119125760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610455565b5081610708565b610708838381511561192e5781518083602001fd5b8060405162461bcd60e51b8152600401610455919061196c565b60005b8381101561196357818101518382015260200161194b565b50506000910152565b602081526000825180602084015261198b816040850160208701611948565b601f01601f19169190910160400192915050565b6000602082840312156119b157600080fd5b5035919050565b80356001600160a01b0381168114610fe557600080fd5b600080604083850312156119e257600080fd5b6119eb836119b8565b946020939093013593505050565b600080600060608486031215611a0e57600080fd5b611a17846119b8565b9250611a25602085016119b8565b9150604084013590509250925092565b600060208284031215611a4757600080fd5b61055b826119b8565b60008060408385031215611a6357600080fd5b82359150611a73602084016119b8565b90509250929050565b80151581146107c757600080fd5b600060208284031215611a9c57600080fd5b813561055b81611a7c565b600080600060608486031215611abc57600080fd5b83359250611acc602085016119b8565b9150611ada604085016119b8565b90509250925092565b60008060408385031215611af657600080fd5b611aff836119b8565b9150611a73602084016119b8565b6020808252600f908201526e2b30bab63a1034b990313937b5b2b760891b604082015260600190565b600181811c90821680611b4a57607f821691505b60208210810361104b57634e487b7160e01b600052602260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b60ff818116838216019081111561051157610511611b6a565b8082018082111561051157610511611b6a565b6000600160ff1b8201611bc157611bc1611b6a565b5060000390565b600181815b80851115611c03578160001904821115611be957611be9611b6a565b80851615611bf657918102915b93841c9390800290611bcd565b509250929050565b600082611c1a57506001610511565b81611c2757506000610511565b8160018114611c3d5760028114611c4757611c63565b6001915050610511565b60ff841115611c5857611c58611b6a565b50506001821b610511565b5060208310610133831016604e8410600b8410161715611c86575081810a610511565b611c908383611bc8565b8060001904821115611ca457611ca4611b6a565b029392505050565b600061055b60ff841683611c0b565b600060208284031215611ccd57600080fd5b5051919050565b8181038181111561051157610511611b6a565b6001600160701b03818116838216019080821115611d0757611d07611b6a565b5092915050565b6001600160701b03828116828216039080821115611d0757611d07611b6a565b63ffffffff828116828216039080821115611d0757611d07611b6a565b6000816000190483118215151615611d6557611d65611b6a565b500290565b634e487b7160e01b600052601260045260246000fd5b600082611d9d57634e487b7160e01b600052601260045260246000fd5b500490565b634e487b7160e01b600052602160045260246000fd5b600060208284031215611dca57600080fd5b815161055b81611a7c565b60008251611de7818460208701611948565b919091019291505056fea2646970667358221220445ad5b5c23d84fff3499bc5b53eedbdf2c94ca2fb9bb7ce7e122893444821f064736f6c63430008100033",
733
- "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106101da5760003560e01c806386de9e4f11610104578063ba087652116100a2578063ce96cb7711610071578063ce96cb77146103f6578063d905777e14610409578063dd62ed3e1461041c578063ef8b30f7146103d057600080fd5b8063ba087652146103bd578063c63d75b6146102d7578063c6e6f592146103d0578063c7361ed2146103e357600080fd5b8063a457c2d7116100de578063a457c2d714610371578063a9059cbb14610384578063b3d7f6b914610397578063b460af94146103aa57600080fd5b806386de9e4f1461033357806394bf804d1461035657806395d89b411461036957600080fd5b8063313ce5671161017c5780634cdad5061161014b5780634cdad5061461020f5780636e553f65146102ec57806370a08231146102ff5780637fb1ad621461032857600080fd5b8063313ce5671461027357806338d52e0f1461028d57806339509351146102c4578063402d267d146102d757600080fd5b8063095ea7b3116101b8578063095ea7b3146102225780630a28a4771461024557806318160ddd1461025857806323b872dd1461026057600080fd5b806301e1d114146101df57806306fdde03146101fa57806307a2d13a1461020f575b600080fd5b6101e761042f565b6040519081526020015b60405180910390f35b610202610472565b6040516101f1919061196c565b6101e761021d36600461199f565b610504565b6102356102303660046119cf565b610517565b60405190151581526020016101f1565b6101e761025336600461199f565b61052f565b6002546101e7565b61023561026e3660046119f9565b61053c565b61027b610562565b60405160ff90911681526020016101f1565b6040516001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001681526020016101f1565b6102356102d23660046119cf565b61058e565b6101e76102e5366004611a35565b5060001990565b6101e76102fa366004611a50565b6105b0565b6101e761030d366004611a35565b6001600160a01b031660009081526020819052604090205490565b60075460ff16610235565b610354610341366004611a8a565b6007805460ff1916911515919091179055565b005b6101e7610364366004611a50565b6105ca565b6102026105e4565b61023561037f3660046119cf565b6105f3565b6102356103923660046119cf565b610679565b6101e76103a536600461199f565b610687565b6101e76103b8366004611aa7565b610694565b6101e76103cb366004611aa7565b610710565b6101e76103de36600461199f565b610784565b6103546103f136600461199f565b610791565b6101e7610404366004611a35565b6107ca565b6101e7610417366004611a35565b6107ee565b6101e761042a366004611ae3565b61080c565b60075460009060ff161561045e5760405162461bcd60e51b815260040161045590611b0d565b60405180910390fd5b60055461046d90600690610856565b905090565b60606003805461048190611b36565b80601f01602080910402602001604051908101604052809291908181526020018280546104ad90611b36565b80156104fa5780601f106104cf576101008083540402835291602001916104fa565b820191906000526020600020905b8154815290600101906020018083116104dd57829003601f168201915b5050505050905090565b600061051182600061088e565b92915050565b6000336105258185856108c8565b5060019392505050565b60006105118260016109ec565b60003361054a858285610a1c565b610555858585610a96565b60019150505b9392505050565b600061046d817f0000000000000000000000000000000000000000000000000000000000000000611b80565b6000336105258185856105a1838361080c565b6105ab9190611b99565b6108c8565b6000806105bc84610784565b905061055b33848684610c3a565b6000806105d684610687565b905061055b33848387610c3a565b60606004805461048190611b36565b60003381610601828661080c565b9050838110156106615760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b6064820152608401610455565b61066e82868684036108c8565b506001949350505050565b600033610525818585610a96565b600061051182600161088e565b600061069f826107ca565b8411156106ee5760405162461bcd60e51b815260206004820152601f60248201527f455243343632363a207769746864726177206d6f7265207468616e206d6178006044820152606401610455565b60006106f98561052f565b90506107083385858885610c7b565b949350505050565b600061071b826107ee565b84111561076a5760405162461bcd60e51b815260206004820152601d60248201527f455243343632363a2072656465656d206d6f7265207468616e206d61780000006044820152606401610455565b600061077585610504565b90506107083385858489610c7b565b60006105118260006109ec565b60008113156107af576005546107ab906006908390610df5565b5050565b6107ab6107bb82611bac565b60055460069190610e75565b50565b6001600160a01b03811660009081526020819052604081205461051190600061088e565b6001600160a01b038116600090815260208190526040812054610511565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b63ffffffff4216600160e01b026b033b2e3c9fd0803ce8000000179055565b600061055b6108896108688585610f25565b855461088390600160701b90046001600160701b0316610fcf565b90610fea565b61102e565b600061055b61089b61042f565b6108a6906001611b99565b6108b26000600a611cac565b6002546108bf9190611b99565b85919085611051565b6001600160a01b03831661092a5760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b6064820152608401610455565b6001600160a01b03821661098b5760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b6064820152608401610455565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b600061055b6109fc82600a611cac565b600254610a099190611b99565b610a1161042f565b6108bf906001611b99565b6000610a28848461080c565b90506000198114610a905781811015610a835760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e63650000006044820152606401610455565b610a9084848484036108c8565b50505050565b6001600160a01b038316610afa5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b6064820152608401610455565b6001600160a01b038216610b5c5760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b6064820152608401610455565b6001600160a01b03831660009081526020819052604090205481811015610bd45760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b6064820152608401610455565b6001600160a01b03848116600081815260208181526040808320878703905593871680835291849020805487019055925185815290927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a3610a90565b60075460ff1615610c5d5760405162461bcd60e51b815260040161045590611b0d565b600554610c6e906006908490610df5565b50610a90848484846110b1565b60075460ff1615610c9e5760405162461bcd60e51b815260040161045590611b0d565b600554610caf906006908490610e75565b5060007f00000000000000000000000000000000000000000000000000000000000000006040516370a0823160e01b81523060048201526001600160a01b0391909116906370a0823190602401602060405180830381865afa158015610d19573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d3d9190611cbb565b905082811015610de0577f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166340c10f1930610d818487611cd4565b6040516001600160e01b031960e085901b1681526001600160a01b0390921660048301526024820152604401600060405180830381600087803b158015610dc757600080fd5b505af1158015610ddb573d6000803e3d6000fd5b505050505b610ded8686868686611143565b505050505050565b6000610e018483611203565b6000610e0d85856112a1565b9050610e18816112c6565b6001600160601b031685600001600e8282829054906101000a90046001600160701b0316610e469190611ce7565b92506101000a8154816001600160701b0302191690836001600160701b03160217905550809150509392505050565b6000610e818483611203565b6000610e8d85856112a1565b9050610e98816112c6565b6001600160601b031685600001600e8282829054906101000a90046001600160701b0316610ec69190611d0e565b82546101009290920a6001600160701b038181021990931691831602179091558654600160701b90041660000390506107085784546dffffffffffffffffffffffffffff19166b033b2e3c9fd0803ce800000017855590509392505050565b8154600090429063ffffffff808316600160e01b9092041610610f5457505081546001600160701b0316610511565b8354600090610f7090600160e01b900463ffffffff1683611d2e565b63ffffffff169050610fc66b033b2e3c9fd0803ce80000006301e1338083610f9788610fcf565b610fa19190611d4b565b610fab9190611d80565b610fb59190611b99565b86546001600160701b031690610fea565b95945050505050565b633b9aca008181029081048214610fe557600080fd5b919050565b600081156b019d971e4fe8401e74000000198390048411151761100c57600080fd5b506b033b2e3c9fd0803ce800000091026b019d971e4fe8401e74000000010490565b633b9aca00808204908206631dcd6500811061104b576001820191505b50919050565b60008061105f868686611332565b9050600183600281111561107557611075611da2565b14801561109257506000848061108d5761108d611d6a565b868809115b15610fc6576110a2600182611b99565b9695505050505050565b505050565b6110dd7f000000000000000000000000000000000000000000000000000000000000000085308561141c565b6110e78382611487565b826001600160a01b0316846001600160a01b03167fdcbc1c05240f31ff3ad067ef1ee35ce4997762752e3a095284754544f4c709d78484604051611135929190918252602082015260400190565b60405180910390a350505050565b826001600160a01b0316856001600160a01b03161461116757611167838683610a1c565b6111718382611546565b61119c7f00000000000000000000000000000000000000000000000000000000000000008584611678565b826001600160a01b0316846001600160a01b0316866001600160a01b03167ffbde797d201c681b91056529119e0b02407c7bb96a4a2c75c01fc9667232c8db85856040516111f4929190918252602082015260400190565b60405180910390a45050505050565b815463ffffffff428116600160e01b909204161061121f575050565b8154600160701b90046001600160701b03166000036112575781546001600160e01b0316600160e01b4263ffffffff16021782555050565b6112696112648383610f25565b6116a8565b82546001600160701b03919091166dffffffffffffffffffffffffffff60701b90911617600160e01b4263ffffffff16021790915550565b815460009061055b90610889906001600160701b03166112c085610fcf565b90611711565b60006001600160601b0382111561132e5760405162461bcd60e51b815260206004820152602660248201527f53616665436173743a2076616c756520646f65736e27742066697420696e203960448201526536206269747360d01b6064820152608401610455565b5090565b600080806000198587098587029250828110838203039150508060000361136c5783828161136257611362611d6a565b049250505061055b565b8084116113b35760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b6044820152606401610455565b60008486880960026001871981018816978890046003810283188082028403028082028403028082028403028082028403028082028403029081029092039091026000889003889004909101858311909403939093029303949094049190911702949350505050565b6040516001600160a01b0380851660248301528316604482015260648101829052610a909085906323b872dd60e01b906084015b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b031990931692909217909152611750565b6001600160a01b0382166114dd5760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f2061646472657373006044820152606401610455565b80600260008282546114ef9190611b99565b90915550506001600160a01b038216600081815260208181526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b6001600160a01b0382166115a65760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b6064820152608401610455565b6001600160a01b0382166000908152602081905260409020548181101561161a5760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b6064820152608401610455565b6001600160a01b0383166000818152602081815260408083208686039055600280548790039055518581529192917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a3505050565b6040516001600160a01b0383166024820152604481018290526110ac90849063a9059cbb60e01b90606401611450565b60006001600160701b0382111561132e5760405162461bcd60e51b815260206004820152602760248201527f53616665436173743a2076616c756520646f65736e27742066697420696e20316044820152663132206269747360c81b6064820152608401610455565b600081156b033b2e3c9fd0803ce80000006002840419048411171561173557600080fd5b506b033b2e3c9fd0803ce80000009190910260028204010490565b60006117a5826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166118259092919063ffffffff16565b90508051600014806117c65750808060200190518101906117c69190611db8565b6110ac5760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152608401610455565b6060610708848460008585600080866001600160a01b0316858760405161184c9190611dd5565b60006040518083038185875af1925050503d8060008114611889576040519150601f19603f3d011682016040523d82523d6000602084013e61188e565b606091505b509150915061189f878383876118aa565b979650505050505050565b60608315611919578251600003611912576001600160a01b0385163b6119125760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610455565b5081610708565b610708838381511561192e5781518083602001fd5b8060405162461bcd60e51b8152600401610455919061196c565b60005b8381101561196357818101518382015260200161194b565b50506000910152565b602081526000825180602084015261198b816040850160208701611948565b601f01601f19169190910160400192915050565b6000602082840312156119b157600080fd5b5035919050565b80356001600160a01b0381168114610fe557600080fd5b600080604083850312156119e257600080fd5b6119eb836119b8565b946020939093013593505050565b600080600060608486031215611a0e57600080fd5b611a17846119b8565b9250611a25602085016119b8565b9150604084013590509250925092565b600060208284031215611a4757600080fd5b61055b826119b8565b60008060408385031215611a6357600080fd5b82359150611a73602084016119b8565b90509250929050565b80151581146107c757600080fd5b600060208284031215611a9c57600080fd5b813561055b81611a7c565b600080600060608486031215611abc57600080fd5b83359250611acc602085016119b8565b9150611ada604085016119b8565b90509250925092565b60008060408385031215611af657600080fd5b611aff836119b8565b9150611a73602084016119b8565b6020808252600f908201526e2b30bab63a1034b990313937b5b2b760891b604082015260600190565b600181811c90821680611b4a57607f821691505b60208210810361104b57634e487b7160e01b600052602260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b60ff818116838216019081111561051157610511611b6a565b8082018082111561051157610511611b6a565b6000600160ff1b8201611bc157611bc1611b6a565b5060000390565b600181815b80851115611c03578160001904821115611be957611be9611b6a565b80851615611bf657918102915b93841c9390800290611bcd565b509250929050565b600082611c1a57506001610511565b81611c2757506000610511565b8160018114611c3d5760028114611c4757611c63565b6001915050610511565b60ff841115611c5857611c58611b6a565b50506001821b610511565b5060208310610133831016604e8410600b8410161715611c86575081810a610511565b611c908383611bc8565b8060001904821115611ca457611ca4611b6a565b029392505050565b600061055b60ff841683611c0b565b600060208284031215611ccd57600080fd5b5051919050565b8181038181111561051157610511611b6a565b6001600160701b03818116838216019080821115611d0757611d07611b6a565b5092915050565b6001600160701b03828116828216039080821115611d0757611d07611b6a565b63ffffffff828116828216039080821115611d0757611d07611b6a565b6000816000190483118215151615611d6557611d65611b6a565b500290565b634e487b7160e01b600052601260045260246000fd5b600082611d9d57634e487b7160e01b600052601260045260246000fd5b500490565b634e487b7160e01b600052602160045260246000fd5b600060208284031215611dca57600080fd5b815161055b81611a7c565b60008251611de7818460208701611948565b919091019291505056fea2646970667358221220445ad5b5c23d84fff3499bc5b53eedbdf2c94ca2fb9bb7ce7e122893444821f064736f6c63430008100033",
732
+ "bytecode": "0x60c06040523480156200001157600080fd5b506040516200231a3803806200231a83398101604081905262000034916200028b565b8184846003620000458382620003ad565b506004620000548282620003ad565b5050506000806200006b83620000ba60201b60201c565b91509150816200007d5760126200007f565b805b60ff1660a05250506001600160a01b03166080526005819055620000b060066200019f602090811b6200083717901c565b50505050620004b1565b60408051600481526024810182526020810180516001600160e01b031663313ce56760e01b17905290516000918291829182916001600160a01b03871691620001039162000479565b600060405180830381855afa9150503d806000811462000140576040519150601f19603f3d011682016040523d82523d6000602084013e62000145565b606091505b50915091508180156200015a57506020815110155b15620001925760008180602001905181019062000178919062000497565b905060ff811162000190576001969095509350505050565b505b5060009485945092505050565b63ffffffff4216600160e01b026b033b2e3c9fd0803ce8000000179055565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620001f1578181015183820152602001620001d7565b50506000910152565b600082601f8301126200020c57600080fd5b81516001600160401b0380821115620002295762000229620001be565b604051601f8301601f19908116603f01168101908282118183101715620002545762000254620001be565b816040528381528660208588010111156200026e57600080fd5b62000281846020830160208901620001d4565b9695505050505050565b60008060008060808587031215620002a257600080fd5b84516001600160401b0380821115620002ba57600080fd5b620002c888838901620001fa565b95506020870151915080821115620002df57600080fd5b50620002ee87828801620001fa565b604087015190945090506001600160a01b03811681146200030e57600080fd5b6060959095015193969295505050565b600181811c908216806200033357607f821691505b6020821081036200035457634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620003a857600081815260208120601f850160051c81016020861015620003835750805b601f850160051c820191505b81811015620003a4578281556001016200038f565b5050505b505050565b81516001600160401b03811115620003c957620003c9620001be565b620003e181620003da84546200031e565b846200035a565b602080601f831160018114620004195760008415620004005750858301515b600019600386901b1c1916600185901b178555620003a4565b600085815260208120601f198616915b828110156200044a5788860151825594840194600190910190840162000429565b5085821015620004695787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b600082516200048d818460208701620001d4565b9190910192915050565b600060208284031215620004aa57600080fd5b5051919050565b60805160a051611e27620004f3600039600061056a01526000818161029a01528181610cb401528181610d49015281816110b601526111760152611e276000f3fe608060405234801561001057600080fd5b50600436106101da5760003560e01c806386de9e4f11610104578063ba087652116100a2578063ce96cb7711610071578063ce96cb77146103f6578063d905777e14610409578063dd62ed3e1461041c578063ef8b30f7146103d057600080fd5b8063ba087652146103bd578063c63d75b6146102d7578063c6e6f592146103d0578063c7361ed2146103e357600080fd5b8063a457c2d7116100de578063a457c2d714610371578063a9059cbb14610384578063b3d7f6b914610397578063b460af94146103aa57600080fd5b806386de9e4f1461033357806394bf804d1461035657806395d89b411461036957600080fd5b8063313ce5671161017c5780634cdad5061161014b5780634cdad5061461020f5780636e553f65146102ec57806370a08231146102ff5780637fb1ad621461032857600080fd5b8063313ce5671461027357806338d52e0f1461028d57806339509351146102c4578063402d267d146102d757600080fd5b8063095ea7b3116101b8578063095ea7b3146102225780630a28a4771461024557806318160ddd1461025857806323b872dd1461026057600080fd5b806301e1d114146101df57806306fdde03146101fa57806307a2d13a1461020f575b600080fd5b6101e761042f565b6040519081526020015b60405180910390f35b610202610472565b6040516101f1919061196c565b6101e761021d36600461199f565b610504565b6102356102303660046119cf565b610517565b60405190151581526020016101f1565b6101e761025336600461199f565b61052f565b6002546101e7565b61023561026e3660046119f9565b61053c565b61027b610562565b60405160ff90911681526020016101f1565b6040516001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001681526020016101f1565b6102356102d23660046119cf565b61058e565b6101e76102e5366004611a35565b5060001990565b6101e76102fa366004611a50565b6105b0565b6101e761030d366004611a35565b6001600160a01b031660009081526020819052604090205490565b60075460ff16610235565b610354610341366004611a8a565b6007805460ff1916911515919091179055565b005b6101e7610364366004611a50565b6105ca565b6102026105e4565b61023561037f3660046119cf565b6105f3565b6102356103923660046119cf565b610679565b6101e76103a536600461199f565b610687565b6101e76103b8366004611aa7565b610694565b6101e76103cb366004611aa7565b610710565b6101e76103de36600461199f565b610784565b6103546103f136600461199f565b610791565b6101e7610404366004611a35565b6107ca565b6101e7610417366004611a35565b6107ee565b6101e761042a366004611ae3565b61080c565b60075460009060ff161561045e5760405162461bcd60e51b815260040161045590611b0d565b60405180910390fd5b60055461046d90600690610856565b905090565b60606003805461048190611b36565b80601f01602080910402602001604051908101604052809291908181526020018280546104ad90611b36565b80156104fa5780601f106104cf576101008083540402835291602001916104fa565b820191906000526020600020905b8154815290600101906020018083116104dd57829003601f168201915b5050505050905090565b600061051182600061088e565b92915050565b6000336105258185856108c8565b5060019392505050565b60006105118260016109ec565b60003361054a858285610a1c565b610555858585610a96565b60019150505b9392505050565b600061046d817f0000000000000000000000000000000000000000000000000000000000000000611b80565b6000336105258185856105a1838361080c565b6105ab9190611b99565b6108c8565b6000806105bc84610784565b905061055b33848684610c3a565b6000806105d684610687565b905061055b33848387610c3a565b60606004805461048190611b36565b60003381610601828661080c565b9050838110156106615760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b6064820152608401610455565b61066e82868684036108c8565b506001949350505050565b600033610525818585610a96565b600061051182600161088e565b600061069f826107ca565b8411156106ee5760405162461bcd60e51b815260206004820152601f60248201527f455243343632363a207769746864726177206d6f7265207468616e206d6178006044820152606401610455565b60006106f98561052f565b90506107083385858885610c7b565b949350505050565b600061071b826107ee565b84111561076a5760405162461bcd60e51b815260206004820152601d60248201527f455243343632363a2072656465656d206d6f7265207468616e206d61780000006044820152606401610455565b600061077585610504565b90506107083385858489610c7b565b60006105118260006109ec565b60008113156107af576005546107ab906006908390610df5565b5050565b6107ab6107bb82611bac565b60055460069190610e75565b50565b6001600160a01b03811660009081526020819052604081205461051190600061088e565b6001600160a01b038116600090815260208190526040812054610511565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b63ffffffff4216600160e01b026b033b2e3c9fd0803ce8000000179055565b600061055b6108896108688585610f25565b855461088390600160701b90046001600160701b0316610fcf565b90610fea565b61102e565b600061055b61089b61042f565b6108a6906001611b99565b6108b26000600a611cac565b6002546108bf9190611b99565b85919085611051565b6001600160a01b03831661092a5760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b6064820152608401610455565b6001600160a01b03821661098b5760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b6064820152608401610455565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b600061055b6109fc82600a611cac565b600254610a099190611b99565b610a1161042f565b6108bf906001611b99565b6000610a28848461080c565b90506000198114610a905781811015610a835760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e63650000006044820152606401610455565b610a9084848484036108c8565b50505050565b6001600160a01b038316610afa5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b6064820152608401610455565b6001600160a01b038216610b5c5760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b6064820152608401610455565b6001600160a01b03831660009081526020819052604090205481811015610bd45760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b6064820152608401610455565b6001600160a01b03848116600081815260208181526040808320878703905593871680835291849020805487019055925185815290927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a3610a90565b60075460ff1615610c5d5760405162461bcd60e51b815260040161045590611b0d565b600554610c6e906006908490610df5565b50610a90848484846110b1565b60075460ff1615610c9e5760405162461bcd60e51b815260040161045590611b0d565b600554610caf906006908490610e75565b5060007f00000000000000000000000000000000000000000000000000000000000000006040516370a0823160e01b81523060048201526001600160a01b0391909116906370a0823190602401602060405180830381865afa158015610d19573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d3d9190611cbb565b905082811015610de0577f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166340c10f1930610d818487611cd4565b6040516001600160e01b031960e085901b1681526001600160a01b0390921660048301526024820152604401600060405180830381600087803b158015610dc757600080fd5b505af1158015610ddb573d6000803e3d6000fd5b505050505b610ded8686868686611143565b505050505050565b6000610e018483611203565b6000610e0d85856112a1565b9050610e18816112c6565b6001600160601b031685600001600e8282829054906101000a90046001600160701b0316610e469190611ce7565b92506101000a8154816001600160701b0302191690836001600160701b03160217905550809150509392505050565b6000610e818483611203565b6000610e8d85856112a1565b9050610e98816112c6565b6001600160601b031685600001600e8282829054906101000a90046001600160701b0316610ec69190611d0e565b82546101009290920a6001600160701b038181021990931691831602179091558654600160701b90041660000390506107085784546dffffffffffffffffffffffffffff19166b033b2e3c9fd0803ce800000017855590509392505050565b8154600090429063ffffffff808316600160e01b9092041610610f5457505081546001600160701b0316610511565b8354600090610f7090600160e01b900463ffffffff1683611d2e565b63ffffffff169050610fc66b033b2e3c9fd0803ce80000006301e1338083610f9788610fcf565b610fa19190611d4b565b610fab9190611d80565b610fb59190611b99565b86546001600160701b031690610fea565b95945050505050565b633b9aca008181029081048214610fe557600080fd5b919050565b600081156b019d971e4fe8401e74000000198390048411151761100c57600080fd5b506b033b2e3c9fd0803ce800000091026b019d971e4fe8401e74000000010490565b633b9aca00808204908206631dcd6500811061104b576001820191505b50919050565b60008061105f868686611332565b9050600183600281111561107557611075611da2565b14801561109257506000848061108d5761108d611d6a565b868809115b15610fc6576110a2600182611b99565b9695505050505050565b505050565b6110dd7f000000000000000000000000000000000000000000000000000000000000000085308561141c565b6110e78382611487565b826001600160a01b0316846001600160a01b03167fdcbc1c05240f31ff3ad067ef1ee35ce4997762752e3a095284754544f4c709d78484604051611135929190918252602082015260400190565b60405180910390a350505050565b826001600160a01b0316856001600160a01b03161461116757611167838683610a1c565b6111718382611546565b61119c7f00000000000000000000000000000000000000000000000000000000000000008584611678565b826001600160a01b0316846001600160a01b0316866001600160a01b03167ffbde797d201c681b91056529119e0b02407c7bb96a4a2c75c01fc9667232c8db85856040516111f4929190918252602082015260400190565b60405180910390a45050505050565b815463ffffffff428116600160e01b909204161061121f575050565b8154600160701b90046001600160701b03166000036112575781546001600160e01b0316600160e01b4263ffffffff16021782555050565b6112696112648383610f25565b6116a8565b82546001600160701b03919091166dffffffffffffffffffffffffffff60701b90911617600160e01b4263ffffffff16021790915550565b815460009061055b90610889906001600160701b03166112c085610fcf565b90611711565b60006001600160601b0382111561132e5760405162461bcd60e51b815260206004820152602660248201527f53616665436173743a2076616c756520646f65736e27742066697420696e203960448201526536206269747360d01b6064820152608401610455565b5090565b600080806000198587098587029250828110838203039150508060000361136c5783828161136257611362611d6a565b049250505061055b565b8084116113b35760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b6044820152606401610455565b60008486880960026001871981018816978890046003810283188082028403028082028403028082028403028082028403028082028403029081029092039091026000889003889004909101858311909403939093029303949094049190911702949350505050565b6040516001600160a01b0380851660248301528316604482015260648101829052610a909085906323b872dd60e01b906084015b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b031990931692909217909152611750565b6001600160a01b0382166114dd5760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f2061646472657373006044820152606401610455565b80600260008282546114ef9190611b99565b90915550506001600160a01b038216600081815260208181526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b6001600160a01b0382166115a65760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b6064820152608401610455565b6001600160a01b0382166000908152602081905260409020548181101561161a5760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b6064820152608401610455565b6001600160a01b0383166000818152602081815260408083208686039055600280548790039055518581529192917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a3505050565b6040516001600160a01b0383166024820152604481018290526110ac90849063a9059cbb60e01b90606401611450565b60006001600160701b0382111561132e5760405162461bcd60e51b815260206004820152602760248201527f53616665436173743a2076616c756520646f65736e27742066697420696e20316044820152663132206269747360c81b6064820152608401610455565b600081156b033b2e3c9fd0803ce80000006002840419048411171561173557600080fd5b506b033b2e3c9fd0803ce80000009190910260028204010490565b60006117a5826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166118259092919063ffffffff16565b90508051600014806117c65750808060200190518101906117c69190611db8565b6110ac5760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152608401610455565b6060610708848460008585600080866001600160a01b0316858760405161184c9190611dd5565b60006040518083038185875af1925050503d8060008114611889576040519150601f19603f3d011682016040523d82523d6000602084013e61188e565b606091505b509150915061189f878383876118aa565b979650505050505050565b60608315611919578251600003611912576001600160a01b0385163b6119125760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610455565b5081610708565b610708838381511561192e5781518083602001fd5b8060405162461bcd60e51b8152600401610455919061196c565b60005b8381101561196357818101518382015260200161194b565b50506000910152565b602081526000825180602084015261198b816040850160208701611948565b601f01601f19169190910160400192915050565b6000602082840312156119b157600080fd5b5035919050565b80356001600160a01b0381168114610fe557600080fd5b600080604083850312156119e257600080fd5b6119eb836119b8565b946020939093013593505050565b600080600060608486031215611a0e57600080fd5b611a17846119b8565b9250611a25602085016119b8565b9150604084013590509250925092565b600060208284031215611a4757600080fd5b61055b826119b8565b60008060408385031215611a6357600080fd5b82359150611a73602084016119b8565b90509250929050565b80151581146107c757600080fd5b600060208284031215611a9c57600080fd5b813561055b81611a7c565b600080600060608486031215611abc57600080fd5b83359250611acc602085016119b8565b9150611ada604085016119b8565b90509250925092565b60008060408385031215611af657600080fd5b611aff836119b8565b9150611a73602084016119b8565b6020808252600f908201526e2b30bab63a1034b990313937b5b2b760891b604082015260600190565b600181811c90821680611b4a57607f821691505b60208210810361104b57634e487b7160e01b600052602260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b60ff818116838216019081111561051157610511611b6a565b8082018082111561051157610511611b6a565b6000600160ff1b8201611bc157611bc1611b6a565b5060000390565b600181815b80851115611c03578160001904821115611be957611be9611b6a565b80851615611bf657918102915b93841c9390800290611bcd565b509250929050565b600082611c1a57506001610511565b81611c2757506000610511565b8160018114611c3d5760028114611c4757611c63565b6001915050610511565b60ff841115611c5857611c58611b6a565b50506001821b610511565b5060208310610133831016604e8410600b8410161715611c86575081810a610511565b611c908383611bc8565b8060001904821115611ca457611ca4611b6a565b029392505050565b600061055b60ff841683611c0b565b600060208284031215611ccd57600080fd5b5051919050565b8181038181111561051157610511611b6a565b6001600160701b03818116838216019080821115611d0757611d07611b6a565b5092915050565b6001600160701b03828116828216039080821115611d0757611d07611b6a565b63ffffffff828116828216039080821115611d0757611d07611b6a565b6000816000190483118215151615611d6557611d65611b6a565b500290565b634e487b7160e01b600052601260045260246000fd5b600082611d9d57634e487b7160e01b600052601260045260246000fd5b500490565b634e487b7160e01b600052602160045260246000fd5b600060208284031215611dca57600080fd5b815161055b81611a7c565b60008251611de7818460208701611948565b919091019291505056fea264697066735822122014ca802dc11cf6ab59b01ff0ff0737e333b894f4b2b8ff3cfc141f16cd5ff69264736f6c63430008100033",
733
+ "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106101da5760003560e01c806386de9e4f11610104578063ba087652116100a2578063ce96cb7711610071578063ce96cb77146103f6578063d905777e14610409578063dd62ed3e1461041c578063ef8b30f7146103d057600080fd5b8063ba087652146103bd578063c63d75b6146102d7578063c6e6f592146103d0578063c7361ed2146103e357600080fd5b8063a457c2d7116100de578063a457c2d714610371578063a9059cbb14610384578063b3d7f6b914610397578063b460af94146103aa57600080fd5b806386de9e4f1461033357806394bf804d1461035657806395d89b411461036957600080fd5b8063313ce5671161017c5780634cdad5061161014b5780634cdad5061461020f5780636e553f65146102ec57806370a08231146102ff5780637fb1ad621461032857600080fd5b8063313ce5671461027357806338d52e0f1461028d57806339509351146102c4578063402d267d146102d757600080fd5b8063095ea7b3116101b8578063095ea7b3146102225780630a28a4771461024557806318160ddd1461025857806323b872dd1461026057600080fd5b806301e1d114146101df57806306fdde03146101fa57806307a2d13a1461020f575b600080fd5b6101e761042f565b6040519081526020015b60405180910390f35b610202610472565b6040516101f1919061196c565b6101e761021d36600461199f565b610504565b6102356102303660046119cf565b610517565b60405190151581526020016101f1565b6101e761025336600461199f565b61052f565b6002546101e7565b61023561026e3660046119f9565b61053c565b61027b610562565b60405160ff90911681526020016101f1565b6040516001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001681526020016101f1565b6102356102d23660046119cf565b61058e565b6101e76102e5366004611a35565b5060001990565b6101e76102fa366004611a50565b6105b0565b6101e761030d366004611a35565b6001600160a01b031660009081526020819052604090205490565b60075460ff16610235565b610354610341366004611a8a565b6007805460ff1916911515919091179055565b005b6101e7610364366004611a50565b6105ca565b6102026105e4565b61023561037f3660046119cf565b6105f3565b6102356103923660046119cf565b610679565b6101e76103a536600461199f565b610687565b6101e76103b8366004611aa7565b610694565b6101e76103cb366004611aa7565b610710565b6101e76103de36600461199f565b610784565b6103546103f136600461199f565b610791565b6101e7610404366004611a35565b6107ca565b6101e7610417366004611a35565b6107ee565b6101e761042a366004611ae3565b61080c565b60075460009060ff161561045e5760405162461bcd60e51b815260040161045590611b0d565b60405180910390fd5b60055461046d90600690610856565b905090565b60606003805461048190611b36565b80601f01602080910402602001604051908101604052809291908181526020018280546104ad90611b36565b80156104fa5780601f106104cf576101008083540402835291602001916104fa565b820191906000526020600020905b8154815290600101906020018083116104dd57829003601f168201915b5050505050905090565b600061051182600061088e565b92915050565b6000336105258185856108c8565b5060019392505050565b60006105118260016109ec565b60003361054a858285610a1c565b610555858585610a96565b60019150505b9392505050565b600061046d817f0000000000000000000000000000000000000000000000000000000000000000611b80565b6000336105258185856105a1838361080c565b6105ab9190611b99565b6108c8565b6000806105bc84610784565b905061055b33848684610c3a565b6000806105d684610687565b905061055b33848387610c3a565b60606004805461048190611b36565b60003381610601828661080c565b9050838110156106615760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b6064820152608401610455565b61066e82868684036108c8565b506001949350505050565b600033610525818585610a96565b600061051182600161088e565b600061069f826107ca565b8411156106ee5760405162461bcd60e51b815260206004820152601f60248201527f455243343632363a207769746864726177206d6f7265207468616e206d6178006044820152606401610455565b60006106f98561052f565b90506107083385858885610c7b565b949350505050565b600061071b826107ee565b84111561076a5760405162461bcd60e51b815260206004820152601d60248201527f455243343632363a2072656465656d206d6f7265207468616e206d61780000006044820152606401610455565b600061077585610504565b90506107083385858489610c7b565b60006105118260006109ec565b60008113156107af576005546107ab906006908390610df5565b5050565b6107ab6107bb82611bac565b60055460069190610e75565b50565b6001600160a01b03811660009081526020819052604081205461051190600061088e565b6001600160a01b038116600090815260208190526040812054610511565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b63ffffffff4216600160e01b026b033b2e3c9fd0803ce8000000179055565b600061055b6108896108688585610f25565b855461088390600160701b90046001600160701b0316610fcf565b90610fea565b61102e565b600061055b61089b61042f565b6108a6906001611b99565b6108b26000600a611cac565b6002546108bf9190611b99565b85919085611051565b6001600160a01b03831661092a5760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b6064820152608401610455565b6001600160a01b03821661098b5760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b6064820152608401610455565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b600061055b6109fc82600a611cac565b600254610a099190611b99565b610a1161042f565b6108bf906001611b99565b6000610a28848461080c565b90506000198114610a905781811015610a835760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e63650000006044820152606401610455565b610a9084848484036108c8565b50505050565b6001600160a01b038316610afa5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b6064820152608401610455565b6001600160a01b038216610b5c5760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b6064820152608401610455565b6001600160a01b03831660009081526020819052604090205481811015610bd45760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b6064820152608401610455565b6001600160a01b03848116600081815260208181526040808320878703905593871680835291849020805487019055925185815290927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a3610a90565b60075460ff1615610c5d5760405162461bcd60e51b815260040161045590611b0d565b600554610c6e906006908490610df5565b50610a90848484846110b1565b60075460ff1615610c9e5760405162461bcd60e51b815260040161045590611b0d565b600554610caf906006908490610e75565b5060007f00000000000000000000000000000000000000000000000000000000000000006040516370a0823160e01b81523060048201526001600160a01b0391909116906370a0823190602401602060405180830381865afa158015610d19573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d3d9190611cbb565b905082811015610de0577f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166340c10f1930610d818487611cd4565b6040516001600160e01b031960e085901b1681526001600160a01b0390921660048301526024820152604401600060405180830381600087803b158015610dc757600080fd5b505af1158015610ddb573d6000803e3d6000fd5b505050505b610ded8686868686611143565b505050505050565b6000610e018483611203565b6000610e0d85856112a1565b9050610e18816112c6565b6001600160601b031685600001600e8282829054906101000a90046001600160701b0316610e469190611ce7565b92506101000a8154816001600160701b0302191690836001600160701b03160217905550809150509392505050565b6000610e818483611203565b6000610e8d85856112a1565b9050610e98816112c6565b6001600160601b031685600001600e8282829054906101000a90046001600160701b0316610ec69190611d0e565b82546101009290920a6001600160701b038181021990931691831602179091558654600160701b90041660000390506107085784546dffffffffffffffffffffffffffff19166b033b2e3c9fd0803ce800000017855590509392505050565b8154600090429063ffffffff808316600160e01b9092041610610f5457505081546001600160701b0316610511565b8354600090610f7090600160e01b900463ffffffff1683611d2e565b63ffffffff169050610fc66b033b2e3c9fd0803ce80000006301e1338083610f9788610fcf565b610fa19190611d4b565b610fab9190611d80565b610fb59190611b99565b86546001600160701b031690610fea565b95945050505050565b633b9aca008181029081048214610fe557600080fd5b919050565b600081156b019d971e4fe8401e74000000198390048411151761100c57600080fd5b506b033b2e3c9fd0803ce800000091026b019d971e4fe8401e74000000010490565b633b9aca00808204908206631dcd6500811061104b576001820191505b50919050565b60008061105f868686611332565b9050600183600281111561107557611075611da2565b14801561109257506000848061108d5761108d611d6a565b868809115b15610fc6576110a2600182611b99565b9695505050505050565b505050565b6110dd7f000000000000000000000000000000000000000000000000000000000000000085308561141c565b6110e78382611487565b826001600160a01b0316846001600160a01b03167fdcbc1c05240f31ff3ad067ef1ee35ce4997762752e3a095284754544f4c709d78484604051611135929190918252602082015260400190565b60405180910390a350505050565b826001600160a01b0316856001600160a01b03161461116757611167838683610a1c565b6111718382611546565b61119c7f00000000000000000000000000000000000000000000000000000000000000008584611678565b826001600160a01b0316846001600160a01b0316866001600160a01b03167ffbde797d201c681b91056529119e0b02407c7bb96a4a2c75c01fc9667232c8db85856040516111f4929190918252602082015260400190565b60405180910390a45050505050565b815463ffffffff428116600160e01b909204161061121f575050565b8154600160701b90046001600160701b03166000036112575781546001600160e01b0316600160e01b4263ffffffff16021782555050565b6112696112648383610f25565b6116a8565b82546001600160701b03919091166dffffffffffffffffffffffffffff60701b90911617600160e01b4263ffffffff16021790915550565b815460009061055b90610889906001600160701b03166112c085610fcf565b90611711565b60006001600160601b0382111561132e5760405162461bcd60e51b815260206004820152602660248201527f53616665436173743a2076616c756520646f65736e27742066697420696e203960448201526536206269747360d01b6064820152608401610455565b5090565b600080806000198587098587029250828110838203039150508060000361136c5783828161136257611362611d6a565b049250505061055b565b8084116113b35760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b6044820152606401610455565b60008486880960026001871981018816978890046003810283188082028403028082028403028082028403028082028403028082028403029081029092039091026000889003889004909101858311909403939093029303949094049190911702949350505050565b6040516001600160a01b0380851660248301528316604482015260648101829052610a909085906323b872dd60e01b906084015b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b031990931692909217909152611750565b6001600160a01b0382166114dd5760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f2061646472657373006044820152606401610455565b80600260008282546114ef9190611b99565b90915550506001600160a01b038216600081815260208181526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b6001600160a01b0382166115a65760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b6064820152608401610455565b6001600160a01b0382166000908152602081905260409020548181101561161a5760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b6064820152608401610455565b6001600160a01b0383166000818152602081815260408083208686039055600280548790039055518581529192917fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a3505050565b6040516001600160a01b0383166024820152604481018290526110ac90849063a9059cbb60e01b90606401611450565b60006001600160701b0382111561132e5760405162461bcd60e51b815260206004820152602760248201527f53616665436173743a2076616c756520646f65736e27742066697420696e20316044820152663132206269747360c81b6064820152608401610455565b600081156b033b2e3c9fd0803ce80000006002840419048411171561173557600080fd5b506b033b2e3c9fd0803ce80000009190910260028204010490565b60006117a5826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166118259092919063ffffffff16565b90508051600014806117c65750808060200190518101906117c69190611db8565b6110ac5760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152608401610455565b6060610708848460008585600080866001600160a01b0316858760405161184c9190611dd5565b60006040518083038185875af1925050503d8060008114611889576040519150601f19603f3d011682016040523d82523d6000602084013e61188e565b606091505b509150915061189f878383876118aa565b979650505050505050565b60608315611919578251600003611912576001600160a01b0385163b6119125760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610455565b5081610708565b610708838381511561192e5781518083602001fd5b8060405162461bcd60e51b8152600401610455919061196c565b60005b8381101561196357818101518382015260200161194b565b50506000910152565b602081526000825180602084015261198b816040850160208701611948565b601f01601f19169190910160400192915050565b6000602082840312156119b157600080fd5b5035919050565b80356001600160a01b0381168114610fe557600080fd5b600080604083850312156119e257600080fd5b6119eb836119b8565b946020939093013593505050565b600080600060608486031215611a0e57600080fd5b611a17846119b8565b9250611a25602085016119b8565b9150604084013590509250925092565b600060208284031215611a4757600080fd5b61055b826119b8565b60008060408385031215611a6357600080fd5b82359150611a73602084016119b8565b90509250929050565b80151581146107c757600080fd5b600060208284031215611a9c57600080fd5b813561055b81611a7c565b600080600060608486031215611abc57600080fd5b83359250611acc602085016119b8565b9150611ada604085016119b8565b90509250925092565b60008060408385031215611af657600080fd5b611aff836119b8565b9150611a73602084016119b8565b6020808252600f908201526e2b30bab63a1034b990313937b5b2b760891b604082015260600190565b600181811c90821680611b4a57607f821691505b60208210810361104b57634e487b7160e01b600052602260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b60ff818116838216019081111561051157610511611b6a565b8082018082111561051157610511611b6a565b6000600160ff1b8201611bc157611bc1611b6a565b5060000390565b600181815b80851115611c03578160001904821115611be957611be9611b6a565b80851615611bf657918102915b93841c9390800290611bcd565b509250929050565b600082611c1a57506001610511565b81611c2757506000610511565b8160018114611c3d5760028114611c4757611c63565b6001915050610511565b60ff841115611c5857611c58611b6a565b50506001821b610511565b5060208310610133831016604e8410600b8410161715611c86575081810a610511565b611c908383611bc8565b8060001904821115611ca457611ca4611b6a565b029392505050565b600061055b60ff841683611c0b565b600060208284031215611ccd57600080fd5b5051919050565b8181038181111561051157610511611b6a565b6001600160701b03818116838216019080821115611d0757611d07611b6a565b5092915050565b6001600160701b03828116828216039080821115611d0757611d07611b6a565b63ffffffff828116828216039080821115611d0757611d07611b6a565b6000816000190483118215151615611d6557611d65611b6a565b500290565b634e487b7160e01b600052601260045260246000fd5b600082611d9d57634e487b7160e01b600052601260045260246000fd5b500490565b634e487b7160e01b600052602160045260246000fd5b600060208284031215611dca57600080fd5b815161055b81611a7c565b60008251611de7818460208701611948565b919091019291505056fea264697066735822122014ca802dc11cf6ab59b01ff0ff0737e333b894f4b2b8ff3cfc141f16cd5ff69264736f6c63430008100033",
734
734
  "linkReferences": {},
735
735
  "deployedLinkReferences": {}
736
736
  }
package/build/contracts/mocks/InterfaceIdCalculator.sol/InterfaceIdCalculator.json CHANGED
@@ -173,8 +173,8 @@
173
173
  "type": "function"
174
174
  }
175
175
  ],
176
- "bytecode": "0x608060405234801561001057600080fd5b506101dd806100206000396000f3fe608060405234801561001057600080fd5b50600436106100cf5760003560e01c80638b98dad01161008c578063a23a166111610066578063a23a16611461016f578063a88ecaa21461017d578063c1bd03a61461018b578063fef87f0b1461019957600080fd5b80638b98dad014610145578063933c234b1461015357806396047c991461016157600080fd5b806311f34418146100d45780632bac8ca3146100ff578063362466de1461010d578063731e0f7f1461011b5780637874bf9814610129578063800915a514610137575b600080fd5b6100e2632dd9c4bb60e21b81565b6040516001600160e01b0319909116815260200160405180910390f35b6100e263272b8c4760e01b81565b6100e2634d15eb0360e01b81565b6100e263a219a02560e01b81565b6100e2639077062160e01b81565b6100e263f8722d8960e01b81565b6100e263da40804f60e01b81565b6100e2637965db0b60e01b81565b6100e26380ac58cd60e01b81565b6100e26301ffc9a760e01b81565b6100e2631e670a9760e21b81565b6100e26336372b0760e01b81565b6100e263191a7d6b60e11b8156fea2646970667358221220fe3b6eb0776f4568500da314dff8bc3124ac6046f69c71551114eecd06e0bee964736f6c63430008100033",
177
- "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100cf5760003560e01c80638b98dad01161008c578063a23a166111610066578063a23a16611461016f578063a88ecaa21461017d578063c1bd03a61461018b578063fef87f0b1461019957600080fd5b80638b98dad014610145578063933c234b1461015357806396047c991461016157600080fd5b806311f34418146100d45780632bac8ca3146100ff578063362466de1461010d578063731e0f7f1461011b5780637874bf9814610129578063800915a514610137575b600080fd5b6100e2632dd9c4bb60e21b81565b6040516001600160e01b0319909116815260200160405180910390f35b6100e263272b8c4760e01b81565b6100e2634d15eb0360e01b81565b6100e263a219a02560e01b81565b6100e2639077062160e01b81565b6100e263f8722d8960e01b81565b6100e263da40804f60e01b81565b6100e2637965db0b60e01b81565b6100e26380ac58cd60e01b81565b6100e26301ffc9a760e01b81565b6100e2631e670a9760e21b81565b6100e26336372b0760e01b81565b6100e263191a7d6b60e11b8156fea2646970667358221220fe3b6eb0776f4568500da314dff8bc3124ac6046f69c71551114eecd06e0bee964736f6c63430008100033",
176
+ "bytecode": "0x608060405234801561001057600080fd5b506101dd806100206000396000f3fe608060405234801561001057600080fd5b50600436106100cf5760003560e01c80638b98dad01161008c578063a23a166111610066578063a23a16611461016f578063a88ecaa21461017d578063c1bd03a61461018b578063fef87f0b1461019957600080fd5b80638b98dad014610145578063933c234b1461015357806396047c991461016157600080fd5b806311f34418146100d45780632bac8ca3146100ff578063362466de1461010d578063731e0f7f1461011b5780637874bf9814610129578063800915a514610137575b600080fd5b6100e2632dd9c4bb60e21b81565b6040516001600160e01b0319909116815260200160405180910390f35b6100e263272b8c4760e01b81565b6100e2634d15eb0360e01b81565b6100e263a219a02560e01b81565b6100e2639077062160e01b81565b6100e263f8722d8960e01b81565b6100e263da40804f60e01b81565b6100e2637965db0b60e01b81565b6100e26380ac58cd60e01b81565b6100e26301ffc9a760e01b81565b6100e2631e670a9760e21b81565b6100e26336372b0760e01b81565b6100e263191a7d6b60e11b8156fea26469706673582212204be5b1f3c85762fe2046a35a8cd3ac91ae978b7bf025cd52036640fa03b7c8de64736f6c63430008100033",
177
+ "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100cf5760003560e01c80638b98dad01161008c578063a23a166111610066578063a23a16611461016f578063a88ecaa21461017d578063c1bd03a61461018b578063fef87f0b1461019957600080fd5b80638b98dad014610145578063933c234b1461015357806396047c991461016157600080fd5b806311f34418146100d45780632bac8ca3146100ff578063362466de1461010d578063731e0f7f1461011b5780637874bf9814610129578063800915a514610137575b600080fd5b6100e2632dd9c4bb60e21b81565b6040516001600160e01b0319909116815260200160405180910390f35b6100e263272b8c4760e01b81565b6100e2634d15eb0360e01b81565b6100e263a219a02560e01b81565b6100e2639077062160e01b81565b6100e263f8722d8960e01b81565b6100e263da40804f60e01b81565b6100e2637965db0b60e01b81565b6100e26380ac58cd60e01b81565b6100e26301ffc9a760e01b81565b6100e2631e670a9760e21b81565b6100e26336372b0760e01b81565b6100e263191a7d6b60e11b8156fea26469706673582212204be5b1f3c85762fe2046a35a8cd3ac91ae978b7bf025cd52036640fa03b7c8de64736f6c63430008100033",
178
178
  "linkReferences": {},
179
179
  "deployedLinkReferences": {}
180
180
  }
package/contracts/ERC4626AssetManager.sol CHANGED
@@ -43,7 +43,7 @@ contract ERC4626AssetManager is LiquidityThresholdAssetManager {
43
43
  DiamondStorage storage ds = diamondStorage();
44
44
  uint256 assets = _vault.redeem(_vault.balanceOf(address(this)), address(this), address(this));
45
45
  earnings = int256(assets) - int256(uint256(ds.lastInvestmentValue));
46
- ds.lastInvestmentValue = assets.toUint128();
46
+ ds.lastInvestmentValue = 0;
47
47
  emit MoneyDeinvested(assets);
48
48
  emit EarningsRecorded(earnings);
49
49
  return earnings;
package/contracts/LiquidityThresholdAssetManager.sol CHANGED
@@ -71,6 +71,13 @@ abstract contract LiquidityThresholdAssetManager is IAssetManager {
71
71
  IPolicyPoolComponent(address(this)).policyPool().currency() == _asset,
72
72
  "Asset mismatch"
73
73
  );
74
+ DiamondStorage storage ds = diamondStorage();
75
+ // When connecting I make sure the storage is clean, to avoid reusing data from previous AM that left
76
+ // the data in a wrong state.
77
+ ds.liquidityMin = 0;
78
+ ds.liquidityMiddle = 0;
79
+ ds.liquidityMax = 0;
80
+ ds.lastInvestmentValue = 0;
74
81
  }
75
82
 
76
83
  function recordEarnings() external virtual override returns (int256) {
package/contracts/PremiumsAccount.sol CHANGED
@@ -35,6 +35,7 @@ contract PremiumsAccount is IPremiumsAccount, Reserve {
35
35
  using SafeCast for uint256;
36
36
 
37
37
  bytes32 public constant WITHDRAW_WON_PREMIUMS_ROLE = keccak256("WITHDRAW_WON_PREMIUMS_ROLE");
38
+ bytes32 public constant REPAY_LOANS_ROLE = keccak256("REPAY_LOANS_ROLE");
38
39
  uint256 internal constant FOUR_DECIMAL_TO_WAD = 1e14;
39
40
  uint16 internal constant HUNDRED_PERCENT = 1e4;
40
41
 
@@ -92,6 +93,19 @@ contract PremiumsAccount is IPremiumsAccount, Reserve {
92
93
  */
93
94
  event WonPremiumsInOut(bool moneyIn, uint256 value);
94
95
 
96
+ /**
97
+ * @dev Modifier to make a function callable only by a certain global or component role.
98
+ * In addition to checking the sender's role, `address(0)` 's role is also
99
+ * considered. Granting a role to `address(0)` (at global or component level) is equivalent
100
+ * to enabling this role for everyone.
101
+ */
102
+ modifier onlyGlobalOrComponentOrOpenRole(bytes32 role) {
103
+ if (!_policyPool.access().hasComponentRole(address(this), role, address(0), true)) {
104
+ _policyPool.access().checkComponentRole(address(this), role, _msgSender(), true);
105
+ }
106
+ _;
107
+ }
108
+
95
109
  /**
96
110
  * @dev Constructor of the contract, sets the immutable fields.
97
111
  *
@@ -176,13 +190,10 @@ contract PremiumsAccount is IPremiumsAccount, Reserve {
176
190
  * loans to cover asset losses.
177
191
  */
178
192
  function _assetEarnings(int256 earningsOrLosses) internal override {
179
- if (earningsOrLosses > 0) {
180
- uint256 earnings = uint256(earningsOrLosses);
181
- if (address(_seniorEtk) != address(0)) earnings = _repayLoan(earnings, _seniorEtk);
182
- if (address(_juniorEtk) != address(0)) earnings = _repayLoan(earnings, _juniorEtk);
183
- _storePurePremiumWon(earnings);
193
+ if (earningsOrLosses >= 0) {
194
+ _storePurePremiumWon(uint256(earningsOrLosses));
184
195
  } else {
185
- require(_payFromPremiums(uint256(-earningsOrLosses)) == 0, "Losses can't exceed maxDeficit");
196
+ require(_payFromPremiums(-earningsOrLosses) == 0, "Losses can't exceed maxDeficit");
186
197
  }
187
198
  }
188
199
 
@@ -230,6 +241,14 @@ contract PremiumsAccount is IPremiumsAccount, Reserve {
230
241
  return _surplus;
231
242
  }
232
243
 
244
+ /**
245
+ * @dev Returns the amount of funds available to cover losses or repay eToken loans.
246
+ */
247
+ function fundsAvailable() public view returns (uint256) {
248
+ // This is guaranteed to be positive because _maxDeficit is negative and always gte _surplus in absolute value
249
+ return uint256(_surplus - _maxDeficit(deficitRatio()));
250
+ }
251
+
233
252
  function seniorEtk() external view override returns (IEToken) {
234
253
  return _seniorEtk;
235
254
  }
@@ -301,8 +320,6 @@ contract PremiumsAccount is IPremiumsAccount, Reserve {
301
320
  external
302
321
  onlyGlobalOrComponentRole(LEVEL2_ROLE)
303
322
  {
304
- require(newRatio <= 1e18, "Validation: deficitRatio must be <= 1");
305
-
306
323
  uint16 truncatedRatio = (newRatio / FOUR_DECIMAL_TO_WAD).toUint16();
307
324
  require(
308
325
  uint256(truncatedRatio) * FOUR_DECIMAL_TO_WAD == newRatio,
@@ -311,6 +328,8 @@ contract PremiumsAccount is IPremiumsAccount, Reserve {
311
328
 
312
329
  int256 maxDeficit = _maxDeficit(newRatio);
313
330
  require(adjustment || _surplus >= maxDeficit, "Validation: surplus must be >= maxDeficit");
331
+ _params.deficitRatio = truncatedRatio;
332
+ _validateParameters();
314
333
 
315
334
  IAccessManager.GovernanceActions action = IAccessManager.GovernanceActions.setDeficitRatio;
316
335
  if (_surplus < maxDeficit) {
@@ -320,7 +339,6 @@ contract PremiumsAccount is IPremiumsAccount, Reserve {
320
339
  _borrowFromEtk(borrow, address(this), address(_juniorEtk) != address(0));
321
340
  action = IAccessManager.GovernanceActions.setDeficitRatioWithAdjustment;
322
341
  }
323
- _params.deficitRatio = truncatedRatio;
324
342
  _parameterChanged(action, newRatio, false);
325
343
  }
326
344
 
@@ -368,7 +386,6 @@ contract PremiumsAccount is IPremiumsAccount, Reserve {
368
386
  address receiver,
369
387
  bool jrEtk
370
388
  ) internal {
371
- require(receiver != address(0), "PremiumsAccount: receiver cannot be the zero address");
372
389
  uint256 left = borrow;
373
390
  if (jrEtk) {
374
391
  if (_juniorEtk.getLoan(address(this)) + borrow <= jrLoanLimit()) {
@@ -395,8 +412,8 @@ contract PremiumsAccount is IPremiumsAccount, Reserve {
395
412
  * @param toPay The amount to pay.
396
413
  * @return The amount that couldn't be paid from the premiums account.
397
414
  */
398
- function _payFromPremiums(uint256 toPay) internal returns (uint256) {
399
- int256 newSurplus = _surplus - int256(toPay);
415
+ function _payFromPremiums(int256 toPay) internal returns (uint256) {
416
+ int256 newSurplus = _surplus - toPay;
400
417
  int256 maxDeficit = _maxDeficit(deficitRatio());
401
418
  if (newSurplus >= maxDeficit) {
402
419
  _surplus = newSurplus;
@@ -413,7 +430,6 @@ contract PremiumsAccount is IPremiumsAccount, Reserve {
413
430
  * @param purePremiumWon The amount earned
414
431
  */
415
432
  function _storePurePremiumWon(uint256 purePremiumWon) internal {
416
- if (purePremiumWon == 0) return;
417
433
  _surplus += int256(purePremiumWon);
418
434
  }
419
435
 
@@ -432,15 +448,8 @@ contract PremiumsAccount is IPremiumsAccount, Reserve {
432
448
  * @param amount The amount to be transferred.
433
449
  */
434
450
  function receiveGrant(uint256 amount) external {
435
- // I need to receive the money first (without following the Check-Effects-Interactions) pattern because I need
436
- // the money to pay the eTokens
451
+ _storePurePremiumWon(amount);
437
452
  currency().safeTransferFrom(_msgSender(), address(this), amount);
438
- uint256 purePremiumWon = amount;
439
- if (address(_seniorEtk) != address(0)) purePremiumWon = _repayLoan(purePremiumWon, _seniorEtk);
440
- if (address(_juniorEtk) != address(0)) purePremiumWon = _repayLoan(purePremiumWon, _juniorEtk);
441
-
442
- // Finally store purePremiumWon
443
- _storePurePremiumWon(purePremiumWon);
444
453
  emit WonPremiumsInOut(true, amount);
445
454
  }
446
455
 
@@ -497,23 +506,14 @@ contract PremiumsAccount is IPremiumsAccount, Reserve {
497
506
  uint256 payout
498
507
  ) external override onlyPolicyPool whenNotPaused {
499
508
  _activePurePremiums -= policy.purePremium;
500
- if (policy.purePremium >= payout) {
501
- uint256 purePremiumWon = policy.purePremium - payout;
502
- if (address(_seniorEtk) != address(0))
503
- purePremiumWon = _repayLoan(purePremiumWon, _seniorEtk);
504
- if (address(_juniorEtk) != address(0))
505
- purePremiumWon = _repayLoan(purePremiumWon, _juniorEtk);
506
- _storePurePremiumWon(purePremiumWon);
509
+ uint256 borrowFromScr = _payFromPremiums(int256(payout) - int256(policy.purePremium));
510
+ if (borrowFromScr != 0) {
507
511
  _unlockScr(policy);
508
- _transferTo(policyHolder, payout);
512
+ _borrowFromEtk(borrowFromScr, policyHolder, policy.jrScr > 0);
509
513
  } else {
510
- uint256 borrowFromScr = _payFromPremiums(payout - policy.purePremium);
511
514
  _unlockScr(policy);
512
- if (borrowFromScr > 0) {
513
- _borrowFromEtk(borrowFromScr, policyHolder, policy.jrScr > 0);
514
- }
515
- _transferTo(policyHolder, payout - borrowFromScr);
516
515
  }
516
+ _transferTo(policyHolder, payout - borrowFromScr);
517
517
  }
518
518
 
519
519
  /**
@@ -538,18 +538,37 @@ contract PremiumsAccount is IPremiumsAccount, Reserve {
538
538
  }
539
539
  }
540
540
 
541
+ /**
542
+ * @dev Function that repays the loan(s) if fundsAvailable
543
+ *
544
+ * @return available The funds still available after repayment
545
+ */
546
+ function repayLoans()
547
+ external
548
+ onlyGlobalOrComponentOrOpenRole(REPAY_LOANS_ROLE)
549
+ whenNotPaused
550
+ returns (uint256 available)
551
+ {
552
+ available = fundsAvailable();
553
+ if (available != 0 && address(_seniorEtk) != address(0))
554
+ available = _repayLoan(available, _seniorEtk);
555
+ if (available != 0 && address(_juniorEtk) != address(0))
556
+ available = _repayLoan(available, _juniorEtk);
557
+ return available;
558
+ }
559
+
541
560
  /**
542
561
  * @dev Internal function that repays a loan taken (if any outstanding) from the an eToken
543
562
  *
544
- * @param purePremiumWon The amount earned and available for loan repayment.
563
+ * @param fundsAvailable_ The amount of funds available for the repayment
545
564
  * @param etk The eToken with the potential debt
546
565
  * @return The excess amount of the purePremiumWon that wasn't used for the loan repayment.
547
566
  */
548
- function _repayLoan(uint256 purePremiumWon, IEToken etk) internal returns (uint256) {
549
- if (purePremiumWon < NEGLIGIBLE_AMOUNT) return purePremiumWon;
567
+ function _repayLoan(uint256 fundsAvailable_, IEToken etk) internal returns (uint256) {
550
568
  uint256 borrowedFromEtk = etk.getLoan(address(this));
551
- if (borrowedFromEtk == 0) return purePremiumWon;
552
- uint256 repayAmount = Math.min(purePremiumWon, borrowedFromEtk);
569
+ if (borrowedFromEtk == 0) return fundsAvailable_;
570
+ uint256 repayAmount = Math.min(fundsAvailable_, borrowedFromEtk);
571
+ _surplus -= int256(repayAmount);
553
572
 
554
573
  // If not enough liquidity, it deinvests from the asset manager
555
574
  if (currency().balanceOf(address(this)) < repayAmount) {
@@ -567,7 +586,7 @@ contract PremiumsAccount is IPremiumsAccount, Reserve {
567
586
  currency().approve(address(etk), borrowedFromEtk);
568
587
  }
569
588
  etk.repayLoan(repayAmount, address(this));
570
- return purePremiumWon - repayAmount;
589
+ return fundsAvailable_ - repayAmount;
571
590
  }
572
591
 
573
592
  function policyExpired(Policy.PolicyData memory policy)
@@ -576,22 +595,8 @@ contract PremiumsAccount is IPremiumsAccount, Reserve {
576
595
  onlyPolicyPool
577
596
  whenNotPaused
578
597
  {
579
- uint256 purePremiumWon = policy.purePremium;
580
- _activePurePremiums -= purePremiumWon;
581
-
582
- // If negative _activePurePremiums, repay this first (shouldn't happen)
583
- int256 maxDeficit = _maxDeficit(deficitRatio());
584
- if (_surplus < maxDeficit) {
585
- // Covers the excess of deficit first
586
- purePremiumWon -= uint256(-_surplus + maxDeficit);
587
- _surplus = maxDeficit;
588
- }
589
-
590
- if (address(_seniorEtk) != address(0)) purePremiumWon = _repayLoan(purePremiumWon, _seniorEtk);
591
- if (address(_juniorEtk) != address(0)) purePremiumWon = _repayLoan(purePremiumWon, _juniorEtk);
592
-
593
- // Finally store purePremiumWon
594
- _storePurePremiumWon(purePremiumWon);
598
+ _activePurePremiums -= policy.purePremium;
599
+ _storePurePremiumWon(policy.purePremium);
595
600
  _unlockScr(policy);
596
601
  }
597
602
 
package/contracts/Reserve.sol CHANGED
@@ -152,6 +152,11 @@ abstract contract Reserve is PolicyPoolComponent {
152
152
  } else {
153
153
  _assetEarnings(abi.decode(result, (int256)));
154
154
  }
155
+ /**
156
+ * WARNING: if you are doing a forced replacement of the AM and you want the new AM
157
+ * to inherit the storage (just fixing the code), make sure the code of the new AM doesn't clean
158
+ * the storage in the connect() method (as it is the recommended practice in normal changes of AM).
159
+ */
155
160
  } else {
156
161
  bytes memory result = am.functionDelegateCall(
157
162
  abi.encodeWithSelector(IAssetManager.deinvestAll.selector)
package/contracts/TimeScaled.sol CHANGED
@@ -116,6 +116,10 @@ library TimeScaled {
116
116
  int256 amount,
117
117
  uint256 interestRate
118
118
  ) internal {
119
+ if (scaledAmount.amount == 0) {
120
+ add(scaledAmount, uint256(amount), interestRate);
121
+ return;
122
+ }
119
123
  updateScale(scaledAmount, interestRate);
120
124
  uint256 newScaledAmount = uint256(int256(getScaledAmount(scaledAmount, interestRate)) + amount);
121
125
  scaledAmount.scale = newScaledAmount
package/contracts/interfaces/IAssetManager.sol CHANGED
@@ -38,6 +38,11 @@ interface IAssetManager is IERC165 {
38
38
 
39
39
  /**
40
40
  * @dev Function called when an asset manager is plugged into a reserve. Useful for initialization tasks
41
+ *
42
+ * Since the asset manager for a reserve can be changed and they use the stoage of the reserve contract, you
43
+ * can't assume the storage starts clean (all zeros). This is because a previous AM, using the same hash for the
44
+ * diamondStorage might have left some data. So, in the connect method you should initialize the state setting to
45
+ * zero what's expected to be zero.
41
46
  */
42
47
  function connect() external;
43
48
 
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@ensuro/core",
3
3
  "description": "Ensuro - Decentralized insurance protocol",
4
- "version": "2.3.0",
4
+ "version": "2.5.0",
5
5
  "files": [
6
6
  "**/*.sol",
7
7
  "/build/contracts/*.json",