Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
30211b7e
Commit
30211b7e
authored
Apr 03, 2023
by
James Kim
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
install Multicall3 using forge install
parent
0fd4ba77
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
46 additions
and
268 deletions
+46
-268
.gitmodules
.gitmodules
+5
-0
.gitmodules
packages/contracts-periphery/.gitmodules
+0
-0
MulticallContractCompiler.t.sol
...y/contracts/foundry-tests/MulticallContractCompiler.t.sol
+11
-0
Optimist.t.sol
...ontracts-periphery/contracts/foundry-tests/Optimist.t.sol
+25
-7
ExternalContractCompiler.sol
...ry/contracts/testing/helpers/ExternalContractCompiler.sol
+1
-0
Multicall3.sol
...tracts-periphery/contracts/testing/helpers/Multicall3.sol
+0
-261
foundry.toml
packages/contracts-periphery/foundry.toml
+4
-0
No files found.
.gitmodules
View file @
30211b7e
[submodule "tests"]
[submodule "tests"]
path = l2geth/tests/testdata
path = l2geth/tests/testdata
url = https://github.com/ethereum/tests
url = https://github.com/ethereum/tests
[submodule "packages/contracts-periphery/lib/multicall"]
path = packages/contracts-periphery/lib/multicall
url = https://github.com/mds1/multicall
[submodule "lib/multicall"]
branch = v3.1.0
packages/contracts-periphery/.gitmodules
0 → 100644
View file @
30211b7e
packages/contracts-periphery/contracts/foundry-tests/MulticallContractCompiler.t.sol
0 → 100644
View file @
30211b7e
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
import { Multicall3 } from "multicall/src/Multicall3.sol";
/**
* Just exists so we can compile this contract.
*/
contract MulticallContractCompiler {
}
packages/contracts-periphery/contracts/foundry-tests/Optimist.t.sol
View file @
30211b7e
//SPDX-License-Identifier: MIT
//SPDX-License-Identifier: MIT
pragma solidity
0.8.15
;
pragma solidity
>=0.6.2 <0.9.0
;
/* Testing utilities */
/* Testing utilities */
import { Test } from "forge-std/Test.sol";
import { Test } from "forge-std/Test.sol";
...
@@ -8,10 +8,27 @@ import { Optimist } from "../universal/op-nft/Optimist.sol";
...
@@ -8,10 +8,27 @@ import { Optimist } from "../universal/op-nft/Optimist.sol";
import { OptimistAllowlist } from "../universal/op-nft/OptimistAllowlist.sol";
import { OptimistAllowlist } from "../universal/op-nft/OptimistAllowlist.sol";
import { OptimistInviter } from "../universal/op-nft/OptimistInviter.sol";
import { OptimistInviter } from "../universal/op-nft/OptimistInviter.sol";
import { OptimistInviterHelper } from "../testing/helpers/OptimistInviterHelper.sol";
import { OptimistInviterHelper } from "../testing/helpers/OptimistInviterHelper.sol";
import { Multicall3 } from "../testing/helpers/Multicall3.sol";
import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
import { IERC721 } from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
import { IERC721 } from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
interface IMulticall3 {
struct Call3 {
address target;
bool allowFailure;
bytes callData;
}
struct Result {
bool success;
bytes returnData;
}
function aggregate3(Call3[] calldata calls)
external
payable
returns (Result[] memory returnData);
}
contract Optimist_Initializer is Test {
contract Optimist_Initializer is Test {
event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);
event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);
event Initialized(uint8);
event Initialized(uint8);
...
@@ -35,7 +52,7 @@ contract Optimist_Initializer is Test {
...
@@ -35,7 +52,7 @@ contract Optimist_Initializer is Test {
OptimistInviterHelper optimistInviterHelper;
OptimistInviterHelper optimistInviterHelper;
// To test multicall for claiming and minting in one call
// To test multicall for claiming and minting in one call
Multicall3 multicall3;
I
Multicall3 multicall3;
address internal carol_baseURIAttestor;
address internal carol_baseURIAttestor;
address internal alice_allowlistAttestor;
address internal alice_allowlistAttestor;
...
@@ -216,7 +233,8 @@ contract Optimist_Initializer is Test {
...
@@ -216,7 +233,8 @@ contract Optimist_Initializer is Test {
_optimistAllowlist: optimistAllowlist
_optimistAllowlist: optimistAllowlist
});
});
multicall3 = new Multicall3();
// address test = deployCode("Multicall3.sol");
multicall3 = IMulticall3(deployCode("Multicall3.sol"));
}
}
}
}
...
@@ -599,10 +617,10 @@ contract OptimistTest is Optimist_Initializer {
...
@@ -599,10 +617,10 @@ contract OptimistTest is Optimist_Initializer {
// wait minimum commitment period
// wait minimum commitment period
vm.warp(optimistInviter.MIN_COMMITMENT_PERIOD() + block.timestamp);
vm.warp(optimistInviter.MIN_COMMITMENT_PERIOD() + block.timestamp);
Multicall3.Call3[] memory calls = new
Multicall3.Call3[](2);
IMulticall3.Call3[] memory calls = new I
Multicall3.Call3[](2);
// First call is to claim the invite, receiving the attestation
// First call is to claim the invite, receiving the attestation
calls[0] = Multicall3.Call3({
calls[0] =
I
Multicall3.Call3({
target: address(optimistInviter),
target: address(optimistInviter),
callData: abi.encodeWithSelector(
callData: abi.encodeWithSelector(
optimistInviter.claimInvite.selector,
optimistInviter.claimInvite.selector,
...
@@ -614,7 +632,7 @@ contract OptimistTest is Optimist_Initializer {
...
@@ -614,7 +632,7 @@ contract OptimistTest is Optimist_Initializer {
});
});
// Second call is to mint the Optimist NFT
// Second call is to mint the Optimist NFT
calls[1] = Multicall3.Call3({
calls[1] =
I
Multicall3.Call3({
target: address(optimist),
target: address(optimist),
callData: abi.encodeWithSelector(optimist.mint.selector, bob),
callData: abi.encodeWithSelector(optimist.mint.selector, bob),
allowFailure: false
allowFailure: false
...
...
packages/contracts-periphery/contracts/testing/helpers/ExternalContractCompiler.sol
View file @
30211b7e
...
@@ -3,6 +3,7 @@ pragma solidity ^0.8.0;
...
@@ -3,6 +3,7 @@ pragma solidity ^0.8.0;
import { ProxyAdmin } from "@eth-optimism/contracts-bedrock/contracts/universal/ProxyAdmin.sol";
import { ProxyAdmin } from "@eth-optimism/contracts-bedrock/contracts/universal/ProxyAdmin.sol";
import { Proxy } from "@eth-optimism/contracts-bedrock/contracts/universal/Proxy.sol";
import { Proxy } from "@eth-optimism/contracts-bedrock/contracts/universal/Proxy.sol";
import { Multicall3 } from "multicall/src/Multicall3.sol";
/**
/**
* Just exists so we can compile external contracts.
* Just exists so we can compile external contracts.
...
...
packages/contracts-periphery/contracts/testing/helpers/Multicall3.sol
deleted
100644 → 0
View file @
0fd4ba77
This diff is collapsed.
Click to expand it.
packages/contracts-periphery/foundry.toml
View file @
30211b7e
...
@@ -16,9 +16,13 @@ remappings = [
...
@@ -16,9 +16,13 @@ remappings = [
'@rari-capital/solmate/=node_modules/@rari-capital/solmate'
,
'@rari-capital/solmate/=node_modules/@rari-capital/solmate'
,
'forge-std/=node_modules/forge-std/src'
,
'forge-std/=node_modules/forge-std/src'
,
'ds-test/=node_modules/ds-test/src'
,
'ds-test/=node_modules/ds-test/src'
,
'multicall/=lib/multicall'
,
'@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/'
,
'@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/'
,
'@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/'
,
'@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/'
,
'@eth-optimism/contracts-bedrock/=../../node_modules/@eth-optimism/contracts-bedrock'
,
'@eth-optimism/contracts-bedrock/=../../node_modules/@eth-optimism/contracts-bedrock'
,
]
]
# The metadata hash can be removed from the bytecode by setting "none"
# The metadata hash can be removed from the bytecode by setting "none"
bytecode_hash
=
"none"
bytecode_hash
=
"none"
libs
=
[
"node_modules"
,
"lib"
]
# Required to use `deployCode` to deploy the multicall contract which has incompatible version
fs_permissions
=
[
{
access
=
"read"
,
path
=
"./forge-artifacts/Multicall3.sol/Multicall3.json"
}
]
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment