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

GMS-2051 Multi-caller v2 #241

Merged
merged 19 commits into from
Sep 2, 2024
Merged

GMS-2051 Multi-caller v2 #241

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e61e6ed
Multi-caller v2
hiep-immutable Aug 22, 2024
ff0016b
Update names
hiep-immutable Aug 22, 2024
a246b9f
Use struct
hiep-immutable Aug 22, 2024
1de0fd9
Fix linting
hiep-immutable Aug 22, 2024
b6580d3
Fix type hash
hiep-immutable Aug 22, 2024
8c41a13
Improve testing
hiep-immutable Aug 23, 2024
68f26e9
Add threat model and rename contract
hiep-immutable Aug 26, 2024
144f688
Add more test cases
hiep-immutable Aug 26, 2024
820ab85
Check valid function signatures
hiep-immutable Aug 26, 2024
8b09200
Fix solidity version
hiep-immutable Aug 26, 2024
8739256
Update tests
hiep-immutable Aug 26, 2024
25482e9
Fix threat doc
hiep-immutable Aug 26, 2024
4377245
Add abi
hiep-immutable Aug 27, 2024
b62a222
Use encode in keccak256
hiep-immutable Aug 28, 2024
6cdcfbf
Address comments
hiep-immutable Aug 29, 2024
b879470
Add param name to mapping
hiep-immutable Aug 29, 2024
a27e31b
Merge branch 'main' into multi-caller-improvements
hiep-immutable Aug 29, 2024
4fdb60c
update threat model
allan-almeida-imtbl Aug 29, 2024
2af8c04
Update threat model
hiep-immutable Aug 29, 2024
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
321 changes: 321 additions & 0 deletions abi/generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,327 @@ export const guardedMulticallerAbi = [
},
] as const

//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// GuardedMulticaller2
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

