fix!: default_max_contract_limit not correctly applied #1653

Flouse · 2023-12-21T14:40:26Z

Note: This is a PR to forcerelay-dev branch.

If the hardfork Andromeda is not enabled, use default_max_contract_limit(),
because default_max_contract_limit is set to ConsensusConfig by default:

axon/protocol/src/types/primitive.rs

Lines 440 to 460 in bebd4ca

    
               #[serde(default = "default_max_contract_limit")] 
        
               pub max_contract_limit: u64, 
        
           } 
        
           impl From<ConsensusConfig> for ConsensusConfigV0 { 
        
               fn from(value: ConsensusConfig) -> Self { 
        
                   ConsensusConfigV0 { 
        
                       gas_limit:       value.gas_limit, 
        
                       interval:        value.interval, 
        
                       precommit_ratio: value.precommit_ratio, 
        
                       propose_ratio:   value.propose_ratio, 
        
                       prevote_ratio:   value.prevote_ratio, 
        
                       brake_ratio:     value.brake_ratio, 
        
                       tx_num_limit:    value.tx_num_limit, 
        
                       max_tx_size:     value.max_tx_size, 
        
                   } 
        
               } 
        
           } 
        
           pub fn default_max_contract_limit() -> u64 { 
        
               0xc000 
        
           }

What is the impact of this PR?

This is a Breaking Change

sync test | https://github.com/axonweb3/axon/actions/runs/7289648559/job/19865018998?pr=1653#step:7:123

CI Settings

CI Usage

Tip: Check the CI you want to run below, and then comment /run-ci.

CI Switch

Web3 Compatible Tests
OpenZeppelin tests
v3 Core Tests

CI Description

CI Name	Description
Web3 Compatible Test	Test the Web3 compatibility of Axon
v3 Core Test	Run the compatibility tests provided by Uniswap V3
OpenZeppelin tests	Run the compatibility tests provided by OpenZeppelin, including OCT 1-5 \| 6-10 \| 11 \| 12-15 \| 16-19

… not enabled

* ci: add axon sync test * ci: update the self-runner name to layer2-runners * Run sync-test on pull_request event --------- Co-authored-by: Flouse <[email protected]>

Flouse · 2023-12-22T02:13:14Z

/run-ci

github-actions · 2023-12-22T02:13:27Z

CI tests run on commit:

commit id: 540be8a

CI test list:

openzeppelin_test_1_5_and_12_15.yml
openzeppelin_test_16_19.yml
openzeppelin_test_6_10.yml
openzeppelin_test_11.yml
v3_core_test.yml
web3_compatible.yml

Please check ci test results later.

core/executor/src/lib.rs

Flouse requested a review from a team as a code owner December 21, 2023 14:40

Flouse requested review from blckngm and Simon-Tl and removed request for a team December 21, 2023 14:40

Flouse force-pushed the fix-default_max_contract_limit branch from 3af7eb0 to 7b5e714 Compare December 21, 2023 14:42

Flouse requested review from ashuralyk and driftluo and removed request for Simon-Tl December 21, 2023 14:43

Flouse and others added 2 commits December 21, 2023 14:49

fix: apply default_max_contract_limit when HardforkName::Andromeda is…

555cfc6

… not enabled

chore(CI): add axon sync workflow (axonweb3#1636)

540be8a

* ci: add axon sync test * ci: update the self-runner name to layer2-runners * Run sync-test on pull_request event --------- Co-authored-by: Flouse <[email protected]>

Flouse force-pushed the fix-default_max_contract_limit branch from 28eb351 to 540be8a Compare December 21, 2023 14:50

yangby-cryptape approved these changes Dec 22, 2023

View reviewed changes

Flouse changed the title ~~fix: default_max_contract_limit not correctly applied~~ fix!: default_max_contract_limit not correctly applied Dec 22, 2023

KaoImin reviewed Dec 22, 2023

View reviewed changes

core/executor/src/lib.rs Show resolved Hide resolved

KaoImin approved these changes Dec 22, 2023

View reviewed changes

driftluo approved these changes Dec 22, 2023

View reviewed changes

Flouse merged commit c203acb into axonweb3:forcerelay-dev Dec 22, 2023
34 of 45 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix!: default_max_contract_limit not correctly applied #1653

fix!: default_max_contract_limit not correctly applied #1653

Flouse commented Dec 21, 2023 •

edited

Loading

Flouse commented Dec 22, 2023

github-actions bot commented Dec 22, 2023

	#[serde(default = "default_max_contract_limit")]
	pub max_contract_limit: u64,
	}
	impl From<ConsensusConfig> for ConsensusConfigV0 {
	fn from(value: ConsensusConfig) -> Self {
	ConsensusConfigV0 {
	gas_limit: value.gas_limit,
	interval: value.interval,
	precommit_ratio: value.precommit_ratio,
	propose_ratio: value.propose_ratio,
	prevote_ratio: value.prevote_ratio,
	brake_ratio: value.brake_ratio,
	tx_num_limit: value.tx_num_limit,
	max_tx_size: value.max_tx_size,
	}
	}
	}

	pub fn default_max_contract_limit() -> u64 {
	0xc000
	}

fix!: default_max_contract_limit not correctly applied #1653

fix!: default_max_contract_limit not correctly applied #1653

Conversation

Flouse commented Dec 21, 2023 • edited Loading

What is the impact of this PR?

CI Usage

CI Description

Flouse commented Dec 22, 2023

github-actions bot commented Dec 22, 2023

CI tests run on commit:

CI test list:

Please check ci test results later.

Flouse commented Dec 21, 2023 •

edited

Loading