@venusprotocol/oracle 1.6.11-dev.3 → 1.6.11-dev.4
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.
- package/artifacts/@chainlink/contracts/src/v0.8/interfaces/AggregatorInterface.sol/AggregatorInterface.dbg.json +1 -1
- package/artifacts/@chainlink/contracts/src/v0.8/interfaces/AggregatorV2V3Interface.sol/AggregatorV2V3Interface.dbg.json +1 -1
- package/artifacts/@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol/AggregatorV3Interface.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts/access/AccessControl.sol/AccessControl.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts/access/IAccessControl.sol/IAccessControl.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts/token/ERC20/ERC20.sol/ERC20.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts/token/ERC20/IERC20.sol/IERC20.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol/IERC20Metadata.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts/utils/Context.sol/Context.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts/utils/Strings.sol/Strings.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts/utils/introspection/ERC165.sol/ERC165.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts/utils/introspection/IERC165.sol/IERC165.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts/utils/math/Math.sol/Math.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts/utils/math/SafeCast.sol/SafeCast.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts/utils/math/SignedMath.sol/SignedMath.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol/Ownable2StepUpgradeable.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol/OwnableUpgradeable.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol/Initializable.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol/PausableUpgradeable.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts-upgradeable/utils/AddressUpgradeable.sol/AddressUpgradeable.dbg.json +1 -1
- package/artifacts/@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol/ContextUpgradeable.dbg.json +1 -1
- package/artifacts/@venusprotocol/governance-contracts/contracts/Governance/AccessControlManager.sol/AccessControlManager.dbg.json +1 -1
- package/artifacts/@venusprotocol/governance-contracts/contracts/Governance/AccessControlledV8.sol/AccessControlledV8.dbg.json +1 -1
- package/artifacts/@venusprotocol/governance-contracts/contracts/Governance/IAccessControlManagerV8.sol/IAccessControlManagerV8.dbg.json +1 -1
- package/artifacts/build-info/{669ba4532c64b244397816b0f72e9870.json → 1b36a31ed645f3a01ad74019864055b0.json} +1 -1
- package/artifacts/contracts/ResilientOracle.sol/ResilientOracle.dbg.json +1 -1
- package/artifacts/contracts/ResilientOracle.sol/ResilientOracle.json +2 -2
- package/artifacts/contracts/interfaces/FeedRegistryInterface.sol/FeedRegistryInterface.dbg.json +1 -1
- package/artifacts/contracts/interfaces/OracleInterface.sol/BoundValidatorInterface.dbg.json +1 -1
- package/artifacts/contracts/interfaces/OracleInterface.sol/OracleInterface.dbg.json +1 -1
- package/artifacts/contracts/interfaces/OracleInterface.sol/ResilientOracleInterface.dbg.json +1 -1
- package/artifacts/contracts/interfaces/OracleInterface.sol/TwapInterface.dbg.json +1 -1
- package/artifacts/contracts/interfaces/PublicResolverInterface.sol/PublicResolverInterface.dbg.json +1 -1
- package/artifacts/contracts/interfaces/PythInterface.sol/AbstractPyth.dbg.json +1 -1
- package/artifacts/contracts/interfaces/PythInterface.sol/IPyth.dbg.json +1 -1
- package/artifacts/contracts/interfaces/PythInterface.sol/PythStructs.dbg.json +1 -1
- package/artifacts/contracts/interfaces/PythInterface.sol/PythStructs.json +2 -2
- package/artifacts/contracts/interfaces/SIDRegistryInterface.sol/SIDRegistryInterface.dbg.json +1 -1
- package/artifacts/contracts/interfaces/VBep20Interface.sol/VBep20Interface.dbg.json +1 -1
- package/artifacts/contracts/libraries/PancakeLibrary.sol/FixedPoint.dbg.json +1 -1
- package/artifacts/contracts/libraries/PancakeLibrary.sol/IPancakePair.dbg.json +1 -1
- package/artifacts/contracts/libraries/PancakeLibrary.sol/PancakeOracleLibrary.dbg.json +1 -1
- package/artifacts/contracts/oracles/BinanceOracle.sol/BinanceOracle.dbg.json +1 -1
- package/artifacts/contracts/oracles/BinanceOracle.sol/BinanceOracle.json +3 -3
- package/artifacts/contracts/oracles/BoundValidator.sol/BoundValidator.dbg.json +1 -1
- package/artifacts/contracts/oracles/BoundValidator.sol/BoundValidator.json +2 -2
- package/artifacts/contracts/oracles/ChainlinkOracle.sol/ChainlinkOracle.dbg.json +1 -1
- package/artifacts/contracts/oracles/ChainlinkOracle.sol/ChainlinkOracle.json +2 -2
- package/artifacts/contracts/oracles/PythOracle.sol/PythOracle.dbg.json +1 -1
- package/artifacts/contracts/oracles/PythOracle.sol/PythOracle.json +2 -2
- package/artifacts/contracts/oracles/TwapOracle.sol/TwapOracle.dbg.json +1 -1
- package/artifacts/contracts/oracles/TwapOracle.sol/TwapOracle.json +2 -2
- package/artifacts/contracts/oracles/mocks/MockBinanceFeedRegistry.sol/MockBinanceFeedRegistry.dbg.json +1 -1
- package/artifacts/contracts/oracles/mocks/MockBinanceOracle.sol/MockBinanceOracle.dbg.json +1 -1
- package/artifacts/contracts/oracles/mocks/MockChainlinkOracle.sol/MockChainlinkOracle.dbg.json +1 -1
- package/artifacts/contracts/oracles/mocks/MockChainlinkOracle.sol/MockChainlinkOracle.json +2 -2
- package/artifacts/contracts/oracles/mocks/MockPythOracle.sol/MockPythOracle.dbg.json +1 -1
- package/artifacts/contracts/oracles/mocks/MockPythOracle.sol/MockPythOracle.json +2 -2
- package/artifacts/contracts/oracles/mocks/MockTwapOracle.sol/MockTwapOracle.dbg.json +1 -1
- package/artifacts/contracts/test/AccessControlManager.sol/AccessControlManagerScenario.dbg.json +1 -1
- package/artifacts/contracts/test/BEP20Harness.sol/BEP20Harness.dbg.json +1 -1
- package/artifacts/contracts/test/MockPyth.sol/MockPyth.dbg.json +1 -1
- package/artifacts/contracts/test/MockPyth.sol/MockPyth.json +2 -2
- package/artifacts/contracts/test/MockSimpleOracle.sol/MockBoundValidator.dbg.json +1 -1
- package/artifacts/contracts/test/MockSimpleOracle.sol/MockSimpleOracle.dbg.json +1 -1
- package/artifacts/contracts/test/MockV3Aggregator.sol/MockV3Aggregator.dbg.json +1 -1
- package/artifacts/contracts/test/PancakePairHarness.sol/Math.dbg.json +1 -1
- package/artifacts/contracts/test/PancakePairHarness.sol/PancakePairHarness.dbg.json +1 -1
- package/artifacts/contracts/test/PancakePairHarness.sol/UQ112x112.dbg.json +1 -1
- package/artifacts/contracts/test/VBEP20Harness.sol/VBEP20Harness.dbg.json +1 -1
- package/contracts/ResilientOracle.sol +13 -10
- package/contracts/interfaces/PythInterface.sol +4 -1
- package/contracts/oracles/BinanceOracle.sol +13 -8
- package/contracts/oracles/BoundValidator.sol +4 -8
- package/contracts/oracles/ChainlinkOracle.sol +16 -8
- package/contracts/oracles/PythOracle.sol +15 -11
- package/contracts/oracles/TwapOracle.sol +13 -9
- package/contracts/test/MockPyth.sol +9 -2
- package/package.json +1 -1
|
@@ -677,8 +677,8 @@
|
|
|
677
677
|
"type": "function"
|
|
678
678
|
}
|
|
679
679
|
],
|
|
680
|
-
"bytecode": "0x608060405234801561001057600080fd5b5060405161184638038061184683398101604081905261002f9161003a565b600255600355610061565b6000806040838503121561005057610050600080fd5b505080516020909101519092909150565b6117d6806100706000396000f3fe6080604052600436106100dd5760003560e01c8063b5dcc9111161007f578063caaf43f111610059578063caaf43f114610256578063e17efd4814610283578063e18910a3146102b0578063ef9e5e28146102c557600080fd5b8063b5dcc911146101e7578063b5ec026114610207578063b9256d281461024357600080fd5b80639474f45b116100bb5780639474f45b1461015a57806396834ad31461017a57806396db63271461019a578063a4ae35e0146101c757600080fd5b806331d98b3f146100e257806361eac3c114610118578063711a2e281461013a575b600080fd5b3480156100ee57600080fd5b506101026100fd366004610acd565b6102d8565b60405161010f9190610b75565b60405180910390f35b34801561012457600080fd5b50610138610133366004610bd5565b6102f3565b005b34801561014657600080fd5b50610102610155366004610c1c565b61038f565b34801561016657600080fd5b50610102610175366004610acd565b6103cf565b34801561018657600080fd5b50610102610195366004610acd565b6103ed565b3480156101a657600080fd5b506101ba6101b5366004610c9d565b61040b565b60405161010f9190610d9a565b3480156101d357600080fd5b506101026101e2366004610c1c565b6104aa565b3480156101f357600080fd5b50610102610202366004610acd565b6104ea565b34801561021357600080fd5b50610236610222366004610acd565b600090815260208190526040902054151590565b60405161010f9190610dba565b610138610251366004610e12565b6104ff565b34801561026257600080fd5b50610276610271366004610acd565b61060d565b60405161010f9190610ef4565b34801561028f57600080fd5b506102a361029e366004610acd565b6106e5565b60405161010f9190610f03565b3480156102bc57600080fd5b506003546102a3565b6101386102d3366004610f11565b6106f5565b6102e0610a5e565b6102ed826101e260035490565b92915050565b806103195760405162461bcd60e51b815260040161031090610f7b565b60405180910390fd5b60005b8181101561038a5782828281811061033657610336610f8b565b9050610120020160008085858581811061035257610352610f8b565b90506101200201600001358152602001908152602001600020818161037791906111c8565b506103839050816111e8565b905061031c565b505050565b610397610a5e565b6103a0836103cf565b9050816103b1428360600151610a39565b11156102ed5760405162461bcd60e51b81526004016103109061124f565b6103d7610a5e565b60006103e28361060d565b604001519392505050565b6103f5610a5e565b60006104008361060d565b602001519392505050565b6060610415610a85565b8881526020808201805160078b810b90915281516001600160401b03808c1691850191909152825160038b900b6040918201819052935188831660609182018190528288018051958d900b9095528451938b169387019390935283518201949094529151909201919091525161048d91839101610ef4565b604051602081830303815290604052915050979650505050505050565b6104b2610a5e565b6104bb836103ed565b9050816104cc428360600151610a39565b11156102ed5760405162461bcd60e51b8152600401610310906112a5565b6104f2610a5e565b6102ed8261015560035490565b82811461051e5760405162461bcd60e51b81526004016103109061130f565b6000805b848110156105dc5761055a86868381811061053f5761053f610f8b565b90506020020135600090815260208190526040902054151590565b15806105bc575083838281811061057357610573610f8b565b9050602002016020810190610588919061131f565b6001600160401b03166105b28787848181106105a6576105a6610f8b565b9050602002013561060d565b6020015160600151105b156105ca57600191506105dc565b806105d4816111e8565b915050610522565b50806105fa5760405162461bcd60e51b815260040161031090611340565b61060487876106f5565b50505050505050565b610615610a85565b60008281526020819052604081205490036106425760405162461bcd60e51b815260040161031090611407565b5060009081526020818152604091829020825160608082018552825482528451608080820187526001850154600781810b84526001600160401b03600160401b8084048216868b0152600160801b93849004600390810b878d015260028a015487890152888b01969096528a519485018b52858901549283900b855282041697830197909752909504900b84860152600490920154918301919091529182015290565b6000816002546102ed9190611417565b6000610700826106e5565b9050803410156107225760405162461bcd60e51b81526004016103109061146a565b803411156107a857600033610737833461147a565b60405161074390611491565b60006040518083038185875af1925050503d8060008114610780576040519150601f19603f3d011682016040523d82523d6000602084013e610785565b606091505b50509050806107a65760405162461bcd60e51b8152600401610310906114d0565b505b60006001815b848110156109635760008686838181106107ca576107ca610f8b565b90506020028101906107dc91906114e0565b8101906107e9919061166d565b8051600090815260208181526040822060020154908301516060015192935090918110156108e957825160009081526020818152604091829020855181558186015180516001808401805484870151858901516001600160401b039586166fffffffffffffffffffffffffffffffff1993841617600160401b92871683021763ffffffff60801b19908116600160801b63ffffffff93841681029190911790955560609788015160028a01558a8e0151805160038b0180549c8301519d830151918a169c9096169b909b179b9097169092029990991716969097160294909417909455929092015160049092019190915591506108e6828761168f565b95505b825160015460208086015160608101518151919092015160405187151595947fa61a654f1064b28d3c54ec0c7b61399fc29b75a3843ead0c09708b5b18adda6e94610945948d946001600160401b039093169391928a926116b1565b60405180910390a3505050808061095b906111e8565b9150506107ae565b506001546040517f254e85f5767558fb38b8f4e9d6bfe52993573323fb65dd0ddfa0c5a68c67898f916109a59184916001600160401b0316908890879061170b565b60405180910390a16001805481906000906109ca9083906001600160401b0316611749565b92506101000a8154816001600160401b0302191690836001600160401b03160217905550336001600160a01b03167f740a0f779497a1dddcb571f245fe3093589bdd964509ed09ec0854ac9f4ec498600185604051610a2a929190611785565b60405180910390a25050505050565b600081831115610a5457610a4d828461147a565b90506102ed565b610a4d838361147a565b60408051608081018252600080825260208201819052918101829052606081019190915290565b60408051606081019091526000815260208101610aa0610a5e565b8152602001610aad610a5e565b905290565b805b8114610abf57600080fd5b50565b80356102ed81610ab2565b600060208284031215610ae257610ae2600080fd5b6000610aee8484610ac2565b949350505050565b610b008160070b90565b82525050565b6001600160401b038116610b00565b610b008160030b90565b80610b00565b80516080830190610b368482610af6565b506020820151610b496020850182610b06565b506040820151610b5c6040850182610b15565b506060820151610b6f6060850182610b1f565b50505050565b608081016102ed8284610b25565b60008083601f840112610b9857610b98600080fd5b5081356001600160401b03811115610bb257610bb2600080fd5b60208301915083610120820283011115610bce57610bce600080fd5b9250929050565b60008060208385031215610beb57610beb600080fd5b82356001600160401b03811115610c0457610c04600080fd5b610c1085828601610b83565b92509250509250929050565b60008060408385031215610c3257610c32600080fd5b6000610c3e8585610ac2565b9250506020610c4f85828601610ac2565b9150509250929050565b610ab48160070b90565b80356102ed81610c59565b6001600160401b038116610ab4565b80356102ed81610c6e565b610ab48160030b90565b80356102ed81610c88565b600080600080600080600060e0888a031215610cbb57610cbb600080fd5b6000610cc78a8a610ac2565b9750506020610cd88a828b01610c63565b9650506040610ce98a828b01610c7d565b9550506060610cfa8a828b01610c92565b9450506080610d0b8a828b01610c63565b93505060a0610d1c8a828b01610c7d565b92505060c0610d2d8a828b01610c7d565b91505092959891949750929550565b60005b83811015610d57578181015183820152602001610d3f565b83811115610b6f5750506000910152565b6000610d72825190565b808452602084019350610d89818560208601610d3c565b601f01601f19169290920192915050565b60208082528101610dab8184610d68565b9392505050565b801515610b00565b602081016102ed8284610db2565b60008083601f840112610ddd57610ddd600080fd5b5081356001600160401b03811115610df757610df7600080fd5b602083019150836020820283011115610bce57610bce600080fd5b60008060008060008060608789031215610e2e57610e2e600080fd5b86356001600160401b03811115610e4757610e47600080fd5b610e5389828a01610dc8565b965096505060208701356001600160401b03811115610e7457610e74600080fd5b610e8089828a01610dc8565b945094505060408701356001600160401b03811115610ea157610ea1600080fd5b610ead89828a01610dc8565b92509250509295509295509295565b8051610120830190610ece8482610b1f565b506020820151610ee16020850182610b25565b506040820151610b6f60a0850182610b25565b61012081016102ed8284610ebc565b602081016102ed8284610b1f565b60008060208385031215610f2757610f27600080fd5b82356001600160401b03811115610f4057610f40600080fd5b610c1085828601610dc8565b601581526000602082017406665656473206c656e677468206d757374203e203605c1b815291505b5060200190565b602080825281016102ed81610f4c565b634e487b7160e01b600052603260045260246000fd5b600081356102ed81610ab2565b6000600019835b81169019929092169190911792915050565b6000816102ed565b610fd882610fc7565b610feb610fe482610fc7565b8354610fae565b8255505050565b600081356102ed81610c59565b60006001600160401b0383610fb5565b60006102ed6110246110218460070b90565b90565b60070b90565b6110338261100f565b610feb818354610fff565b600081356102ed81610c6e565b60006fffffffffffffffff0000000000000000610fb58460401b90565b60006001600160401b0382166102ed565b61108282611068565b610feb81835461104b565b600081356102ed81610c88565b600063ffffffff60801b610fb58460801b90565b60006102ed6110c06110218460030b90565b60030b90565b6110cf826110ae565b610feb81835461109a565b60006102ed6110218381565b6110ef826110da565b610feb81610fe4565b80828061110481610ff2565b9050611110818461102a565b508291505060208301806111238161103e565b905061112f8184611079565b508291505060408301806111428161108d565b905061114e81846110c6565b50505060018101606083018061116381610fa1565b905061116f81846110e6565b5050505050565b61118082826110f8565b5050565b80828061119081610fa1565b905061119c8184610fcf565b5050506001810160208301806111b28184611176565b5050506003810160a083018061116f8184611176565b6111808282611184565b634e487b7160e01b600052601160045260246000fd5b600060001982036111fb576111fb6111d2565b5060010190565b602d81526000602082017f6e6f20656d6120707269636520617661696c61626c652077686963682069732081526c0e4cac6cadce840cadcdeeaced609b1b602082015291505b5060400190565b602080825281016102ed81611202565b602981526000602082017f6e6f20707269636520617661696c61626c6520776869636820697320726563658152680dce840cadcdeeaced60bb1b60208201529150611248565b602080825281016102ed8161125f565b603881526000602082017f707269636549647320616e64207075626c69736854696d65732061727261797381527f2073686f756c6420686176652073616d65206c656e677468000000000000000060208201529150611248565b602080825281016102ed816112b5565b60006020828403121561133457611334600080fd5b6000610aee8484610c7d565b602080825281016102ed81605681527f6e6f2070726963657320696e20746865207375626d697474656420626174636860208201527f2068617665206672657368207072696365732c20736f207468697320757064616040820152751d19481dda5b1b081a185d99481b9bc81959999958dd60521b606082015260800190565b602a81526000602082017f6e6f207072696365206665656420666f756e6420666f722074686520676976658152691b881c1c9a58d9481a5960b21b60208201529150611248565b602080825281016102ed816113c0565b6000816000190483118215151615611431576114316111d2565b500290565b601c81526000602082017f496e73756666696369656e7420706169642066656520616d6f756e740000000081529150610f74565b602080825281016102ed81611436565b60008282101561148c5761148c6111d2565b500390565b60006102ed82611021565b601d81526000602082017f6661696c656420746f207472616e73666572207570646174652066656500000081529150610f74565b602080825281016102ed8161149c565b6000808335601e19368590030181126114fb576114fb600080fd5b8084019250823591506001600160401b0382111561151b5761151b600080fd5b60208301925060018202360383131561153657611536600080fd5b509250929050565b634e487b7160e01b600052604160045260246000fd5b601f19601f83011681018181106001600160401b03821117156115795761157961153e565b6040525050565b600061158b60405190565b90506115978282611554565b919050565b6000608082840312156115b1576115b1600080fd5b6115bb6080611580565b905060006115c98484610c63565b82525060206115da84848301610c7d565b60208301525060406115ee84828501610c92565b604083015250606061160284828501610ac2565b60608301525092915050565b6000610120828403121561162457611624600080fd5b61162e6060611580565b9050600061163c8484610ac2565b825250602061164d8484830161159c565b60208301525060a06116618482850161159c565b60408301525092915050565b6000610120828403121561168357611683600080fd5b6000610aee848461160e565b600082198211156116a2576116a26111d2565b500190565b61ffff8116610b00565b60c081016116bf82896116a7565b6116cc6020830188610b06565b6116d96040830187610b1f565b6116e66060830186610b1f565b6116f36080830185610af6565b61170060a0830184610b06565b979650505050505050565b6080810161171982876116a7565b6117266020830186610b06565b6117336040830185610b1f565b6117406060830184610b1f565b95945050505050565b60006001600160401b03821691506001600160401b0383169250826001600160401b03038211156116a2576116a26111d2565b610b00816110da565b60408101611793828561177c565b610dab6020830184610b1f56fea2646970667358221220d927237638fab54fc779b2840d8e8cb78e5c6dfe9f7336529ea5c7c2d83f93b864736f6c634300080d0033",
|
|
681
|
-
"deployedBytecode": "0x6080604052600436106100dd5760003560e01c8063b5dcc9111161007f578063caaf43f111610059578063caaf43f114610256578063e17efd4814610283578063e18910a3146102b0578063ef9e5e28146102c557600080fd5b8063b5dcc911146101e7578063b5ec026114610207578063b9256d281461024357600080fd5b80639474f45b116100bb5780639474f45b1461015a57806396834ad31461017a57806396db63271461019a578063a4ae35e0146101c757600080fd5b806331d98b3f146100e257806361eac3c114610118578063711a2e281461013a575b600080fd5b3480156100ee57600080fd5b506101026100fd366004610acd565b6102d8565b60405161010f9190610b75565b60405180910390f35b34801561012457600080fd5b50610138610133366004610bd5565b6102f3565b005b34801561014657600080fd5b50610102610155366004610c1c565b61038f565b34801561016657600080fd5b50610102610175366004610acd565b6103cf565b34801561018657600080fd5b50610102610195366004610acd565b6103ed565b3480156101a657600080fd5b506101ba6101b5366004610c9d565b61040b565b60405161010f9190610d9a565b3480156101d357600080fd5b506101026101e2366004610c1c565b6104aa565b3480156101f357600080fd5b50610102610202366004610acd565b6104ea565b34801561021357600080fd5b50610236610222366004610acd565b600090815260208190526040902054151590565b60405161010f9190610dba565b610138610251366004610e12565b6104ff565b34801561026257600080fd5b50610276610271366004610acd565b61060d565b60405161010f9190610ef4565b34801561028f57600080fd5b506102a361029e366004610acd565b6106e5565b60405161010f9190610f03565b3480156102bc57600080fd5b506003546102a3565b6101386102d3366004610f11565b6106f5565b6102e0610a5e565b6102ed826101e260035490565b92915050565b806103195760405162461bcd60e51b815260040161031090610f7b565b60405180910390fd5b60005b8181101561038a5782828281811061033657610336610f8b565b9050610120020160008085858581811061035257610352610f8b565b90506101200201600001358152602001908152602001600020818161037791906111c8565b506103839050816111e8565b905061031c565b505050565b610397610a5e565b6103a0836103cf565b9050816103b1428360600151610a39565b11156102ed5760405162461bcd60e51b81526004016103109061124f565b6103d7610a5e565b60006103e28361060d565b604001519392505050565b6103f5610a5e565b60006104008361060d565b602001519392505050565b6060610415610a85565b8881526020808201805160078b810b90915281516001600160401b03808c1691850191909152825160038b900b6040918201819052935188831660609182018190528288018051958d900b9095528451938b169387019390935283518201949094529151909201919091525161048d91839101610ef4565b604051602081830303815290604052915050979650505050505050565b6104b2610a5e565b6104bb836103ed565b9050816104cc428360600151610a39565b11156102ed5760405162461bcd60e51b8152600401610310906112a5565b6104f2610a5e565b6102ed8261015560035490565b82811461051e5760405162461bcd60e51b81526004016103109061130f565b6000805b848110156105dc5761055a86868381811061053f5761053f610f8b565b90506020020135600090815260208190526040902054151590565b15806105bc575083838281811061057357610573610f8b565b9050602002016020810190610588919061131f565b6001600160401b03166105b28787848181106105a6576105a6610f8b565b9050602002013561060d565b6020015160600151105b156105ca57600191506105dc565b806105d4816111e8565b915050610522565b50806105fa5760405162461bcd60e51b815260040161031090611340565b61060487876106f5565b50505050505050565b610615610a85565b60008281526020819052604081205490036106425760405162461bcd60e51b815260040161031090611407565b5060009081526020818152604091829020825160608082018552825482528451608080820187526001850154600781810b84526001600160401b03600160401b8084048216868b0152600160801b93849004600390810b878d015260028a015487890152888b01969096528a519485018b52858901549283900b855282041697830197909752909504900b84860152600490920154918301919091529182015290565b6000816002546102ed9190611417565b6000610700826106e5565b9050803410156107225760405162461bcd60e51b81526004016103109061146a565b803411156107a857600033610737833461147a565b60405161074390611491565b60006040518083038185875af1925050503d8060008114610780576040519150601f19603f3d011682016040523d82523d6000602084013e610785565b606091505b50509050806107a65760405162461bcd60e51b8152600401610310906114d0565b505b60006001815b848110156109635760008686838181106107ca576107ca610f8b565b90506020028101906107dc91906114e0565b8101906107e9919061166d565b8051600090815260208181526040822060020154908301516060015192935090918110156108e957825160009081526020818152604091829020855181558186015180516001808401805484870151858901516001600160401b039586166fffffffffffffffffffffffffffffffff1993841617600160401b92871683021763ffffffff60801b19908116600160801b63ffffffff93841681029190911790955560609788015160028a01558a8e0151805160038b0180549c8301519d830151918a169c9096169b909b179b9097169092029990991716969097160294909417909455929092015160049092019190915591506108e6828761168f565b95505b825160015460208086015160608101518151919092015160405187151595947fa61a654f1064b28d3c54ec0c7b61399fc29b75a3843ead0c09708b5b18adda6e94610945948d946001600160401b039093169391928a926116b1565b60405180910390a3505050808061095b906111e8565b9150506107ae565b506001546040517f254e85f5767558fb38b8f4e9d6bfe52993573323fb65dd0ddfa0c5a68c67898f916109a59184916001600160401b0316908890879061170b565b60405180910390a16001805481906000906109ca9083906001600160401b0316611749565b92506101000a8154816001600160401b0302191690836001600160401b03160217905550336001600160a01b03167f740a0f779497a1dddcb571f245fe3093589bdd964509ed09ec0854ac9f4ec498600185604051610a2a929190611785565b60405180910390a25050505050565b600081831115610a5457610a4d828461147a565b90506102ed565b610a4d838361147a565b60408051608081018252600080825260208201819052918101829052606081019190915290565b60408051606081019091526000815260208101610aa0610a5e565b8152602001610aad610a5e565b905290565b805b8114610abf57600080fd5b50565b80356102ed81610ab2565b600060208284031215610ae257610ae2600080fd5b6000610aee8484610ac2565b949350505050565b610b008160070b90565b82525050565b6001600160401b038116610b00565b610b008160030b90565b80610b00565b80516080830190610b368482610af6565b506020820151610b496020850182610b06565b506040820151610b5c6040850182610b15565b506060820151610b6f6060850182610b1f565b50505050565b608081016102ed8284610b25565b60008083601f840112610b9857610b98600080fd5b5081356001600160401b03811115610bb257610bb2600080fd5b60208301915083610120820283011115610bce57610bce600080fd5b9250929050565b60008060208385031215610beb57610beb600080fd5b82356001600160401b03811115610c0457610c04600080fd5b610c1085828601610b83565b92509250509250929050565b60008060408385031215610c3257610c32600080fd5b6000610c3e8585610ac2565b9250506020610c4f85828601610ac2565b9150509250929050565b610ab48160070b90565b80356102ed81610c59565b6001600160401b038116610ab4565b80356102ed81610c6e565b610ab48160030b90565b80356102ed81610c88565b600080600080600080600060e0888a031215610cbb57610cbb600080fd5b6000610cc78a8a610ac2565b9750506020610cd88a828b01610c63565b9650506040610ce98a828b01610c7d565b9550506060610cfa8a828b01610c92565b9450506080610d0b8a828b01610c63565b93505060a0610d1c8a828b01610c7d565b92505060c0610d2d8a828b01610c7d565b91505092959891949750929550565b60005b83811015610d57578181015183820152602001610d3f565b83811115610b6f5750506000910152565b6000610d72825190565b808452602084019350610d89818560208601610d3c565b601f01601f19169290920192915050565b60208082528101610dab8184610d68565b9392505050565b801515610b00565b602081016102ed8284610db2565b60008083601f840112610ddd57610ddd600080fd5b5081356001600160401b03811115610df757610df7600080fd5b602083019150836020820283011115610bce57610bce600080fd5b60008060008060008060608789031215610e2e57610e2e600080fd5b86356001600160401b03811115610e4757610e47600080fd5b610e5389828a01610dc8565b965096505060208701356001600160401b03811115610e7457610e74600080fd5b610e8089828a01610dc8565b945094505060408701356001600160401b03811115610ea157610ea1600080fd5b610ead89828a01610dc8565b92509250509295509295509295565b8051610120830190610ece8482610b1f565b506020820151610ee16020850182610b25565b506040820151610b6f60a0850182610b25565b61012081016102ed8284610ebc565b602081016102ed8284610b1f565b60008060208385031215610f2757610f27600080fd5b82356001600160401b03811115610f4057610f40600080fd5b610c1085828601610dc8565b601581526000602082017406665656473206c656e677468206d757374203e203605c1b815291505b5060200190565b602080825281016102ed81610f4c565b634e487b7160e01b600052603260045260246000fd5b600081356102ed81610ab2565b6000600019835b81169019929092169190911792915050565b6000816102ed565b610fd882610fc7565b610feb610fe482610fc7565b8354610fae565b8255505050565b600081356102ed81610c59565b60006001600160401b0383610fb5565b60006102ed6110246110218460070b90565b90565b60070b90565b6110338261100f565b610feb818354610fff565b600081356102ed81610c6e565b60006fffffffffffffffff0000000000000000610fb58460401b90565b60006001600160401b0382166102ed565b61108282611068565b610feb81835461104b565b600081356102ed81610c88565b600063ffffffff60801b610fb58460801b90565b60006102ed6110c06110218460030b90565b60030b90565b6110cf826110ae565b610feb81835461109a565b60006102ed6110218381565b6110ef826110da565b610feb81610fe4565b80828061110481610ff2565b9050611110818461102a565b508291505060208301806111238161103e565b905061112f8184611079565b508291505060408301806111428161108d565b905061114e81846110c6565b50505060018101606083018061116381610fa1565b905061116f81846110e6565b5050505050565b61118082826110f8565b5050565b80828061119081610fa1565b905061119c8184610fcf565b5050506001810160208301806111b28184611176565b5050506003810160a083018061116f8184611176565b6111808282611184565b634e487b7160e01b600052601160045260246000fd5b600060001982036111fb576111fb6111d2565b5060010190565b602d81526000602082017f6e6f20656d6120707269636520617661696c61626c652077686963682069732081526c0e4cac6cadce840cadcdeeaced609b1b602082015291505b5060400190565b602080825281016102ed81611202565b602981526000602082017f6e6f20707269636520617661696c61626c6520776869636820697320726563658152680dce840cadcdeeaced60bb1b60208201529150611248565b602080825281016102ed8161125f565b603881526000602082017f707269636549647320616e64207075626c69736854696d65732061727261797381527f2073686f756c6420686176652073616d65206c656e677468000000000000000060208201529150611248565b602080825281016102ed816112b5565b60006020828403121561133457611334600080fd5b6000610aee8484610c7d565b602080825281016102ed81605681527f6e6f2070726963657320696e20746865207375626d697474656420626174636860208201527f2068617665206672657368207072696365732c20736f207468697320757064616040820152751d19481dda5b1b081a185d99481b9bc81959999958dd60521b606082015260800190565b602a81526000602082017f6e6f207072696365206665656420666f756e6420666f722074686520676976658152691b881c1c9a58d9481a5960b21b60208201529150611248565b602080825281016102ed816113c0565b6000816000190483118215151615611431576114316111d2565b500290565b601c81526000602082017f496e73756666696369656e7420706169642066656520616d6f756e740000000081529150610f74565b602080825281016102ed81611436565b60008282101561148c5761148c6111d2565b500390565b60006102ed82611021565b601d81526000602082017f6661696c656420746f207472616e73666572207570646174652066656500000081529150610f74565b602080825281016102ed8161149c565b6000808335601e19368590030181126114fb576114fb600080fd5b8084019250823591506001600160401b0382111561151b5761151b600080fd5b60208301925060018202360383131561153657611536600080fd5b509250929050565b634e487b7160e01b600052604160045260246000fd5b601f19601f83011681018181106001600160401b03821117156115795761157961153e565b6040525050565b600061158b60405190565b90506115978282611554565b919050565b6000608082840312156115b1576115b1600080fd5b6115bb6080611580565b905060006115c98484610c63565b82525060206115da84848301610c7d565b60208301525060406115ee84828501610c92565b604083015250606061160284828501610ac2565b60608301525092915050565b6000610120828403121561162457611624600080fd5b61162e6060611580565b9050600061163c8484610ac2565b825250602061164d8484830161159c565b60208301525060a06116618482850161159c565b60408301525092915050565b6000610120828403121561168357611683600080fd5b6000610aee848461160e565b600082198211156116a2576116a26111d2565b500190565b61ffff8116610b00565b60c081016116bf82896116a7565b6116cc6020830188610b06565b6116d96040830187610b1f565b6116e66060830186610b1f565b6116f36080830185610af6565b61170060a0830184610b06565b979650505050505050565b6080810161171982876116a7565b6117266020830186610b06565b6117336040830185610b1f565b6117406060830184610b1f565b95945050505050565b60006001600160401b03821691506001600160401b0383169250826001600160401b03038211156116a2576116a26111d2565b610b00816110da565b60408101611793828561177c565b610dab6020830184610b1f56fea2646970667358221220d927237638fab54fc779b2840d8e8cb78e5c6dfe9f7336529ea5c7c2d83f93b864736f6c634300080d0033",
|
|
680
|
+
"bytecode": "0x608060405234801561001057600080fd5b5060405161180e38038061180e83398101604081905261002f9161003a565b600255600355610061565b6000806040838503121561005057610050600080fd5b505080516020909101519092909150565b61179e806100706000396000f3fe6080604052600436106100dd5760003560e01c8063b5dcc9111161007f578063caaf43f111610059578063caaf43f114610256578063e17efd4814610283578063e18910a3146102b0578063ef9e5e28146102c557600080fd5b8063b5dcc911146101e7578063b5ec026114610207578063b9256d281461024357600080fd5b80639474f45b116100bb5780639474f45b1461015a57806396834ad31461017a57806396db63271461019a578063a4ae35e0146101c757600080fd5b806331d98b3f146100e257806361eac3c114610118578063711a2e281461013a575b600080fd5b3480156100ee57600080fd5b506101026100fd366004610aaf565b6102d8565b60405161010f9190610b57565b60405180910390f35b34801561012457600080fd5b50610138610133366004610bb7565b6102f3565b005b34801561014657600080fd5b50610102610155366004610bfe565b610386565b34801561016657600080fd5b50610102610175366004610aaf565b6103c6565b34801561018657600080fd5b50610102610195366004610aaf565b6103e4565b3480156101a657600080fd5b506101ba6101b5366004610c7f565b610402565b60405161010f9190610d7c565b3480156101d357600080fd5b506101026101e2366004610bfe565b6104a1565b3480156101f357600080fd5b50610102610202366004610aaf565b6104e1565b34801561021357600080fd5b50610236610222366004610aaf565b600090815260208190526040902054151590565b60405161010f9190610d9c565b610138610251366004610df4565b6104f6565b34801561026257600080fd5b50610276610271366004610aaf565b6105fa565b60405161010f9190610ed6565b34801561028f57600080fd5b506102a361029e366004610aaf565b6106d2565b60405161010f9190610ee5565b3480156102bc57600080fd5b506003546102a3565b6101386102d3366004610ef3565b6106e2565b6102e0610a40565b6102ed826101e260035490565b92915050565b806103195760405162461bcd60e51b815260040161031090610f5d565b60405180910390fd5b60005b818110156103815782828281811061033657610336610f6d565b9050610120020160008085858581811061035257610352610f6d565b90506101200201600001358152602001908152602001600020818161037791906111aa565b505060010161031c565b505050565b61038e610a40565b610397836103c6565b9050816103a8428360600151610a1b565b11156102ed5760405162461bcd60e51b815260040161031090611201565b6103ce610a40565b60006103d9836105fa565b604001519392505050565b6103ec610a40565b60006103f7836105fa565b602001519392505050565b606061040c610a67565b8881526020808201805160078b810b90915281516001600160401b03808c1691850191909152825160038b900b6040918201819052935188831660609182018190528288018051958d900b9095528451938b169387019390935283518201949094529151909201919091525161048491839101610ed6565b604051602081830303815290604052915050979650505050505050565b6104a9610a40565b6104b2836103e4565b9050816104c3428360600151610a1b565b11156102ed5760405162461bcd60e51b815260040161031090611257565b6104e9610a40565b6102ed8261015560035490565b8281146105155760405162461bcd60e51b8152600401610310906112c1565b6000805b848110156105c95761055186868381811061053657610536610f6d565b90506020020135600090815260208190526040902054151590565b15806105b3575083838281811061056a5761056a610f6d565b905060200201602081019061057f91906112d1565b6001600160401b03166105a987878481811061059d5761059d610f6d565b905060200201356105fa565b6020015160600151105b156105c157600191506105c9565b600101610519565b50806105e75760405162461bcd60e51b8152600401610310906112f2565b6105f187876106e2565b50505050505050565b610602610a67565b600082815260208190526040812054900361062f5760405162461bcd60e51b8152600401610310906113b9565b5060009081526020818152604091829020825160608082018552825482528451608080820187526001850154600781810b84526001600160401b03600160401b8084048216868b0152600160801b93849004600390810b878d015260028a015487890152888b01969096528a519485018b52858901549283900b855282041697830197909752909504900b84860152600490920154918301919091529182015290565b6000816002546102ed91906113df565b60006106ed826106d2565b90508034101561070f5760405162461bcd60e51b815260040161031090611432565b80341115610795576000336107248334611442565b60405161073090611459565b60006040518083038185875af1925050503d806000811461076d576040519150601f19603f3d011682016040523d82523d6000602084013e610772565b606091505b50509050806107935760405162461bcd60e51b815260040161031090611498565b505b60006001815b848110156109455760008686838181106107b7576107b7610f6d565b90506020028101906107c991906114a8565b8101906107d69190611635565b8051600090815260208181526040822060020154908301516060015192935090918110156108d657825160009081526020818152604091829020855181558186015180516001808401805484870151858901516001600160401b039586166fffffffffffffffffffffffffffffffff1993841617600160401b92871683021763ffffffff60801b19908116600160801b63ffffffff93841681029190911790955560609788015160028a01558a8e0151805160038b0180549c8301519d830151918a169c9096169b909b179b9097169092029990991716969097160294909417909455929092015160049092019190915591506108d38287611657565b95505b825160015460208086015160608101518151919092015160405187151595947fa61a654f1064b28d3c54ec0c7b61399fc29b75a3843ead0c09708b5b18adda6e94610932948d946001600160401b039093169391928a92611679565b60405180910390a350505060010161079b565b506001546040517f254e85f5767558fb38b8f4e9d6bfe52993573323fb65dd0ddfa0c5a68c67898f916109879184916001600160401b031690889087906116d3565b60405180910390a16001805481906000906109ac9083906001600160401b0316611711565b92506101000a8154816001600160401b0302191690836001600160401b03160217905550336001600160a01b03167f740a0f779497a1dddcb571f245fe3093589bdd964509ed09ec0854ac9f4ec498600185604051610a0c92919061174d565b60405180910390a25050505050565b600081831115610a3657610a2f8284611442565b90506102ed565b610a2f8383611442565b60408051608081018252600080825260208201819052918101829052606081019190915290565b60408051606081019091526000815260208101610a82610a40565b8152602001610a8f610a40565b905290565b805b8114610aa157600080fd5b50565b80356102ed81610a94565b600060208284031215610ac457610ac4600080fd5b6000610ad08484610aa4565b949350505050565b610ae28160070b90565b82525050565b6001600160401b038116610ae2565b610ae28160030b90565b80610ae2565b80516080830190610b188482610ad8565b506020820151610b2b6020850182610ae8565b506040820151610b3e6040850182610af7565b506060820151610b516060850182610b01565b50505050565b608081016102ed8284610b07565b60008083601f840112610b7a57610b7a600080fd5b5081356001600160401b03811115610b9457610b94600080fd5b60208301915083610120820283011115610bb057610bb0600080fd5b9250929050565b60008060208385031215610bcd57610bcd600080fd5b82356001600160401b03811115610be657610be6600080fd5b610bf285828601610b65565b92509250509250929050565b60008060408385031215610c1457610c14600080fd5b6000610c208585610aa4565b9250506020610c3185828601610aa4565b9150509250929050565b610a968160070b90565b80356102ed81610c3b565b6001600160401b038116610a96565b80356102ed81610c50565b610a968160030b90565b80356102ed81610c6a565b600080600080600080600060e0888a031215610c9d57610c9d600080fd5b6000610ca98a8a610aa4565b9750506020610cba8a828b01610c45565b9650506040610ccb8a828b01610c5f565b9550506060610cdc8a828b01610c74565b9450506080610ced8a828b01610c45565b93505060a0610cfe8a828b01610c5f565b92505060c0610d0f8a828b01610c5f565b91505092959891949750929550565b60005b83811015610d39578181015183820152602001610d21565b83811115610b515750506000910152565b6000610d54825190565b808452602084019350610d6b818560208601610d1e565b601f01601f19169290920192915050565b60208082528101610d8d8184610d4a565b9392505050565b801515610ae2565b602081016102ed8284610d94565b60008083601f840112610dbf57610dbf600080fd5b5081356001600160401b03811115610dd957610dd9600080fd5b602083019150836020820283011115610bb057610bb0600080fd5b60008060008060008060608789031215610e1057610e10600080fd5b86356001600160401b03811115610e2957610e29600080fd5b610e3589828a01610daa565b965096505060208701356001600160401b03811115610e5657610e56600080fd5b610e6289828a01610daa565b945094505060408701356001600160401b03811115610e8357610e83600080fd5b610e8f89828a01610daa565b92509250509295509295509295565b8051610120830190610eb08482610b01565b506020820151610ec36020850182610b07565b506040820151610b5160a0850182610b07565b61012081016102ed8284610e9e565b602081016102ed8284610b01565b60008060208385031215610f0957610f09600080fd5b82356001600160401b03811115610f2257610f22600080fd5b610bf285828601610daa565b601581526000602082017406665656473206c656e677468206d757374203e203605c1b815291505b5060200190565b602080825281016102ed81610f2e565b634e487b7160e01b600052603260045260246000fd5b600081356102ed81610a94565b6000600019835b81169019929092169190911792915050565b6000816102ed565b610fba82610fa9565b610fcd610fc682610fa9565b8354610f90565b8255505050565b600081356102ed81610c3b565b60006001600160401b0383610f97565b60006102ed6110066110038460070b90565b90565b60070b90565b61101582610ff1565b610fcd818354610fe1565b600081356102ed81610c50565b60006fffffffffffffffff0000000000000000610f978460401b90565b60006001600160401b0382166102ed565b6110648261104a565b610fcd81835461102d565b600081356102ed81610c6a565b600063ffffffff60801b610f978460801b90565b60006102ed6110a26110038460030b90565b60030b90565b6110b182611090565b610fcd81835461107c565b60006102ed6110038381565b6110d1826110bc565b610fcd81610fc6565b8082806110e681610fd4565b90506110f2818461100c565b5082915050602083018061110581611020565b9050611111818461105b565b508291505060408301806111248161106f565b905061113081846110a8565b50505060018101606083018061114581610f83565b905061115181846110c8565b5050505050565b61116282826110da565b5050565b80828061117281610f83565b905061117e8184610fb1565b5050506001810160208301806111948184611158565b5050506003810160a08301806111518184611158565b6111628282611166565b602d81526000602082017f6e6f20656d6120707269636520617661696c61626c652077686963682069732081526c0e4cac6cadce840cadcdeeaced609b1b602082015291505b5060400190565b602080825281016102ed816111b4565b602981526000602082017f6e6f20707269636520617661696c61626c6520776869636820697320726563658152680dce840cadcdeeaced60bb1b602082015291506111fa565b602080825281016102ed81611211565b603881526000602082017f707269636549647320616e64207075626c69736854696d65732061727261797381527f2073686f756c6420686176652073616d65206c656e6774680000000000000000602082015291506111fa565b602080825281016102ed81611267565b6000602082840312156112e6576112e6600080fd5b6000610ad08484610c5f565b602080825281016102ed81605681527f6e6f2070726963657320696e20746865207375626d697474656420626174636860208201527f2068617665206672657368207072696365732c20736f207468697320757064616040820152751d19481dda5b1b081a185d99481b9bc81959999958dd60521b606082015260800190565b602a81526000602082017f6e6f207072696365206665656420666f756e6420666f722074686520676976658152691b881c1c9a58d9481a5960b21b602082015291506111fa565b602080825281016102ed81611372565b634e487b7160e01b600052601160045260246000fd5b60008160001904831182151516156113f9576113f96113c9565b500290565b601c81526000602082017f496e73756666696369656e7420706169642066656520616d6f756e740000000081529150610f56565b602080825281016102ed816113fe565b600082821015611454576114546113c9565b500390565b60006102ed82611003565b601d81526000602082017f6661696c656420746f207472616e73666572207570646174652066656500000081529150610f56565b602080825281016102ed81611464565b6000808335601e19368590030181126114c3576114c3600080fd5b8084019250823591506001600160401b038211156114e3576114e3600080fd5b6020830192506001820236038313156114fe576114fe600080fd5b509250929050565b634e487b7160e01b600052604160045260246000fd5b601f19601f83011681018181106001600160401b038211171561154157611541611506565b6040525050565b600061155360405190565b905061155f828261151c565b919050565b60006080828403121561157957611579600080fd5b6115836080611548565b905060006115918484610c45565b82525060206115a284848301610c5f565b60208301525060406115b684828501610c74565b60408301525060606115ca84828501610aa4565b60608301525092915050565b600061012082840312156115ec576115ec600080fd5b6115f66060611548565b905060006116048484610aa4565b825250602061161584848301611564565b60208301525060a061162984828501611564565b60408301525092915050565b6000610120828403121561164b5761164b600080fd5b6000610ad084846115d6565b6000821982111561166a5761166a6113c9565b500190565b61ffff8116610ae2565b60c08101611687828961166f565b6116946020830188610ae8565b6116a16040830187610b01565b6116ae6060830186610b01565b6116bb6080830185610ad8565b6116c860a0830184610ae8565b979650505050505050565b608081016116e1828761166f565b6116ee6020830186610ae8565b6116fb6040830185610b01565b6117086060830184610b01565b95945050505050565b60006001600160401b03821691506001600160401b0383169250826001600160401b030382111561166a5761166a6113c9565b610ae2816110bc565b6040810161175b8285611744565b610d8d6020830184610b0156fea2646970667358221220b013759453084319f1522e3a0c7b1aab6f9d3d635088fc6f66bf098fed9a49ae64736f6c634300080d0033",
|
|
681
|
+
"deployedBytecode": "0x6080604052600436106100dd5760003560e01c8063b5dcc9111161007f578063caaf43f111610059578063caaf43f114610256578063e17efd4814610283578063e18910a3146102b0578063ef9e5e28146102c557600080fd5b8063b5dcc911146101e7578063b5ec026114610207578063b9256d281461024357600080fd5b80639474f45b116100bb5780639474f45b1461015a57806396834ad31461017a57806396db63271461019a578063a4ae35e0146101c757600080fd5b806331d98b3f146100e257806361eac3c114610118578063711a2e281461013a575b600080fd5b3480156100ee57600080fd5b506101026100fd366004610aaf565b6102d8565b60405161010f9190610b57565b60405180910390f35b34801561012457600080fd5b50610138610133366004610bb7565b6102f3565b005b34801561014657600080fd5b50610102610155366004610bfe565b610386565b34801561016657600080fd5b50610102610175366004610aaf565b6103c6565b34801561018657600080fd5b50610102610195366004610aaf565b6103e4565b3480156101a657600080fd5b506101ba6101b5366004610c7f565b610402565b60405161010f9190610d7c565b3480156101d357600080fd5b506101026101e2366004610bfe565b6104a1565b3480156101f357600080fd5b50610102610202366004610aaf565b6104e1565b34801561021357600080fd5b50610236610222366004610aaf565b600090815260208190526040902054151590565b60405161010f9190610d9c565b610138610251366004610df4565b6104f6565b34801561026257600080fd5b50610276610271366004610aaf565b6105fa565b60405161010f9190610ed6565b34801561028f57600080fd5b506102a361029e366004610aaf565b6106d2565b60405161010f9190610ee5565b3480156102bc57600080fd5b506003546102a3565b6101386102d3366004610ef3565b6106e2565b6102e0610a40565b6102ed826101e260035490565b92915050565b806103195760405162461bcd60e51b815260040161031090610f5d565b60405180910390fd5b60005b818110156103815782828281811061033657610336610f6d565b9050610120020160008085858581811061035257610352610f6d565b90506101200201600001358152602001908152602001600020818161037791906111aa565b505060010161031c565b505050565b61038e610a40565b610397836103c6565b9050816103a8428360600151610a1b565b11156102ed5760405162461bcd60e51b815260040161031090611201565b6103ce610a40565b60006103d9836105fa565b604001519392505050565b6103ec610a40565b60006103f7836105fa565b602001519392505050565b606061040c610a67565b8881526020808201805160078b810b90915281516001600160401b03808c1691850191909152825160038b900b6040918201819052935188831660609182018190528288018051958d900b9095528451938b169387019390935283518201949094529151909201919091525161048491839101610ed6565b604051602081830303815290604052915050979650505050505050565b6104a9610a40565b6104b2836103e4565b9050816104c3428360600151610a1b565b11156102ed5760405162461bcd60e51b815260040161031090611257565b6104e9610a40565b6102ed8261015560035490565b8281146105155760405162461bcd60e51b8152600401610310906112c1565b6000805b848110156105c95761055186868381811061053657610536610f6d565b90506020020135600090815260208190526040902054151590565b15806105b3575083838281811061056a5761056a610f6d565b905060200201602081019061057f91906112d1565b6001600160401b03166105a987878481811061059d5761059d610f6d565b905060200201356105fa565b6020015160600151105b156105c157600191506105c9565b600101610519565b50806105e75760405162461bcd60e51b8152600401610310906112f2565b6105f187876106e2565b50505050505050565b610602610a67565b600082815260208190526040812054900361062f5760405162461bcd60e51b8152600401610310906113b9565b5060009081526020818152604091829020825160608082018552825482528451608080820187526001850154600781810b84526001600160401b03600160401b8084048216868b0152600160801b93849004600390810b878d015260028a015487890152888b01969096528a519485018b52858901549283900b855282041697830197909752909504900b84860152600490920154918301919091529182015290565b6000816002546102ed91906113df565b60006106ed826106d2565b90508034101561070f5760405162461bcd60e51b815260040161031090611432565b80341115610795576000336107248334611442565b60405161073090611459565b60006040518083038185875af1925050503d806000811461076d576040519150601f19603f3d011682016040523d82523d6000602084013e610772565b606091505b50509050806107935760405162461bcd60e51b815260040161031090611498565b505b60006001815b848110156109455760008686838181106107b7576107b7610f6d565b90506020028101906107c991906114a8565b8101906107d69190611635565b8051600090815260208181526040822060020154908301516060015192935090918110156108d657825160009081526020818152604091829020855181558186015180516001808401805484870151858901516001600160401b039586166fffffffffffffffffffffffffffffffff1993841617600160401b92871683021763ffffffff60801b19908116600160801b63ffffffff93841681029190911790955560609788015160028a01558a8e0151805160038b0180549c8301519d830151918a169c9096169b909b179b9097169092029990991716969097160294909417909455929092015160049092019190915591506108d38287611657565b95505b825160015460208086015160608101518151919092015160405187151595947fa61a654f1064b28d3c54ec0c7b61399fc29b75a3843ead0c09708b5b18adda6e94610932948d946001600160401b039093169391928a92611679565b60405180910390a350505060010161079b565b506001546040517f254e85f5767558fb38b8f4e9d6bfe52993573323fb65dd0ddfa0c5a68c67898f916109879184916001600160401b031690889087906116d3565b60405180910390a16001805481906000906109ac9083906001600160401b0316611711565b92506101000a8154816001600160401b0302191690836001600160401b03160217905550336001600160a01b03167f740a0f779497a1dddcb571f245fe3093589bdd964509ed09ec0854ac9f4ec498600185604051610a0c92919061174d565b60405180910390a25050505050565b600081831115610a3657610a2f8284611442565b90506102ed565b610a2f8383611442565b60408051608081018252600080825260208201819052918101829052606081019190915290565b60408051606081019091526000815260208101610a82610a40565b8152602001610a8f610a40565b905290565b805b8114610aa157600080fd5b50565b80356102ed81610a94565b600060208284031215610ac457610ac4600080fd5b6000610ad08484610aa4565b949350505050565b610ae28160070b90565b82525050565b6001600160401b038116610ae2565b610ae28160030b90565b80610ae2565b80516080830190610b188482610ad8565b506020820151610b2b6020850182610ae8565b506040820151610b3e6040850182610af7565b506060820151610b516060850182610b01565b50505050565b608081016102ed8284610b07565b60008083601f840112610b7a57610b7a600080fd5b5081356001600160401b03811115610b9457610b94600080fd5b60208301915083610120820283011115610bb057610bb0600080fd5b9250929050565b60008060208385031215610bcd57610bcd600080fd5b82356001600160401b03811115610be657610be6600080fd5b610bf285828601610b65565b92509250509250929050565b60008060408385031215610c1457610c14600080fd5b6000610c208585610aa4565b9250506020610c3185828601610aa4565b9150509250929050565b610a968160070b90565b80356102ed81610c3b565b6001600160401b038116610a96565b80356102ed81610c50565b610a968160030b90565b80356102ed81610c6a565b600080600080600080600060e0888a031215610c9d57610c9d600080fd5b6000610ca98a8a610aa4565b9750506020610cba8a828b01610c45565b9650506040610ccb8a828b01610c5f565b9550506060610cdc8a828b01610c74565b9450506080610ced8a828b01610c45565b93505060a0610cfe8a828b01610c5f565b92505060c0610d0f8a828b01610c5f565b91505092959891949750929550565b60005b83811015610d39578181015183820152602001610d21565b83811115610b515750506000910152565b6000610d54825190565b808452602084019350610d6b818560208601610d1e565b601f01601f19169290920192915050565b60208082528101610d8d8184610d4a565b9392505050565b801515610ae2565b602081016102ed8284610d94565b60008083601f840112610dbf57610dbf600080fd5b5081356001600160401b03811115610dd957610dd9600080fd5b602083019150836020820283011115610bb057610bb0600080fd5b60008060008060008060608789031215610e1057610e10600080fd5b86356001600160401b03811115610e2957610e29600080fd5b610e3589828a01610daa565b965096505060208701356001600160401b03811115610e5657610e56600080fd5b610e6289828a01610daa565b945094505060408701356001600160401b03811115610e8357610e83600080fd5b610e8f89828a01610daa565b92509250509295509295509295565b8051610120830190610eb08482610b01565b506020820151610ec36020850182610b07565b506040820151610b5160a0850182610b07565b61012081016102ed8284610e9e565b602081016102ed8284610b01565b60008060208385031215610f0957610f09600080fd5b82356001600160401b03811115610f2257610f22600080fd5b610bf285828601610daa565b601581526000602082017406665656473206c656e677468206d757374203e203605c1b815291505b5060200190565b602080825281016102ed81610f2e565b634e487b7160e01b600052603260045260246000fd5b600081356102ed81610a94565b6000600019835b81169019929092169190911792915050565b6000816102ed565b610fba82610fa9565b610fcd610fc682610fa9565b8354610f90565b8255505050565b600081356102ed81610c3b565b60006001600160401b0383610f97565b60006102ed6110066110038460070b90565b90565b60070b90565b61101582610ff1565b610fcd818354610fe1565b600081356102ed81610c50565b60006fffffffffffffffff0000000000000000610f978460401b90565b60006001600160401b0382166102ed565b6110648261104a565b610fcd81835461102d565b600081356102ed81610c6a565b600063ffffffff60801b610f978460801b90565b60006102ed6110a26110038460030b90565b60030b90565b6110b182611090565b610fcd81835461107c565b60006102ed6110038381565b6110d1826110bc565b610fcd81610fc6565b8082806110e681610fd4565b90506110f2818461100c565b5082915050602083018061110581611020565b9050611111818461105b565b508291505060408301806111248161106f565b905061113081846110a8565b50505060018101606083018061114581610f83565b905061115181846110c8565b5050505050565b61116282826110da565b5050565b80828061117281610f83565b905061117e8184610fb1565b5050506001810160208301806111948184611158565b5050506003810160a08301806111518184611158565b6111628282611166565b602d81526000602082017f6e6f20656d6120707269636520617661696c61626c652077686963682069732081526c0e4cac6cadce840cadcdeeaced609b1b602082015291505b5060400190565b602080825281016102ed816111b4565b602981526000602082017f6e6f20707269636520617661696c61626c6520776869636820697320726563658152680dce840cadcdeeaced60bb1b602082015291506111fa565b602080825281016102ed81611211565b603881526000602082017f707269636549647320616e64207075626c69736854696d65732061727261797381527f2073686f756c6420686176652073616d65206c656e6774680000000000000000602082015291506111fa565b602080825281016102ed81611267565b6000602082840312156112e6576112e6600080fd5b6000610ad08484610c5f565b602080825281016102ed81605681527f6e6f2070726963657320696e20746865207375626d697474656420626174636860208201527f2068617665206672657368207072696365732c20736f207468697320757064616040820152751d19481dda5b1b081a185d99481b9bc81959999958dd60521b606082015260800190565b602a81526000602082017f6e6f207072696365206665656420666f756e6420666f722074686520676976658152691b881c1c9a58d9481a5960b21b602082015291506111fa565b602080825281016102ed81611372565b634e487b7160e01b600052601160045260246000fd5b60008160001904831182151516156113f9576113f96113c9565b500290565b601c81526000602082017f496e73756666696369656e7420706169642066656520616d6f756e740000000081529150610f56565b602080825281016102ed816113fe565b600082821015611454576114546113c9565b500390565b60006102ed82611003565b601d81526000602082017f6661696c656420746f207472616e73666572207570646174652066656500000081529150610f56565b602080825281016102ed81611464565b6000808335601e19368590030181126114c3576114c3600080fd5b8084019250823591506001600160401b038211156114e3576114e3600080fd5b6020830192506001820236038313156114fe576114fe600080fd5b509250929050565b634e487b7160e01b600052604160045260246000fd5b601f19601f83011681018181106001600160401b038211171561154157611541611506565b6040525050565b600061155360405190565b905061155f828261151c565b919050565b60006080828403121561157957611579600080fd5b6115836080611548565b905060006115918484610c45565b82525060206115a284848301610c5f565b60208301525060406115b684828501610c74565b60408301525060606115ca84828501610aa4565b60608301525092915050565b600061012082840312156115ec576115ec600080fd5b6115f66060611548565b905060006116048484610aa4565b825250602061161584848301611564565b60208301525060a061162984828501611564565b60408301525092915050565b6000610120828403121561164b5761164b600080fd5b6000610ad084846115d6565b6000821982111561166a5761166a6113c9565b500190565b61ffff8116610ae2565b60c08101611687828961166f565b6116946020830188610ae8565b6116a16040830187610b01565b6116ae6060830186610b01565b6116bb6080830185610ad8565b6116c860a0830184610ae8565b979650505050505050565b608081016116e1828761166f565b6116ee6020830186610ae8565b6116fb6040830185610b01565b6117086060830184610b01565b95945050505050565b60006001600160401b03821691506001600160401b0383169250826001600160401b030382111561166a5761166a6113c9565b610ae2816110bc565b6040810161175b8285611744565b610d8d6020830184610b0156fea2646970667358221220b013759453084319f1522e3a0c7b1aab6f9d3d635088fc6f66bf098fed9a49ae64736f6c634300080d0033",
|
|
682
682
|
"linkReferences": {},
|
|
683
683
|
"deployedLinkReferences": {}
|
|
684
684
|
}
|
|
@@ -84,7 +84,7 @@ contract ResilientOracle is PausableUpgradeable, AccessControlledV8, ResilientOr
|
|
|
84
84
|
/// @param vBnbAddress The address of the vBNB
|
|
85
85
|
/// @param vaiAddress The address of the VAI
|
|
86
86
|
/// @custom:oz-upgrades-unsafe-allow constructor
|
|
87
|
-
constructor(address vBnbAddress, address vaiAddress) notNullAddress(vBnbAddress) {
|
|
87
|
+
constructor(address vBnbAddress, address vaiAddress) notNullAddress(vBnbAddress) notNullAddress(vaiAddress) {
|
|
88
88
|
vBnb = vBnbAddress;
|
|
89
89
|
vai = vaiAddress;
|
|
90
90
|
_disableInitializers();
|
|
@@ -112,14 +112,16 @@ contract ResilientOracle is PausableUpgradeable, AccessControlledV8, ResilientOr
|
|
|
112
112
|
* @notice Batch sets token configs
|
|
113
113
|
* @param tokenConfigs_ Token config array
|
|
114
114
|
* @custom:access Only Governance
|
|
115
|
-
* @custom:error Throws a length error if the
|
|
115
|
+
* @custom:error Throws a length error if the length of the token configs array is 0
|
|
116
116
|
*/
|
|
117
117
|
function setTokenConfigs(TokenConfig[] memory tokenConfigs_) external {
|
|
118
|
-
_checkAccessAllowed("setTokenConfigs(TokenConfig[])");
|
|
119
118
|
if (tokenConfigs_.length == 0) revert("length can't be 0");
|
|
120
119
|
uint256 numTokenConfigs = tokenConfigs_.length;
|
|
121
|
-
for (uint256 i; i < numTokenConfigs;
|
|
120
|
+
for (uint256 i; i < numTokenConfigs; ) {
|
|
122
121
|
setTokenConfig(tokenConfigs_[i]);
|
|
122
|
+
unchecked {
|
|
123
|
+
++i;
|
|
124
|
+
}
|
|
123
125
|
}
|
|
124
126
|
}
|
|
125
127
|
|
|
@@ -140,7 +142,7 @@ contract ResilientOracle is PausableUpgradeable, AccessControlledV8, ResilientOr
|
|
|
140
142
|
address oracle,
|
|
141
143
|
OracleRole role
|
|
142
144
|
) external notNullAddress(asset) checkTokenConfigExistence(asset) {
|
|
143
|
-
_checkAccessAllowed("setOracle(address,address,
|
|
145
|
+
_checkAccessAllowed("setOracle(address,address,uint8)");
|
|
144
146
|
if (oracle == address(0) && role == OracleRole.MAIN) revert("can't set zero address to main oracle");
|
|
145
147
|
tokenConfigs[asset].oracles[uint256(role)] = oracle;
|
|
146
148
|
emit OracleSet(asset, oracle, uint256(role));
|
|
@@ -160,20 +162,20 @@ contract ResilientOracle is PausableUpgradeable, AccessControlledV8, ResilientOr
|
|
|
160
162
|
OracleRole role,
|
|
161
163
|
bool enable
|
|
162
164
|
) external notNullAddress(asset) checkTokenConfigExistence(asset) {
|
|
163
|
-
_checkAccessAllowed("enableOracle(address,
|
|
165
|
+
_checkAccessAllowed("enableOracle(address,uint8,bool)");
|
|
164
166
|
tokenConfigs[asset].enableFlagsForOracles[uint256(role)] = enable;
|
|
165
167
|
emit OracleEnabled(asset, uint256(role), enable);
|
|
166
168
|
}
|
|
167
169
|
|
|
168
170
|
/**
|
|
169
|
-
* @notice Updates the pivot oracle price.
|
|
171
|
+
* @notice Updates the TWAP pivot oracle price.
|
|
170
172
|
* @dev This function should always be called before calling getUnderlyingPrice
|
|
171
173
|
* @param vToken vToken address
|
|
172
174
|
*/
|
|
173
175
|
function updatePrice(address vToken) external override {
|
|
174
176
|
(address pivotOracle, bool pivotOracleEnabled) = getOracle(vToken, OracleRole.PIVOT);
|
|
175
177
|
if (pivotOracle != address(0) && pivotOracleEnabled) {
|
|
176
|
-
//if
|
|
178
|
+
//if pivot oracle is not TwapOracle it will revert so we need to catch the revert
|
|
177
179
|
try TwapInterface(pivotOracle).updateTwap(vToken) {} catch {}
|
|
178
180
|
}
|
|
179
181
|
}
|
|
@@ -192,7 +194,8 @@ contract ResilientOracle is PausableUpgradeable, AccessControlledV8, ResilientOr
|
|
|
192
194
|
* @notice Gets price of the underlying asset for a given vToken. Validation flow:
|
|
193
195
|
* - Check if the oracle is paused globally
|
|
194
196
|
* - Validate price from main oracle against pivot oracle
|
|
195
|
-
* - Validate price from fallback oracle against pivot oracle
|
|
197
|
+
* - Validate price from fallback oracle against pivot oracle if the first validation failed
|
|
198
|
+
* - Validate price from main oracle against fallback oracle if the second validation failed
|
|
196
199
|
* In the case that the pivot oracle is not available but main price is available and validation is successful,
|
|
197
200
|
* main oracle price is returned.
|
|
198
201
|
* @param vToken vToken address
|
|
@@ -231,7 +234,7 @@ contract ResilientOracle is PausableUpgradeable, AccessControlledV8, ResilientOr
|
|
|
231
234
|
if (
|
|
232
235
|
mainPrice != INVALID_PRICE &&
|
|
233
236
|
fallbackPrice != INVALID_PRICE &&
|
|
234
|
-
boundValidator.validatePriceWithAnchorPrice(vToken,
|
|
237
|
+
boundValidator.validatePriceWithAnchorPrice(vToken, mainPrice, fallbackPrice)
|
|
235
238
|
) {
|
|
236
239
|
return mainPrice;
|
|
237
240
|
}
|
|
@@ -235,11 +235,14 @@ abstract contract AbstractPyth is IPyth {
|
|
|
235
235
|
require(priceIds.length == publishTimes.length, "priceIds and publishTimes arrays should have same length");
|
|
236
236
|
|
|
237
237
|
bool updateNeeded = false;
|
|
238
|
-
for (uint256 i = 0; i < priceIds.length;
|
|
238
|
+
for (uint256 i = 0; i < priceIds.length; ) {
|
|
239
239
|
if (!priceFeedExists(priceIds[i]) || queryPriceFeed(priceIds[i]).price.publishTime < publishTimes[i]) {
|
|
240
240
|
updateNeeded = true;
|
|
241
241
|
break;
|
|
242
242
|
}
|
|
243
|
+
unchecked {
|
|
244
|
+
i++;
|
|
245
|
+
}
|
|
243
246
|
}
|
|
244
247
|
|
|
245
248
|
require(updateNeeded, "no prices in the submitted batch have fresh prices, so this update will have no effect");
|
|
@@ -6,9 +6,10 @@ import "../interfaces/VBep20Interface.sol";
|
|
|
6
6
|
import "../interfaces/SIDRegistryInterface.sol";
|
|
7
7
|
import "../interfaces/FeedRegistryInterface.sol";
|
|
8
8
|
import "../interfaces/PublicResolverInterface.sol";
|
|
9
|
+
import "../interfaces/OracleInterface.sol";
|
|
9
10
|
import "@venusprotocol/governance-contracts/contracts/Governance/AccessControlledV8.sol";
|
|
10
11
|
|
|
11
|
-
contract BinanceOracle is AccessControlledV8 {
|
|
12
|
+
contract BinanceOracle is AccessControlledV8, OracleInterface {
|
|
12
13
|
address public sidRegistryAddress;
|
|
13
14
|
|
|
14
15
|
/// @notice vBNB address
|
|
@@ -44,7 +45,7 @@ contract BinanceOracle is AccessControlledV8 {
|
|
|
44
45
|
function setMaxStalePeriod(string memory symbol, uint256 _maxStalePeriod) external {
|
|
45
46
|
_checkAccessAllowed("setMaxStalePeriod(string,uint256)");
|
|
46
47
|
if (_maxStalePeriod == 0) revert("stale period can't be zero");
|
|
47
|
-
if (
|
|
48
|
+
if (bytes(symbol).length == 0) revert("symbol cannot be empty");
|
|
48
49
|
|
|
49
50
|
maxStalePeriod[symbol] = _maxStalePeriod;
|
|
50
51
|
emit MaxStalePeriodAdded(symbol, _maxStalePeriod);
|
|
@@ -79,19 +80,19 @@ contract BinanceOracle is AccessControlledV8 {
|
|
|
79
80
|
* @param vToken Address of the vToken
|
|
80
81
|
* @return Price in USD
|
|
81
82
|
*/
|
|
82
|
-
function getUnderlyingPrice(
|
|
83
|
+
function getUnderlyingPrice(address vToken) public view override returns (uint256) {
|
|
83
84
|
string memory symbol;
|
|
84
85
|
uint256 decimals;
|
|
85
86
|
|
|
86
87
|
// VBNB token doesn't have `underlying` method
|
|
87
|
-
if (
|
|
88
|
+
if (vToken == vBnb) {
|
|
88
89
|
symbol = "BNB";
|
|
89
90
|
decimals = 18;
|
|
90
|
-
} else if (
|
|
91
|
+
} else if (vToken == vai) {
|
|
91
92
|
symbol = "VAI";
|
|
92
93
|
decimals = 18;
|
|
93
94
|
} else {
|
|
94
|
-
IERC20Metadata underlyingToken = IERC20Metadata(vToken.underlying());
|
|
95
|
+
IERC20Metadata underlyingToken = IERC20Metadata(VBep20Interface(vToken).underlying());
|
|
95
96
|
symbol = underlyingToken.symbol();
|
|
96
97
|
decimals = underlyingToken.decimals();
|
|
97
98
|
}
|
|
@@ -106,7 +107,11 @@ contract BinanceOracle is AccessControlledV8 {
|
|
|
106
107
|
if (answer <= 0) revert("invalid binance oracle price");
|
|
107
108
|
if (block.timestamp < updatedAt) revert("updatedAt exceeds block time");
|
|
108
109
|
|
|
109
|
-
uint256 deltaTime
|
|
110
|
+
uint256 deltaTime;
|
|
111
|
+
unchecked {
|
|
112
|
+
deltaTime = block.timestamp - updatedAt;
|
|
113
|
+
}
|
|
114
|
+
|
|
110
115
|
if (deltaTime > maxStalePeriod[symbol]) revert("binance oracle price expired");
|
|
111
116
|
|
|
112
117
|
uint256 decimalDelta = feedRegistry.decimalsByName(symbol, "USD");
|
|
@@ -120,6 +125,6 @@ contract BinanceOracle is AccessControlledV8 {
|
|
|
120
125
|
* @return equal Returns true if both are equal or else false.
|
|
121
126
|
*/
|
|
122
127
|
function compare(string memory str1, string memory str2) internal pure returns (bool) {
|
|
123
|
-
return keccak256(
|
|
128
|
+
return keccak256(bytes(str1)) == keccak256(bytes(str2));
|
|
124
129
|
}
|
|
125
130
|
}
|
|
@@ -56,12 +56,13 @@ contract BoundValidator is AccessControlledV8, BoundValidatorInterface {
|
|
|
56
56
|
* @custom:event Emits ValidateConfigAdded for each validation config that is successfully set
|
|
57
57
|
*/
|
|
58
58
|
function setValidateConfigs(ValidateConfig[] memory configs) external virtual {
|
|
59
|
-
_checkAccessAllowed("setValidateConfigs(ValidateConfig[])");
|
|
60
|
-
|
|
61
59
|
uint256 length = configs.length;
|
|
62
60
|
if (length == 0) revert("invalid validate config length");
|
|
63
|
-
for (uint256 i; i < length;
|
|
61
|
+
for (uint256 i; i < length; ) {
|
|
64
62
|
setValidateConfig(configs[i]);
|
|
63
|
+
unchecked {
|
|
64
|
+
++i;
|
|
65
|
+
}
|
|
65
66
|
}
|
|
66
67
|
}
|
|
67
68
|
|
|
@@ -141,9 +142,4 @@ contract BoundValidator is AccessControlledV8, BoundValidatorInterface {
|
|
|
141
142
|
asset = VBep20Interface(vToken).underlying();
|
|
142
143
|
}
|
|
143
144
|
}
|
|
144
|
-
|
|
145
|
-
// BoundValidator is to get inherited, so it's a good practice to add some storage gaps like
|
|
146
|
-
// OpenZepplin proposed in their contracts: https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps
|
|
147
|
-
// solhint-disable-next-line
|
|
148
|
-
uint256[49] private __gap;
|
|
149
145
|
}
|
|
@@ -72,11 +72,12 @@ contract ChainlinkOracle is AccessControlledV8, OracleInterface {
|
|
|
72
72
|
VBep20Interface vToken,
|
|
73
73
|
uint256 underlyingPriceMantissa
|
|
74
74
|
) external notNullAddress(address(vToken)) {
|
|
75
|
-
_checkAccessAllowed("setUnderlyingPrice(
|
|
75
|
+
_checkAccessAllowed("setUnderlyingPrice(address,uint256)");
|
|
76
76
|
|
|
77
77
|
address asset = address(vToken) == vBnb ? BNB_ADDR : address(vToken.underlying());
|
|
78
|
-
|
|
78
|
+
uint256 previousPriceMantissa = prices[asset];
|
|
79
79
|
prices[asset] = underlyingPriceMantissa;
|
|
80
|
+
emit PricePosted(asset, previousPriceMantissa, prices[asset], prices[asset]);
|
|
80
81
|
}
|
|
81
82
|
|
|
82
83
|
/**
|
|
@@ -89,8 +90,9 @@ contract ChainlinkOracle is AccessControlledV8, OracleInterface {
|
|
|
89
90
|
function setDirectPrice(address asset, uint256 price) external notNullAddress(asset) {
|
|
90
91
|
_checkAccessAllowed("setDirectPrice(address,uint256)");
|
|
91
92
|
|
|
93
|
+
uint256 previousPriceMantissa = prices[asset];
|
|
92
94
|
prices[asset] = price;
|
|
93
|
-
emit PricePosted(asset,
|
|
95
|
+
emit PricePosted(asset, previousPriceMantissa, price, price);
|
|
94
96
|
}
|
|
95
97
|
|
|
96
98
|
/**
|
|
@@ -100,11 +102,13 @@ contract ChainlinkOracle is AccessControlledV8, OracleInterface {
|
|
|
100
102
|
* @custom:error Zero length error thrown, if length of the array in parameter is 0
|
|
101
103
|
*/
|
|
102
104
|
function setTokenConfigs(TokenConfig[] memory tokenConfigs_) external {
|
|
103
|
-
_checkAccessAllowed("setTokenConfigs(TokenConfig[])");
|
|
104
105
|
if (tokenConfigs_.length == 0) revert("length can't be 0");
|
|
105
106
|
uint256 numTokenConfigs = tokenConfigs_.length;
|
|
106
|
-
for (uint256 i; i < numTokenConfigs;
|
|
107
|
+
for (uint256 i; i < numTokenConfigs; ) {
|
|
107
108
|
setTokenConfig(tokenConfigs_[i]);
|
|
109
|
+
unchecked {
|
|
110
|
+
++i;
|
|
111
|
+
}
|
|
108
112
|
}
|
|
109
113
|
}
|
|
110
114
|
|
|
@@ -180,7 +184,7 @@ contract ChainlinkOracle is AccessControlledV8, OracleInterface {
|
|
|
180
184
|
}
|
|
181
185
|
|
|
182
186
|
/**
|
|
183
|
-
* @notice Get the Chainlink price for the underlying asset of a given vToken, revert if token config doesn't
|
|
187
|
+
* @notice Get the Chainlink price for the underlying asset of a given vToken, revert if token config doesn't exist
|
|
184
188
|
* @dev The precision of the price feed is used to ensure the returned price has 18 decimals of precision
|
|
185
189
|
* @param asset Underlying asset address
|
|
186
190
|
* @return price Underlying price in USD, with 18 decimals of precision
|
|
@@ -203,10 +207,14 @@ contract ChainlinkOracle is AccessControlledV8, OracleInterface {
|
|
|
203
207
|
uint256 decimalDelta = uint256(18) - feed.decimals();
|
|
204
208
|
|
|
205
209
|
(, int256 answer, , uint256 updatedAt, ) = feed.latestRoundData();
|
|
206
|
-
if (answer
|
|
210
|
+
if (answer <= 0) revert("chainlink price must be positive");
|
|
207
211
|
if (block.timestamp < updatedAt) revert("updatedAt exceeds block time");
|
|
208
212
|
|
|
209
|
-
uint256 deltaTime
|
|
213
|
+
uint256 deltaTime;
|
|
214
|
+
unchecked {
|
|
215
|
+
deltaTime = block.timestamp - updatedAt;
|
|
216
|
+
}
|
|
217
|
+
|
|
210
218
|
if (deltaTime > maxStalePeriod) revert("chainlink price expired");
|
|
211
219
|
|
|
212
220
|
return uint256(answer) * (10 ** decimalDelta);
|
|
@@ -73,11 +73,13 @@ contract PythOracle is AccessControlledV8, OracleInterface {
|
|
|
73
73
|
* @custom:error Zero length error is thrown if length of the array in parameter is 0
|
|
74
74
|
*/
|
|
75
75
|
function setTokenConfigs(TokenConfig[] memory tokenConfigs_) external {
|
|
76
|
-
_checkAccessAllowed("setTokenConfigs(TokenConfig[])");
|
|
77
76
|
if (tokenConfigs_.length == 0) revert("length can't be 0");
|
|
78
77
|
uint256 numTokenConfigs = tokenConfigs_.length;
|
|
79
|
-
for (uint256 i; i < numTokenConfigs;
|
|
78
|
+
for (uint256 i; i < numTokenConfigs; ) {
|
|
80
79
|
setTokenConfig(tokenConfigs_[i]);
|
|
80
|
+
unchecked {
|
|
81
|
+
++i;
|
|
82
|
+
}
|
|
81
83
|
}
|
|
82
84
|
}
|
|
83
85
|
|
|
@@ -91,7 +93,7 @@ contract PythOracle is AccessControlledV8, OracleInterface {
|
|
|
91
93
|
function setUnderlyingPythOracle(
|
|
92
94
|
IPyth underlyingPythOracle_
|
|
93
95
|
) external notNullAddress(address(underlyingPythOracle_)) {
|
|
94
|
-
_checkAccessAllowed("setUnderlyingPythOracle(
|
|
96
|
+
_checkAccessAllowed("setUnderlyingPythOracle(address)");
|
|
95
97
|
underlyingPythOracle = underlyingPythOracle_;
|
|
96
98
|
emit PythOracleSet(address(underlyingPythOracle_));
|
|
97
99
|
}
|
|
@@ -101,10 +103,12 @@ contract PythOracle is AccessControlledV8, OracleInterface {
|
|
|
101
103
|
* @param underlyingPythOracle_ Address of the Pyth oracle
|
|
102
104
|
* @param accessControlManager_ Address of the access control manager contract
|
|
103
105
|
*/
|
|
104
|
-
function initialize(
|
|
106
|
+
function initialize(
|
|
107
|
+
address underlyingPythOracle_,
|
|
108
|
+
address accessControlManager_
|
|
109
|
+
) public initializer notNullAddress(underlyingPythOracle_) {
|
|
105
110
|
__AccessControlled_init(accessControlManager_);
|
|
106
111
|
|
|
107
|
-
if (underlyingPythOracle_ == address(0)) revert("pyth oracle cannot be zero address");
|
|
108
112
|
underlyingPythOracle = IPyth(underlyingPythOracle_);
|
|
109
113
|
emit PythOracleSet(underlyingPythOracle_);
|
|
110
114
|
}
|
|
@@ -127,22 +131,22 @@ contract PythOracle is AccessControlledV8, OracleInterface {
|
|
|
127
131
|
* @notice Get price of underlying asset of the input vToken, under the hood this function
|
|
128
132
|
* get price from Pyth contract, the prices of which are updated externally
|
|
129
133
|
* @param vToken vToken address
|
|
130
|
-
* @return price Underlying price with a precision of
|
|
134
|
+
* @return price Underlying price with a precision of 18 decimals
|
|
131
135
|
* @custom:error Zero address error thrown if underlyingPythOracle address is null
|
|
132
136
|
* @custom:error Zero address error thrown if asset address is null
|
|
133
137
|
* @custom:error Range error thrown if price of Pyth oracle is not greater than zero
|
|
134
138
|
*/
|
|
135
|
-
function getUnderlyingPrice(
|
|
136
|
-
|
|
137
|
-
|
|
139
|
+
function getUnderlyingPrice(
|
|
140
|
+
address vToken
|
|
141
|
+
) public view override notNullAddress(address(underlyingPythOracle)) returns (uint256) {
|
|
138
142
|
address asset;
|
|
139
143
|
uint256 decimals;
|
|
140
144
|
|
|
141
145
|
// VBNB token doesn't have `underlying` method
|
|
142
|
-
if (
|
|
146
|
+
if (vToken == vBnb) {
|
|
143
147
|
asset = BNB_ADDR;
|
|
144
148
|
decimals = 18;
|
|
145
|
-
} else if (
|
|
149
|
+
} else if (vToken == vai) {
|
|
146
150
|
asset = vai;
|
|
147
151
|
decimals = 18;
|
|
148
152
|
} else {
|
|
@@ -101,11 +101,13 @@ contract TwapOracle is AccessControlledV8, TwapInterface {
|
|
|
101
101
|
* @custom:error Zero length error thrown, if length of the config array is 0
|
|
102
102
|
*/
|
|
103
103
|
function setTokenConfigs(TokenConfig[] memory configs) external {
|
|
104
|
-
_checkAccessAllowed("setTokenConfigs(TokenConfig[])");
|
|
105
104
|
if (configs.length == 0) revert("length can't be 0");
|
|
106
105
|
uint256 numTokenConfigs = configs.length;
|
|
107
|
-
for (uint256 i; i < numTokenConfigs;
|
|
106
|
+
for (uint256 i; i < numTokenConfigs; ) {
|
|
108
107
|
setTokenConfig(configs[i]);
|
|
108
|
+
unchecked {
|
|
109
|
+
++i;
|
|
110
|
+
}
|
|
109
111
|
}
|
|
110
112
|
}
|
|
111
113
|
|
|
@@ -153,7 +155,6 @@ contract TwapOracle is AccessControlledV8, TwapInterface {
|
|
|
153
155
|
_checkAccessAllowed("setTokenConfig(TokenConfig)");
|
|
154
156
|
|
|
155
157
|
if (config.anchorPeriod == 0) revert("anchor period must be positive");
|
|
156
|
-
if (config.baseUnit == 0) revert("base unit must be positive");
|
|
157
158
|
if (config.baseUnit != 10 ** IERC20Metadata(config.asset).decimals())
|
|
158
159
|
revert("base unit decimals must be same as asset decimals");
|
|
159
160
|
|
|
@@ -214,7 +215,10 @@ contract TwapOracle is AccessControlledV8, TwapInterface {
|
|
|
214
215
|
// This should be impossible, but better safe than sorry
|
|
215
216
|
if (block.timestamp < oldTimestamp) revert("now must come after before");
|
|
216
217
|
|
|
217
|
-
uint256 timeElapsed
|
|
218
|
+
uint256 timeElapsed;
|
|
219
|
+
unchecked {
|
|
220
|
+
timeElapsed = block.timestamp - oldTimestamp;
|
|
221
|
+
}
|
|
218
222
|
|
|
219
223
|
// Calculate Pancake *twap**
|
|
220
224
|
FixedPoint.uq112x112 memory priceAverage = FixedPoint.uq112x112(
|
|
@@ -263,11 +267,7 @@ contract TwapOracle is AccessControlledV8, TwapInterface {
|
|
|
263
267
|
Observation[] memory storedObservations = observations[config.asset];
|
|
264
268
|
|
|
265
269
|
uint256 storedObservationsLength = storedObservations.length;
|
|
266
|
-
for (
|
|
267
|
-
uint256 windowStartIndex = windowStart[config.asset];
|
|
268
|
-
windowStartIndex < storedObservationsLength;
|
|
269
|
-
++windowStartIndex
|
|
270
|
-
) {
|
|
270
|
+
for (uint256 windowStartIndex = windowStart[config.asset]; windowStartIndex < storedObservationsLength; ) {
|
|
271
271
|
if (
|
|
272
272
|
(storedObservations[windowStartIndex].timestamp >= windowStartTimestamp) ||
|
|
273
273
|
(windowStartIndex == storedObservationsLength - 1)
|
|
@@ -279,6 +279,10 @@ contract TwapOracle is AccessControlledV8, TwapInterface {
|
|
|
279
279
|
} else {
|
|
280
280
|
delete observations[config.asset][windowStartIndex];
|
|
281
281
|
}
|
|
282
|
+
|
|
283
|
+
unchecked {
|
|
284
|
+
++windowStartIndex;
|
|
285
|
+
}
|
|
282
286
|
}
|
|
283
287
|
|
|
284
288
|
observations[config.asset].push(Observation(currentTimestamp, cumulativePrice));
|
|
@@ -18,8 +18,11 @@ contract MockPyth is AbstractPyth {
|
|
|
18
18
|
// simply update price feeds
|
|
19
19
|
function updatePriceFeedsHarness(PythStructs.PriceFeed[] calldata feeds) external {
|
|
20
20
|
require(feeds.length > 0, "feeds length must > 0");
|
|
21
|
-
for (uint256 i = 0; i < feeds.length;
|
|
21
|
+
for (uint256 i = 0; i < feeds.length; ) {
|
|
22
22
|
priceFeeds[feeds[i].id] = feeds[i];
|
|
23
|
+
unchecked {
|
|
24
|
+
++i;
|
|
25
|
+
}
|
|
23
26
|
}
|
|
24
27
|
}
|
|
25
28
|
|
|
@@ -41,7 +44,7 @@ contract MockPyth is AbstractPyth {
|
|
|
41
44
|
// We set it to 1.
|
|
42
45
|
uint16 chainId = 1;
|
|
43
46
|
|
|
44
|
-
for (uint256 i = 0; i < updateData.length;
|
|
47
|
+
for (uint256 i = 0; i < updateData.length; ) {
|
|
45
48
|
PythStructs.PriceFeed memory priceFeed = abi.decode(updateData[i], (PythStructs.PriceFeed));
|
|
46
49
|
|
|
47
50
|
bool fresh = false;
|
|
@@ -64,6 +67,10 @@ contract MockPyth is AbstractPyth {
|
|
|
64
67
|
priceFeed.price.price,
|
|
65
68
|
priceFeed.price.conf
|
|
66
69
|
);
|
|
70
|
+
|
|
71
|
+
unchecked {
|
|
72
|
+
i++;
|
|
73
|
+
}
|
|
67
74
|
}
|
|
68
75
|
|
|
69
76
|
// In the real contract, the input of this function contains multiple batches that each contain multiple prices.
|