Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Additional even emitting + sanity checks + version #10419

Merged
merged 7 commits into from
Sep 6, 2023
Merged

Additional even emitting + sanity checks + version #10419

merged 7 commits into from
Sep 6, 2023

Conversation

Fletch153
Copy link
Collaborator

No description provided.

@github-actions
Copy link
Contributor

I see that you haven't updated any CHANGELOG files. Would it make sense to do so?

austinborn
austinborn reviewed Aug 31, 2023
View reviewed changes
contracts/src/v0.8/llo-feeds/VerifierProxy.sol
@@ -7,7 +7,7 @@ import {IVerifier} from "./interfaces/IVerifier.sol";
import {TypeAndVersionInterface} from "../interfaces/TypeAndVersionInterface.sol";
import {AccessControllerInterface} from "../interfaces/AccessControllerInterface.sol";
import {IERC165} from "../vendor/openzeppelin-solidity/v4.8.0/contracts/interfaces/IERC165.sol";
import {IVerifierFeeManager} from "./interfaces/IVerifierFeeManager.sol";
import {IVerifierFeeManager} from "./dev/interfaces/IVerifierFeeManager.sol";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once we receive final audit feedback, let's remember to pull everything out of the /dev folder.

@austinborn
Copy link
Contributor

What about other supportsInterface uses, such as...

verifyBulk here:

chainlink/contracts/src/v0.8/llo-feeds/VerifierProxy.sol

Line 108 in 9c6447f

if (!IERC165(verifierAddress).supportsInterface(IVerifier.verify.selector)) revert VerifierInvalid();

Constructor/setters in FeeManager:

chainlink/contracts/src/v0.8/llo-feeds/dev/FeeManager.sol

Lines 125 to 144 in 9c6447f

constructor(
address _linkAddress,
address _nativeAddress,
address _proxyAddress,
address _rewardManagerAddress
) ConfirmedOwner(msg.sender) {
if (
_linkAddress == address(0) ||
_nativeAddress == address(0) ||
_proxyAddress == address(0) ||
_rewardManagerAddress == address(0)
) revert InvalidAddress();
i_linkAddress = _linkAddress;
i_nativeAddress = _nativeAddress;
i_proxyAddress = _proxyAddress;
i_rewardManager = IRewardManager(_rewardManagerAddress);
IERC20(i_linkAddress).approve(address(i_rewardManager), type(uint256).max);
}

Fletch153
Fletch153 commented Sep 5, 2023
View reviewed changes
contracts/src/v0.8/llo-feeds/dev/FeeManager.sol Outdated
address indexed subscriber,
Common.Asset fee,
Common.Asset reward,
uint256 appliedDiscountQuantity
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't a quantity but a scalar

@Fletch153 Fletch153 force-pushed the feature/MERC-1410-MERC-1466-MERC-1495/small_improvements_and_tweaks branch from 8e130ba to faee5ac Compare September 5, 2023 19:57
@Fletch153 Fletch153 force-pushed the feature/MERC-1410-MERC-1466-MERC-1495/small_improvements_and_tweaks branch from 3f9d85c to 33fd9ba Compare September 5, 2023 20:32
@github-actions
Copy link
Contributor

github-actions bot commented Sep 5, 2023

Go solidity wrappers are out-of-date, regenerate them via the make wrappers-all command

1 similar comment
@github-actions
Copy link
Contributor

github-actions bot commented Sep 5, 2023

Go solidity wrappers are out-of-date, regenerate them via the make wrappers-all command

austinborn
austinborn previously approved these changes Sep 5, 2023
View reviewed changes
@Fletch153 Fletch153 force-pushed the feature/MERC-1410-MERC-1466-MERC-1495/small_improvements_and_tweaks branch 3 times, most recently from b6d2be3 to aa532d9 Compare September 5, 2023 21:21
@Fletch153 Fletch153 force-pushed the feature/MERC-1410-MERC-1466-MERC-1495/small_improvements_and_tweaks branch from aa532d9 to ced335a Compare September 5, 2023 21:25
austinborn
austinborn previously approved these changes Sep 5, 2023
View reviewed changes
@Fletch153 Fletch153 enabled auto-merge September 5, 2023 21:33
@Fletch153 Fletch153 added this pull request to the merge queue Sep 5, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 5, 2023
@austinborn austinborn added this pull request to the merge queue Sep 5, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 5, 2023
@austinborn austinborn added this pull request to the merge queue Sep 6, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 6, 2023
@austinborn austinborn added this pull request to the merge queue Sep 6, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 6, 2023
@austinborn austinborn added this pull request to the merge queue Sep 6, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 6, 2023
@austinborn austinborn added this pull request to the merge queue Sep 6, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 6, 2023
@austinborn austinborn added this pull request to the merge queue Sep 6, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 6, 2023
@austinborn austinborn added this pull request to the merge queue Sep 6, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 6, 2023
@austinborn austinborn added this pull request to the merge queue Sep 6, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 6, 2023
@austinborn austinborn added this pull request to the merge queue Sep 6, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 6, 2023
@austinborn austinborn added this pull request to the merge queue Sep 6, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 6, 2023
@Fletch153 Fletch153 force-pushed the feature/MERC-1410-MERC-1466-MERC-1495/small_improvements_and_tweaks branch from 8519bae to 5e49173 Compare September 6, 2023 08:17
@cl-sonarqube-production
Copy link

SonarQube Quality Gate

Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@austinborn austinborn added this pull request to the merge queue Sep 6, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 6, 2023
@austinborn austinborn added this pull request to the merge queue Sep 6, 2023
Merged via the queue into develop with commit 2ff674b Sep 6, 2023
@austinborn austinborn deleted the feature/MERC-1410-MERC-1466-MERC-1495/small_improvements_and_tweaks branch September 6, 2023 17:01
@austinborn austinborn mentioned this pull request Sep 20, 2023
Closed
@snehaagni snehaagni mentioned this pull request Oct 18, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@austinborn austinborn austinborn approved these changes

@se3000 se3000 Awaiting requested review from se3000

@connorwstein connorwstein Awaiting requested review from connorwstein

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Fletch153 @austinborn