[wip] feat: state function changes #6

merklefruit · 2023-06-12T19:55:35Z

Work in progress:

… vaults

merklefruit · 2023-06-24T10:39:03Z

crates/executor/src/executor.rs

+                }
+
+                let new_sender_info = to_reth_acc(&sender_account.info);
+                post_state.change_account(sender, old_sender_info, new_sender_info);


Potential problem: when changing the post_state before the tx execution like we do here, does this create a clash with the state object returned by the execution? hopefully not, but have to test this

merklefruit · 2023-06-24T10:41:55Z

crates/executor/src/executor.rs

+                // Route the l1 cost and base fee to the appropriate optimism vaults
+                self.increment_account_balance(
+                    optimism::l1_cost_recipient(),
+                    l1_cost,
+                    &mut post_state,
+                )?;
+                self.increment_account_balance(
+                    optimism::base_fee_recipient(),
+                    U256::from(
+                        block
+                            .base_fee_per_gas
+                            .unwrap_or_default()
+                            .saturating_mul(result.gas_used()),
+                    ),
+                    &mut post_state,
+                )?;


can probably be refactored to be prettier

crates/executor/src/optimism.rs

crates/revm/revm-primitives/src/env.rs

crates/transaction-pool/src/traits.rs

merklefruit · 2023-06-24T11:12:28Z

crates/executor/src/executor.rs

+                if let Some(m) = transaction.mint() {
+                    // Add balance to the caller account equal to the minted amount.
+                    // Note: this is unconditional, and will not be reverted if the tx fails
+                    // (unless the block can't be built at all due to gas limit constraints)
+                    sender_account.info.balance += U256::from(m);
+                }


This could have been addressed in Revm's transact() function in a more clean way. In fact I have a local branch of what this change would look like here: https://github.com/merklefruit/revm/pull/1/files#diff-1d478ba44ccc56e3b1142bd3723bf97f3e254c25dd18323481aedadce0803e91R130

However that solution has some cons:

we are not able to revert the deposit if the block runs out of gas, because revm's transact() context doesn't know about the outstanding block gas used (called cumulative_gas_used here)

we can't cache the values to calculate l1_cost for the entire block, and would have to access the DB for each transaction in the block instead. This is the main reason why I wanted to keep all the diffs on Op-reth if possible

merklefruit · 2023-07-09T15:06:21Z

Changes rebased in #8

Co-authored-by: Brian Bland <[email protected]> Co-authored-by: refcell <[email protected]> Co-authored-by: nicolas <[email protected]> Co-authored-by: Roberto <[email protected]> Resolution checkpoint Resolution checkpoint #2 Resolution checkpoint #3 x Resolution checkpoint #4 Resolution checkpoint #5 Resolution checkpoint #6 Resolution checkpoint #7 Resolution checkpoint #8 Resolve checkpoint #9 (transaction primitive) Resolve checkpoint #10 (rpc api transactions) Resolve checkpoint #11 (building w/o feature flag) Start review Compiling with and without `optimism` feature flag Remove `DepositTx` from txpool mock tests, they never go into the txpool fmt code lint fix signature tests Co-authored-by: nicolas <[email protected]> Use free CI runners (revert before upstream) Co-authored-by: refcell <[email protected]> Signature test fixes Co-authored-by refcell <[email protected]> Fix Receipt proptest Co-authored-by BB <[email protected]> lint Fix variable-length compact for txtype/transaction Co-authored-by: Brian Bland <[email protected]> Fix basefee tests Remove unnecessary rpc deps

Resolution checkpoint Resolution checkpoint #2 Resolution checkpoint #3 x Resolution checkpoint #4 Resolution checkpoint #5 Resolution checkpoint #6 Resolution checkpoint #7 Resolution checkpoint #8 Resolve checkpoint #9 (transaction primitive) Resolve checkpoint #10 (rpc api transactions) Resolve checkpoint #11 (building w/o feature flag) Start review Compiling with and without `optimism` feature flag Remove `DepositTx` from txpool mock tests, they never go into the txpool fmt code lint fix signature tests Co-authored-by: nicolas <[email protected]> Use free CI runners (revert before upstream) Co-authored-by: refcell <[email protected]> Signature test fixes Co-authored-by refcell <[email protected]> Fix Receipt proptest Co-authored-by BB <[email protected]> lint Fix variable-length compact for txtype/transaction Co-authored-by: Brian Bland <[email protected]> Fix basefee tests Remove unnecessary rpc deps Co-authored-by: Brian Bland <[email protected]> Co-authored-by: refcell <[email protected]> Co-authored-by: nicolas <[email protected]> Co-authored-by: Roberto <[email protected]>

merklefruit added 5 commits June 11, 2023 14:46

feat: executor deposits

36202a4

feat: receipts, l1 cost wip

ec75e0f

chore: small fixes

56f2a1d

wip: transact() optimism changes

e9714d0

chore: minor changes related to optimism execution

65083e2

merklefruit changed the title ~~feat: state function changes~~ [wip] feat: state function changes Jun 12, 2023

merklefruit added 7 commits June 17, 2023 22:25

wip: removed receipts changes + improved gas handling

593d3c1

chore: cleanup

66a1e94

chore: system_tx and is_success method

25da21d

feat: refactoring: separated optimism feature + added routing fees to…

8ba4c46

… vaults

fix: fee vault calc

47f8824

fix: increment balance via executor function

738e9f5

chore: minor fixes

d00bad2

merklefruit commented Jun 24, 2023

View reviewed changes

merklefruit marked this pull request as ready for review June 24, 2023 11:14

merklefruit added 3 commits June 29, 2023 00:35

feat: parse l1 block info from l2 block

0a82357

chore: removed default trait

0a003c3

chore: set deposit gas to 0 always

c7d1c2d

clabby mentioned this pull request Jul 8, 2023

chore: Rebase on upstream #7

Closed

merklefruit closed this Jul 9, 2023

merklefruit mentioned this pull request Jul 13, 2023

feat: op-reth #8

Closed

clabby added a commit that referenced this pull request Aug 12, 2023

Resolution checkpoint #6

80f09b1

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[wip] feat: state function changes #6

[wip] feat: state function changes #6

merklefruit commented Jun 12, 2023 •

edited

Loading

merklefruit Jun 24, 2023

merklefruit Jun 24, 2023

merklefruit Jun 24, 2023

merklefruit commented Jul 9, 2023

[wip] feat: state function changes #6

[wip] feat: state function changes #6

Conversation

merklefruit commented Jun 12, 2023 • edited Loading

merklefruit Jun 24, 2023

Choose a reason for hiding this comment

merklefruit Jun 24, 2023

Choose a reason for hiding this comment

merklefruit Jun 24, 2023

Choose a reason for hiding this comment

merklefruit commented Jul 9, 2023

merklefruit commented Jun 12, 2023 •

edited

Loading