-
Notifications
You must be signed in to change notification settings - Fork 1.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[DO NOT MERGE] Functions 1.1 review #11252
Changes from all commits
7350ced
0115880
61c16a2
cb57b52
c558594
f7e9ea1
49d26b4
daa3c94
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
This file was deleted.
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -130,7 +130,7 @@ contract FunctionsRouter is IFunctionsRouter, FunctionsSubscriptions, Pausable, | |
address linkToken, | ||
Config memory config | ||
) FunctionsSubscriptions(linkToken) ConfirmedOwner(msg.sender) Pausable() { | ||
// Set the intial configuration | ||
// Set the initial configuration | ||
updateConfig(config); | ||
} | ||
|
||
|
@@ -377,8 +377,7 @@ contract FunctionsRouter is IFunctionsRouter, FunctionsSubscriptions, Pausable, | |
commitment.estimatedTotalCostJuels, | ||
commitment.client, | ||
commitment.adminFee, | ||
juelsPerGas, | ||
SafeCast.toUint96(result.gasUsed), | ||
juelsPerGas * SafeCast.toUint96(result.gasUsed), | ||
costWithoutCallback | ||
); | ||
|
||
|
@@ -403,12 +402,8 @@ contract FunctionsRouter is IFunctionsRouter, FunctionsSubscriptions, Pausable, | |
uint32 callbackGasLimit, | ||
address client | ||
) private returns (CallbackResult memory) { | ||
bool destinationNoLongerExists; | ||
assembly { | ||
// solidity calls check that a contract actually exists at the destination, so we do the same | ||
destinationNoLongerExists := iszero(extcodesize(client)) | ||
} | ||
if (destinationNoLongerExists) { | ||
// solidity calls check that a contract actually exists at the destination, so we do the same | ||
if (client.code.length == 0) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. reduced stack size so forge coverage could run |
||
// Return without attempting callback | ||
// The subscription will still be charged to reimburse transmitter's gas overhead | ||
return CallbackResult({success: false, gasUsed: 0, returnData: new bytes(0)}); | ||
|
This file was deleted.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Making a breaking Router change like this would mean maintaining and deploying two different Coordinators, since existing networks won't be receiving a Router update for the next scheduled deployment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah called that out in the doc, probably ok to backlog until you'd be doing a v2