feat: target shanghai #133
Conversation
Maddiaa0
force-pushed
the
md/target-shanghai
branch
2 times, most recently
from
9d32622
to
d02a50b
Compare
Maddiaa0
force-pushed
the
md/target-shanghai
branch
from
a95cabd
to
38c7499
Compare
|
Note: only asserting these two tests use shanghai as they are the only ones which have distinct bytecode offset markers in the tests. |
| @@ -2,6 +2,7 @@ | |||
| out = 'out' | |||
| libs = ['lib'] | |||
| ffi = true | |||
| evm_version = "shanghai" | |||
There was a problem hiding this comment.
Tests are still running in 0.8.15, wouldn't this need to be 0.8.19 as it is minimum supported solidity version for shanghai ?
Some tests files have fixed pragma set to 0.8.15 and should be easily fixable.
One problem is that huffmate depends on solmate and more precisely do an import:
import { ERC1155Recipient } from "solmate/test/ERC1155.t.sol";
which also have a fixed pragma.
There was a problem hiding this comment.
so we need a quick PR in Solmate (I don't think that this is so much work)
There was a problem hiding this comment.
Here is the PR for solmate transmissions11/solmate#382
| @@ -53,6 +53,7 @@ contract ERC20Test is Test { | |||
|
|
|||
| // Deploy the Mintable ERC20 | |||
| address mintableTokenAddress = HuffDeployer.config() | |||
| .with_evm_version("shanghai") | |||
There was a problem hiding this comment.
it seems to be the default (src). You want to do this to avoid future issues ?
| @@ -70,7 +70,7 @@ | |||
| [INITIAL_DOMAIN_SEPARATOR] sstore // [] | |||
|
|
|||
| // Copy the runtime bytecode with constructor argument concatenated. | |||
| 0x67 // [offset] - constructor code size | |||
| 0x66 // [offset] - constructor code size | |||
There was a problem hiding this comment.
| 0x66 // [offset] - constructor code size | |
| __codesize(CONSTRUCTOR) // [offset] - constructor code size |
still not perfect but better than hardcoded
| @@ -2,6 +2,7 @@ | |||
| out = 'out' | |||
| libs = ['lib'] | |||
| ffi = true | |||
| evm_version = "shanghai" | |||
There was a problem hiding this comment.
so we need a quick PR in Solmate (I don't think that this is so much work)
Updates huffmate to support shanghai (mainly push0)
This will fix master after the 0.3.2 release