8000 Clean up by kumaryash90 · Pull Request #621 · thirdweb-dev/contracts · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Clean up #621

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

Merged
merged 1 commit into from
Feb 26, 2024
Merged

Clean up #621

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions contracts/infra/ContractPublisher.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pragma solidity ^0.8.0;
import "@openzeppelin/contracts/metatx/ERC2771Context.sol";
import "@openzeppelin/contracts/access/AccessControlEnumerable.sol";
import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
import "@openzeppelin/contracts/utils/Multicall.sol";
import "../extension/Multicall.sol";

// ========== Internal imports ==========
import { IContractPublisher } from "./interface/IContractPublisher.sol";
Expand Down Expand Up @@ -257,7 +257,7 @@ contract ContractPublisher is IContractPublisher, ERC2771Context, AccessControlE
}

/// @dev ERC2771Context overrides
function _msgSender() 4C00 internal view virtual override(Context, ERC2771Context) returns (address sender) {
function _msgSender() internal view virtual override(Context, ERC2771Context, Multicall) returns (address sender) {
return ERC2771Context._msgSender();
}

Expand Down
0