Update VRFV2PlusWrapper billing parameters to mirror VRFCoordinatorV2_5 #12407
Conversation
|
I see that you haven't updated any README files. Would it make sense to do so? |
|
Go solidity wrappers are out-of-date, regenerate them via the |
|
|
||
| return feeWithFlatFee; | ||
| // (wei/gas) * gas | ||
| uint256 wrapperCostWei = _requestGasPrice * s_wrapperGasOverhead; |
There was a problem hiding this comment.
Does the wrapper need its own L1 gas cost if it's running on L2?
There was a problem hiding this comment.
my understanding is that L1 cost is per transaction. Since the coordinator calls wrapper in the same transaction, the L1 calldata cost added below for coordinator is sufficient
| s_wrapperGasOverhead = _wrapperGasOverhead; | ||
| s_coordinatorGasOverhead = _coordinatorGasOverhead; | ||
| s_wrapperPremiumPercentage = _wrapperPremiumPercentage; | ||
| s_wrapperNativePremiumPercentage = _wrapperNativePremiumPercentage; |
There was a problem hiding this comment.
Didn't we discuss removing wrapper premium completely and just having a premium in coordinator?
There was a problem hiding this comment.
This is kind of the coordinator's premium. This wrapperXPremiumPercentage has to mirror the value's set in the coordinator.
The wrapper's calculate price is roughly wrapper_gas + (coordinator_gas + consumer_gas) * premium + flat, simplified.
| uint256 coordinatorCostWithPremiumAndFlatFeeWei = ((coordinatorCostWei * (s_wrapperNativePremiumPercentage + 100)) / | ||
| 100) + (1e12 * uint256(s_fulfillmentFlatFeeNativePPM)); | ||
|
|
||
| return wrapperCostWei + coordinatorCostWithPremiumAndFlatFeeWei; |
There was a problem hiding this comment.
In the previous code, the following qty is added to the return value for s_wrapperGasOverhead
(_requestGasPrice * s_wrapperGasOverhead * (s_wrapperPremiumPercentage + 100)) / 100
After this change, only the following qty is added to return value for s_wrapperGasOverhead
_requestGasPrice * s_wrapperGasOverhead
Is this intentional?
There was a problem hiding this comment.
I'm not quite sure if I'm following you. But yes, we removed the premium for the wrapper itself and will only keep the premium for the wrapper.
Previously it's something like ((gas price * (wrapper gas + coordinator gas + consumer gas)) + L1 gas cost) * premium multiplier + flat fee.
Now, after removing the premium and fees for wrapper, it becomes (gas price * wrapper gas) + ((gas price * (coordinator gas + consumer gas)) + L1 gas cost) * premium mulitplier + flat fee.
The only part I'm not sure is if we need the L1 gas cost for the wrapper part.
|
I see you updated files related to |
|
I see you updated files related to |
|
leeyikjiun
deleted the
VRF-921-VRF-V2-Plus-Wrapper-Remove-billing-parameters
branch
…_5 (#12407) * Update VRFV2PlusWrapper billing parameters to mirror VRFCoordinatorV2_5 * Fix integration tests * Fix Go scripts * Fix calculate request price native using link premium percentage instead of native * Update Go solidity wrappers * vrfv2pluswrapper: optimize gas (#12428) * Fix storage slot comment
s_wrapperPremiumPercentageintos_wrapperNativePremiumPercentageands_wrapperLinkPremiumPercentages_fulfillmentFlatFeeLinkPPMintos_fulfillmentFlatFeeDiscountLinkPPM, a discount relative tos_fulfillmentFlatFeeNativePPMs_fulfillmentFlatFeeNativePPMands_fulfillmentFlatFeeDiscountLinkPPMto be denominated in native instead of LINK._calculatedRequestPriceto bewrapper's gas cost + coordinator gas cost (inclusive of consumer) * premium + flat fee