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.

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

Problem: avoid Derived contract must override function _contextSuffixLength error #683

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,8 @@ abstract contract ERC2771Context is Context {
}

uint256[49] private __gap;

function _contextSuffixLength() internal view virtual override returns (uint256) {
return 20;
}
}
4 changes: 4 additions & 0 deletions contracts/infra/ContractPublisher.sol
Original file line number Diff line number Diff line change
Expand Up @@ -265,4 +265,8 @@ contract ContractPublisher is IContractPublisher, ERC2771Context, AccessControlE
function _msgData() internal view virtual override(Context, ERC2771Context) returns (bytes calldata) {
return ERC2771Context._msgData();
}

function _contextSuffixLength() internal view virtual override(Context, ERC2771Context) returns (uint256) {
return ERC2771Context._contextSuffixLength();
}
}
4 changes: 4 additions & 0 deletions contracts/infra/TWFactory.sol
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,8 @@ contract TWFactory is Multicall, ERC2771Context, AccessControlEnumerable, IContr
function _msgData() internal view virtual override(Context, ERC2771Context) returns (bytes calldata) {
return ERC2771Context._msgData();
}

function _contextSuffixLength() internal view virtual override(Context, ERC2771Context) returns (uint256) {
return ERC2771Context._contextSuffixLength();
}
}
4 changes: 4 additions & 0 deletions contracts/infra/TWFee.sol
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,8 @@ contract TWFee is ITWFee, Multicall, ERC2771Context, AccessControlEnumerable, IF
function _msgData() internal view virtual override(Context, ERC2771Context) returns (bytes calldata) {
return ERC2771Context._msgData();
}

function _contextSuffixLength() internal view virtual override(Context, ERC2771Context) returns (uint256) {
return ERC2771Context._contextSuffixLength();
}
}
4 changes: 4 additions & 0 deletions contracts/infra/TWMultichainRegistry.sol
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,8 @@ contract TWMultichainRegistry is ITWMultichainRegistry, Multicall, ERC2771Contex
function _msgData() internal view virtual override(Context, ERC2771Context) returns (bytes calldata) {
return ERC2771Context._msgData();
}

function _contextSuffixLength() internal view virtual override(Context, ERC2771Context) returns (uint256) {
return ERC2771Context._contextSuffixLength();
}
}
4 changes: 4 additions & 0 deletions contracts/infra/TWRegistry.sol
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,8 @@ contract TWRegistry is Multicall, ERC2771Context, AccessControlEnumerable {
function _msgData() internal view virtual override(Context, ERC2771Context) returns (bytes calldata) {
return ERC2771Context._msgData();
}

function _contextSuffixLength() internal view virtual override(Context, ERC2771Context) returns (uint256) {
return ERC2771Context._contextSuffixLength();
}
}
4 changes: 2 additions & 2 deletions src/test/smart-wallet/utils/AABenchmarkArtifacts.sol

Large diffs are not rendered by default.