Skip to content

Commit a24da85

Browse files
authored
fix: set default evmVersion to paris on Router's in not mainnet networks (usecannon#466)
1 parent 39a1b5f commit a24da85

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

examples/router-architecture/cannonfile.toml

-7
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,13 @@ contracts = [
2121
"Counter",
2222
"Greeter",
2323
]
24-
depends = [
25-
"contract.Counter",
26-
"contract.Greeter",
27-
]
2824

2925
# Deploy a new Proxy using as implementation our just craeted Router
3026
[provision.proxy]
3127
source = "transparent-upgradable-proxy:4.9.3"
3228
options.admin = "<%= settings.admin %>"
3329
options.implementation = "<%= contracts.Router.address %>"
3430
options.abi = "<%= JSON.stringify(contracts.Router.abi) %>"
35-
depends = ["router.Router"]
3631

3732
# Make example contracts calls, through the Proxy
3833

@@ -41,11 +36,9 @@ depends = ["router.Router"]
4136
target = ["proxy.Proxy"]
4237
func = "setCount"
4338
args = [0]
44-
depends = ["provision.proxy"]
4539

4640
# Call Greeter.setGreeting
4741
[invoke.setGreeting]
4842
target = ["proxy.Proxy"]
4943
func = "setGreeting"
5044
args = ["hello world!"]
51-
depends = ["provision.proxy"]

packages/builder/src/steps/router.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,11 @@ const routerStep = {
115115

116116
debug('router source code', sourceCode);
117117

118-
const inputData = await getCompileInput(contractName, sourceCode);
119-
const solidityInfo = await compileContract(contractName, sourceCode);
118+
// On Mainnet, use default local solc evmVersion, for everything else, 'paris'
119+
const evmVersion = [1, 5, 11155111].includes(runtime.chainId) ? undefined : 'paris';
120+
121+
const inputData = getCompileInput(contractName, sourceCode, evmVersion);
122+
const solidityInfo = await compileContract(contractName, sourceCode, evmVersion);
120123

121124
// the abi is entirely basedon the fallback call so we have to generate ABI here
122125
const routableAbi = getMergedAbiFromContractPaths(ctx, config.contracts);

0 commit comments

Comments
 (0)