export const guardedMulticaller2Abi = [
{
type: 'constructor',
inputs: [
{ name: '_owner', internalType: 'address', type: 'address' },
{ name: '_name', internalType: 'string', type: 'string' },
{ name: '_version', internalType: 'string', type: 'string' },
],
stateMutability: 'nonpayable',
},
{
type: 'function',
inputs: [],
name: 'DEFAULT_ADMIN_ROLE',
outputs: [{ name: '', internalType: 'bytes32', type: 'bytes32' }],
stateMutability: 'view',
},
{
type: 'function',
inputs: [],
name: 'MULTICALL_SIGNER_ROLE',
outputs: [{ name: '', internalType: 'bytes32', type: 'bytes32' }],
stateMutability: 'view',
},
{
type: 'function',
inputs: [],
name: 'eip712Domain',
outputs: [
{ name: 'fields', internalType: 'bytes1', type: 'bytes1' },
{ name: 'name', internalType: 'string', type: 'string' },
{ name: 'version', internalType: 'string', type: 'string' },
{ name: 'chainId', internalType: 'uint256', type: 'uint256' },
{ name: 'verifyingContract', internalType: 'address', type: 'address' },
{ name: 'salt', internalType: 'bytes32', type: 'bytes32' },
{ name: 'extensions', internalType: 'uint256[]', type: 'uint256[]' },
],
stateMutability: 'view',
},
{
type: 'function',
inputs: [
{ name: '_multicallSigner', internalType: 'address', type: 'address' },
{ name: '_reference', internalType: 'bytes32', type: 'bytes32' },
{
name: '_calls',
internalType: 'struct GuardedMulticaller2.Call[]',
type: 'tuple[]',
components: [
{ name: 'target', internalType: 'address', type: 'address' },
{ name: 'functionSignature', internalType: 'string', type: 'string' },
{ name: 'data', internalType: 'bytes', type: 'bytes' },
],
},
{ name: '_deadline', internalType: 'uint256', type: 'uint256' },
{ name: '_signature', internalType: 'bytes', type: 'bytes' },
],
name: 'execute',
outputs: [],
stateMutability: 'nonpayable',
},
{
type: 'function',
inputs: [{ name: 'role', internalType: 'bytes32', type: 'bytes32' }],
name: 'getRoleAdmin',
outputs: [{ name: '', internalType: 'bytes32', type: 'bytes32' }],
stateMutability: 'view',
},
{
type: 'function',
inputs: [{ name: '_user', internalType: 'address', type: 'address' }],
name: 'grantMulticallSignerRole',
outputs: [],
stateMutability: 'nonpayable',
},
{
type: 'function',
inputs: [
{ name: 'role', internalType: 'bytes32', type: 'bytes32' },
{ name: 'account', internalType: 'address', type: 'address' },
],
name: 'grantRole',
outputs: [],
stateMutability: 'nonpayable',
},
{
type: 'function',
inputs: [{ name: '_reference', internalType: 'bytes32', type: 'bytes32' }],
name: 'hasBeenExecuted',
outputs: [{ name: '', internalType: 'bool', type: 'bool' }],
stateMutability: 'view',
},
{
type: 'function',
inputs: [
{ name: 'role', internalType: 'bytes32', type: 'bytes32' },
{ name: 'account', internalType: 'address', type: 'address' },
],
name: 'hasRole',
outputs: [{ name: '', internalType: 'bool', type: 'bool' }],
stateMutability: 'view',
},
{
type: 'function',
inputs: [
{ name: 'role', internalType: 'bytes32', type: 'bytes32' },
{ name: 'account', internalType: 'address', type: 'address' },
],
name: 'renounceRole',
outputs: [],
stateMutability: 'nonpayable',
},
{
type: 'function',
inputs: [{ name: '_user', internalType: 'address', type: 'address' }],
name: 'revokeMulticallSignerRole',
outputs: [],
stateMutability: 'nonpayable',
},
{
type: 'function',
inputs: [
{ name: 'role', internalType: 'bytes32', type: 'bytes32' },
{ name: 'account', internalType: 'address', type: 'address' },
],
name: 'revokeRole',
outputs: [],
stateMutability: 'nonpayable',
},
{
type: 'function',
inputs: [{ name: 'interfaceId', internalType: 'bytes4', type: 'bytes4' }],
name: 'supportsInterface',
outputs: [{ name: '', internalType: 'bool', type: 'bool' }],
stateMutability: 'view',
},
{ type: 'event', anonymous: false, inputs: [], name: 'EIP712DomainChanged' },
{
type: 'event',
anonymous: false,
inputs: [
{
name: '_multicallSigner',
internalType: 'address',
type: 'address',
indexed: true,
},
{
name: '_reference',
internalType: 'bytes32',
type: 'bytes32',
indexed: true,
},
{
name: '_calls',
internalType: 'struct GuardedMulticaller2.Call[]',
type: 'tuple[]',
components: [
{ name: 'target', internalType: 'address', type: 'address' },
{ name: 'functionSignature', internalType: 'string', type: 'string' },
{ name: 'data', internalType: 'bytes', type: 'bytes' },
],
indexed: false,
},
{
name: '_deadline',
internalType: 'uint256',
type: 'uint256',
indexed: false,
},
],
name: 'Multicalled',
},
{
type: 'event',
anonymous: false,
inputs: [
{ name: 'role', internalType: 'bytes32', type: 'bytes32', indexed: true },
{
name: 'previousAdminRole',
internalType: 'bytes32',
type: 'bytes32',
indexed: true,
},
{
name: 'newAdminRole',
internalType: 'bytes32',
type: 'bytes32',
indexed: true,
},
],
name: 'RoleAdminChanged',
},
{
type: 'event',
anonymous: false,
inputs: [
{ name: 'role', internalType: 'bytes32', type: 'bytes32', indexed: true },
{
name: 'account',
internalType: 'address',
type: 'address',
indexed: true,
},
{
name: 'sender',
internalType: 'address',
type: 'address',
indexed: true,
},
],
name: 'RoleGranted',
},
{
type: 'event',
anonymous: false,
inputs: [
{ name: 'role', internalType: 'bytes32', type: 'bytes32', indexed: true },
{
name: 'account',
internalType: 'address',
type: 'address',
indexed: true,
},
{
name: 'sender',
internalType: 'address',
type: 'address',
indexed: true,
},
],
name: 'RoleRevoked',
},
{ type: 'error', inputs: [], name: 'EmptyCallArray' },
{
type: 'error',
inputs: [{ name: '_deadline', internalType: 'uint256', type: 'uint256' }],
name: 'Expired',
},
{
type: 'error',
inputs: [
{
name: '_call',
internalType: 'struct GuardedMulticaller2.Call',
type: 'tuple',
components: [
{ name: 'target', internalType: 'address', type: 'address' },
{ name: 'functionSignature', internalType: 'string', type: 'string' },
{ name: 'data', internalType: 'bytes', type: 'bytes' },
],
},
],
name: 'FailedCall',
},
{
type: 'error',
inputs: [
{
name: '_call',
internalType: 'struct GuardedMulticaller2.Call',
type: 'tuple',
components: [
{ name: 'target', internalType: 'address', type: 'address' },
{ name: 'functionSignature', internalType: 'string', type: 'string' },
{ name: 'data', internalType: 'bytes', type: 'bytes' },
],
},
],
name: 'InvalidFunctionSignature',
},
{
type: 'error',
inputs: [{ name: '_reference', internalType: 'bytes32', type: 'bytes32' }],
name: 'InvalidReference',
},
{ type: 'error', inputs: [], name: 'InvalidShortString' },
{
type: 'error',
inputs: [
{
name: '_call',
internalType: 'struct GuardedMulticaller2.Call',
type: 'tuple',
components: [
{ name: 'target', internalType: 'address', type: 'address' },
{ name: 'functionSignature', internalType: 'string', type: 'string' },
{ name: 'data', internalType: 'bytes', type: 'bytes' },
],
},
],
name: 'NonContractAddress',
},
{
type: 'error',
inputs: [{ name: '_reference', internalType: 'bytes32', type: 'bytes32' }],
name: 'ReusedReference',
},
{
type: 'error',
inputs: [{ name: 'str', internalType: 'string', type: 'string' }],
name: 'StringTooLong',
},
{
type: 'error',
inputs: [{ name: '_signature', internalType: 'bytes', type: 'bytes' }],
name: 'UnauthorizedSignature',
},
{
type: 'error',
inputs: [
{ name: '_multicallSigner', internalType: 'address', type: 'address' },
],
name: 'UnauthorizedSigner',
},
] as const

//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// ImmutableERC1155
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
9 changes: 8 additions & 1 deletion abi/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ import {
immutableErc721Abi as ImmutableERC721Abi,
immutableErc721MintByIdAbi as ImmutableERC721MintByIdAbi,
immutableErc1155Abi as ImmutableERC1155Abi,
guardedMulticaller2Abi as GuardedMulticaller2Abi,
} from "./generated";

export { GuardedMulticallerAbi, ImmutableERC721Abi, ImmutableERC721MintByIdAbi, ImmutableERC1155Abi };
export {
GuardedMulticallerAbi,
ImmutableERC721Abi,
ImmutableERC721MintByIdAbi,
ImmutableERC1155Abi,
GuardedMulticaller2Abi,
};
Loading
Loading