Implement CIP-43: BlockContext(now rename to SysContractCallCtx) by 37ng · Pull Request #1696 · celo-org/celo-blockchain

37ng · 2021-09-17T16:18:09Z

Description

Background

CIP Link

Use cases

Current

1. In `core.tx_pool_context`

Reset in txPool.reset() every new block, for sorting and checking TX validity.

New

1. In `miner.blockState`

This is where validators mine blocks. We can initialize it within BlockState scope since we will reuse the contract call results from the state of beginning of a block, and apply all transactions within that block, and reset it for every new block.

2. In `core.stateProcessor.Process()`

This stateProcessor.Process() is used for engine.Verify() during consensus, and chain.insertChain(). Process() takes a block as argument, it makes sense to initialize an SCCC in this scope.

Implementation plan

Rename core.BlockContext to SysContractCallCtx(SCCC) to avoid confusion, because we already have vm.BlockContext.
Add basefee/GPM fields and methods in SCCC.
Only invoke contract calls when requested, instead of invoking all contract calls when SCCC is initialized.

func NewSCCC(vmRunner vm.EVMRunner) SCCC {
	return SCCC{
		field1:     empty,
		field2:     empty,
	}
}
func (s SCCC) GetField1() {
	s.field1 = contractCall()
	return s.field1
}

For use case 1: miner.BlockState

Add SCCC as a field, initialize it in worker.prepareBlock, such that when the miner is constructing blocks, the SCCC can be passed over to core.ApplyTransaction().

For use case 2: core.stateProcessor.Process()

Initialize SCCC in stateProcessor.Process(), pass it over to core.ApplyTransaction().

Other changes

None

Tested

TODO

Related issues

Fixes Use the previous block state for system contract calls #1576

Backwards compatibility

A hard fork change.

trianglesphere

Looking good so far. I've got one comment on keeping track of the statedb

trianglesphere

Looking good. I left a couple small comments. Try a merge from trianglesphere/work - more tests should be passing.

piersy · 2021-09-29T21:15:11Z

Coverage from tests in ./e2e_test/... for ./consensus/istanbul/... at commit 7c75f63

coverage:  44.2% of statements across all listed packages
coverage:  54.1% of statements in consensus/istanbul
coverage:  44.0% of statements in consensus/istanbul/backend
coverage:   0.0% of statements in consensus/istanbul/backend/backendtest
coverage:  43.3% of statements in consensus/istanbul/backend/internal/db
coverage:  24.1% of statements in consensus/istanbul/backend/internal/enodes
coverage:  22.6% of statements in consensus/istanbul/backend/internal/replica
coverage:  63.8% of statements in consensus/istanbul/core
coverage:   0.0% of statements in consensus/istanbul/proxy
coverage:  75.3% of statements in consensus/istanbul/uptime
coverage: 100.0% of statements in consensus/istanbul/uptime/store
coverage:  51.8% of statements in consensus/istanbul/validator
coverage:  79.2% of statements in consensus/istanbul/validator/random

piersy · 2021-09-30T18:38:25Z

Coverage from tests in ./e2e_test/... for ./consensus/istanbul/... at commit 21f1712

coverage:  44.5% of statements across all listed packages
coverage:  54.1% of statements in consensus/istanbul
coverage:  44.5% of statements in consensus/istanbul/backend
coverage:   0.0% of statements in consensus/istanbul/backend/backendtest
coverage:  43.3% of statements in consensus/istanbul/backend/internal/db
coverage:  24.1% of statements in consensus/istanbul/backend/internal/enodes
coverage:  22.6% of statements in consensus/istanbul/backend/internal/replica
coverage:  64.0% of statements in consensus/istanbul/core
coverage:   0.0% of statements in consensus/istanbul/proxy
coverage:  75.3% of statements in consensus/istanbul/uptime
coverage: 100.0% of statements in consensus/istanbul/uptime/store
coverage:  51.8% of statements in consensus/istanbul/validator
coverage:  79.2% of statements in consensus/istanbul/validator/random

piersy · 2021-10-04T19:49:14Z

Coverage from tests in ./e2e_test/... for ./consensus/istanbul/... at commit 5a3434c

coverage:  44.7% of statements across all listed packages
coverage:  54.1% of statements in consensus/istanbul
coverage:  45.0% of statements in consensus/istanbul/backend
coverage:   0.0% of statements in consensus/istanbul/backend/backendtest
coverage:  43.3% of statements in consensus/istanbul/backend/internal/db
coverage:  24.1% of statements in consensus/istanbul/backend/internal/enodes
coverage:  22.6% of statements in consensus/istanbul/backend/internal/replica
coverage:  64.2% of statements in consensus/istanbul/core
coverage:   0.0% of statements in consensus/istanbul/proxy
coverage:  75.3% of statements in consensus/istanbul/uptime
coverage: 100.0% of statements in consensus/istanbul/uptime/store
coverage:  51.8% of statements in consensus/istanbul/validator
coverage:  79.2% of statements in consensus/istanbul/validator/random

piersy · 2021-10-05T20:01:05Z

Coverage from tests in ./e2e_test/... for ./consensus/istanbul/... at commit 6071697

coverage:  45.4% of statements across all listed packages
coverage:  54.6% of statements in consensus/istanbul
coverage:  45.4% of statements in consensus/istanbul/backend
coverage:   0.0% of statements in consensus/istanbul/backend/backendtest
coverage:  43.3% of statements in consensus/istanbul/backend/internal/db
coverage:  24.1% of statements in consensus/istanbul/backend/internal/enodes
coverage:  22.6% of statements in consensus/istanbul/backend/internal/replica
coverage:  65.8% of statements in consensus/istanbul/core
coverage:   0.0% of statements in consensus/istanbul/proxy
coverage:  75.3% of statements in consensus/istanbul/uptime
coverage: 100.0% of statements in consensus/istanbul/uptime/store
coverage:  51.8% of statements in consensus/istanbul/validator
coverage:  79.2% of statements in consensus/istanbul/validator/random

piersy · 2021-10-05T20:42:40Z

Coverage from tests in ./e2e_test/... for ./consensus/istanbul/... at commit 9d26e5f

coverage:  44.7% of statements across all listed packages
coverage:  54.1% of statements in consensus/istanbul
coverage:  45.1% of statements in consensus/istanbul/backend
coverage:   0.0% of statements in consensus/istanbul/backend/backendtest
coverage:  43.3% of statements in consensus/istanbul/backend/internal/db
coverage:  24.1% of statements in consensus/istanbul/backend/internal/enodes
coverage:  22.6% of statements in consensus/istanbul/backend/internal/replica
coverage:  64.0% of statements in consensus/istanbul/core
coverage:   0.0% of statements in consensus/istanbul/proxy
coverage:  75.3% of statements in consensus/istanbul/uptime
coverage: 100.0% of statements in consensus/istanbul/uptime/store
coverage:  51.8% of statements in consensus/istanbul/validator
coverage:  79.2% of statements in consensus/istanbul/validator/random

- Use stateDB.Copy() for sysContractCallCtx in Process() & BlockState - Use header rather than parentHeader

This reverts commit a82eeb5.

piersy · 2021-10-19T15:28:51Z

Coverage from tests in ./e2e_test/... for ./consensus/istanbul/... at commit b896eb5

coverage:  44.6% of statements across all listed packages
coverage:  54.1% of statements in consensus/istanbul
coverage:  44.8% of statements in consensus/istanbul/backend
coverage:   0.0% of statements in consensus/istanbul/backend/backendtest
coverage:  43.3% of statements in consensus/istanbul/backend/internal/db
coverage:  24.1% of statements in consensus/istanbul/backend/internal/enodes
coverage:  22.6% of statements in consensus/istanbul/backend/internal/replica
coverage:  64.0% of statements in consensus/istanbul/core
coverage:   0.0% of statements in consensus/istanbul/proxy
coverage:  75.3% of statements in consensus/istanbul/uptime
coverage: 100.0% of statements in consensus/istanbul/uptime/store
coverage:  51.8% of statements in consensus/istanbul/validator
coverage:  79.2% of statements in consensus/istanbul/validator/random

piersy · 2021-10-19T16:23:44Z

Coverage from tests in ./e2e_test/... for ./consensus/istanbul/... at commit 4095d4d

coverage:  44.6% of statements across all listed packages
coverage:  54.1% of statements in consensus/istanbul
coverage:  44.8% of statements in consensus/istanbul/backend
coverage:   0.0% of statements in consensus/istanbul/backend/backendtest
coverage:  43.3% of statements in consensus/istanbul/backend/internal/db
coverage:  24.1% of statements in consensus/istanbul/backend/internal/enodes
coverage:  22.6% of statements in consensus/istanbul/backend/internal/replica
coverage:  63.9% of statements in consensus/istanbul/core
coverage:   0.0% of statements in consensus/istanbul/proxy
coverage:  75.3% of statements in consensus/istanbul/uptime
coverage: 100.0% of statements in consensus/istanbul/uptime/store
coverage:  51.8% of statements in consensus/istanbul/validator
coverage:  79.2% of statements in consensus/istanbul/validator/random

piersy · 2021-10-19T20:37:13Z

Coverage from tests in ./e2e_test/... for ./consensus/istanbul/... at commit a201f10

coverage:  44.4% of statements across all listed packages
coverage:  54.1% of statements in consensus/istanbul
coverage:  44.5% of statements in consensus/istanbul/backend
coverage:   0.0% of statements in consensus/istanbul/backend/backendtest
coverage:  43.3% of statements in consensus/istanbul/backend/internal/db
coverage:  24.1% of statements in consensus/istanbul/backend/internal/enodes
coverage:  22.6% of statements in consensus/istanbul/backend/internal/replica
coverage:  63.8% of statements in consensus/istanbul/core
coverage:   0.0% of statements in consensus/istanbul/proxy
coverage:  75.3% of statements in consensus/istanbul/uptime
coverage: 100.0% of statements in consensus/istanbul/uptime/store
coverage:  51.8% of statements in consensus/istanbul/validator
coverage:  79.2% of statements in consensus/istanbul/validator/random

trianglesphere

Overall looks good. The only change I'd like before merging is removing the Faker check inside state_transition.go.

piersy · 2021-10-27T16:08:10Z

Coverage from tests in ./e2e_test/... for ./consensus/istanbul/... at commit c53c6bf

coverage:  44.6% of statements across all listed packages
coverage:  54.1% of statements in consensus/istanbul
coverage:  44.8% of statements in consensus/istanbul/backend
coverage:   0.0% of statements in consensus/istanbul/backend/backendtest
coverage:  43.3% of statements in consensus/istanbul/backend/internal/db
coverage:  24.1% of statements in consensus/istanbul/backend/internal/enodes
coverage:  22.6% of statements in consensus/istanbul/backend/internal/replica
coverage:  64.0% of statements in consensus/istanbul/core
coverage:   0.0% of statements in consensus/istanbul/proxy
coverage:  75.3% of statements in consensus/istanbul/uptime
coverage: 100.0% of statements in consensus/istanbul/uptime/store
coverage:  51.8% of statements in consensus/istanbul/validator
coverage:  79.2% of statements in consensus/istanbul/validator/random

piersy · 2021-10-27T20:33:04Z

Coverage from tests in ./e2e_test/... for ./consensus/istanbul/... at commit 31129ec

coverage:  45.0% of statements across all listed packages
coverage:  54.6% of statements in consensus/istanbul
coverage:  44.8% of statements in consensus/istanbul/backend
coverage:   0.0% of statements in consensus/istanbul/backend/backendtest
coverage:  43.3% of statements in consensus/istanbul/backend/internal/db
coverage:  24.1% of statements in consensus/istanbul/backend/internal/enodes
coverage:  22.6% of statements in consensus/istanbul/backend/internal/replica
coverage:  65.3% of statements in consensus/istanbul/core
coverage:   0.0% of statements in consensus/istanbul/proxy
coverage:  75.3% of statements in consensus/istanbul/uptime
coverage: 100.0% of statements in consensus/istanbul/uptime/store
coverage:  51.8% of statements in consensus/istanbul/validator
coverage:  79.2% of statements in consensus/istanbul/validator/random

piersy · 2021-10-27T20:53:38Z

Coverage from tests in ./e2e_test/... for ./consensus/istanbul/... at commit c01718b

coverage:  44.7% of statements across all listed packages
coverage:  54.1% of statements in consensus/istanbul
coverage:  45.0% of statements in consensus/istanbul/backend
coverage:   0.0% of statements in consensus/istanbul/backend/backendtest
coverage:  43.3% of statements in consensus/istanbul/backend/internal/db
coverage:  24.1% of statements in consensus/istanbul/backend/internal/enodes
coverage:  22.6% of statements in consensus/istanbul/backend/internal/replica
coverage:  63.9% of statements in consensus/istanbul/core
coverage:   0.0% of statements in consensus/istanbul/proxy
coverage:  75.3% of statements in consensus/istanbul/uptime
coverage: 100.0% of statements in consensus/istanbul/uptime/store
coverage:  51.8% of statements in consensus/istanbul/validator
coverage:  79.2% of statements in consensus/istanbul/validator/random

piersy · 2021-10-27T21:31:32Z

Coverage from tests in ./e2e_test/... for ./consensus/istanbul/... at commit 903891d

coverage:  44.6% of statements across all listed packages
coverage:  54.1% of statements in consensus/istanbul
coverage:  44.8% of statements in consensus/istanbul/backend
coverage:   0.0% of statements in consensus/istanbul/backend/backendtest
coverage:  43.3% of statements in consensus/istanbul/backend/internal/db
coverage:  24.1% of statements in consensus/istanbul/backend/internal/enodes
coverage:  22.6% of statements in consensus/istanbul/backend/internal/replica
coverage:  63.9% of statements in consensus/istanbul/core
coverage:   0.0% of statements in consensus/istanbul/proxy
coverage:  75.3% of statements in consensus/istanbul/uptime
coverage: 100.0% of statements in consensus/istanbul/uptime/store
coverage:  51.8% of statements in consensus/istanbul/validator
coverage:  79.2% of statements in consensus/istanbul/validator/random

piersy · 2021-10-27T22:40:11Z

Coverage from tests in ./e2e_test/... for ./consensus/istanbul/... at commit 3656f66

coverage:  44.3% of statements across all listed packages
coverage:  54.1% of statements in consensus/istanbul
coverage:  44.1% of statements in consensus/istanbul/backend
coverage:   0.0% of statements in consensus/istanbul/backend/backendtest
coverage:  43.3% of statements in consensus/istanbul/backend/internal/db
coverage:  24.1% of statements in consensus/istanbul/backend/internal/enodes
coverage:  22.6% of statements in consensus/istanbul/backend/internal/replica
coverage:  64.0% of statements in consensus/istanbul/core
coverage:   0.0% of statements in consensus/istanbul/proxy
coverage:  75.3% of statements in consensus/istanbul/uptime
coverage: 100.0% of statements in consensus/istanbul/uptime/store
coverage:  51.8% of statements in consensus/istanbul/validator
coverage:  79.2% of statements in consensus/istanbul/validator/random

piersy · 2021-10-27T22:48:15Z

Coverage from tests in ./e2e_test/... for ./consensus/istanbul/... at commit 5a550be

coverage:  45.5% of statements across all listed packages
coverage:  54.6% of statements in consensus/istanbul
coverage:  45.4% of statements in consensus/istanbul/backend
coverage:   0.0% of statements in consensus/istanbul/backend/backendtest
coverage:  43.3% of statements in consensus/istanbul/backend/internal/db
coverage:  24.1% of statements in consensus/istanbul/backend/internal/enodes
coverage:  22.6% of statements in consensus/istanbul/backend/internal/replica
coverage:  66.2% of statements in consensus/istanbul/core
coverage:   0.0% of statements in consensus/istanbul/proxy
coverage:  75.3% of statements in consensus/istanbul/uptime
coverage: 100.0% of statements in consensus/istanbul/uptime/store
coverage:  51.8% of statements in consensus/istanbul/validator
coverage:  79.2% of statements in consensus/istanbul/validator/random

trianglesphere

lgtm 🚀

37ng requested review from gastonponti, mcortesi and trianglesphere September 17, 2021 16:18

37ng self-assigned this Sep 17, 2021

37ng mentioned this pull request Sep 17, 2021

Implement CIP-43: BlockContext #1678

Closed

37ng force-pushed the tong/sccc branch 3 times, most recently from 56edaf0 to da41ae9 Compare September 20, 2021 21:13

trianglesphere reviewed Sep 20, 2021

View reviewed changes

Comment thread core/state_processor.go Outdated

Comment thread core/state_processor.go Outdated

37ng force-pushed the tong/sccc branch from 1dec649 to 5ea29f0 Compare September 22, 2021 22:25

trianglesphere reviewed Sep 24, 2021

View reviewed changes

Comment thread core/sys_context.go Outdated

trianglesphere mentioned this pull request Sep 28, 2021

Espresso Hardfork #1703

Closed

11 tasks

trianglesphere reviewed Sep 29, 2021

View reviewed changes

Comment thread core/state_prefetcher.go

Comment thread core/sys_context.go Outdated

37ng force-pushed the tong/sccc branch from 7c75f63 to 21f1712 Compare September 30, 2021 18:34

37ng added 11 commits October 5, 2021 16:31

Rename core.BlockContext to core.SysContractCallCtx

16c9de9

Add SCCC to miner/blockState

6b24416

Add SCCC to stateProcessor.Process() & ApplyTransaction()

ce1a32f

Rename core.BlockContext to core.SysContractCallCtx(continued)

007d4bc

Put placeholders in tests

ead3191

Remove redundant params in applyTransaction

4de200c

Address comments

7d7ee88

- Use stateDB.Copy() for sysContractCallCtx in Process() & BlockState - Use header rather than parentHeader

Add sccc to statePrefetcher

f3e05ea

Add sccc to state_accessor.go

b0976bf

bug: fix nil map

db5cb7f

No nil map at initialization

a42e3de

37ng added 2 commits October 19, 2021 10:21

Revert "Refactor canPayFee"

85f0482

This reverts commit a82eeb5.

Align comment with code structure

b896eb5

Update comment

4095d4d

trianglesphere reviewed Oct 19, 2021

View reviewed changes

Comment thread core/state_transition.go Outdated

Comment thread core/state_transition.go Outdated

Comment thread core/state_transition.go Outdated

Check GatewayFeeRecipient, and refactor

a201f10

trianglesphere suggested changes Oct 21, 2021

View reviewed changes

Comment thread core/state_transition.go Outdated

trianglesphere mentioned this pull request Oct 26, 2021

Merge v1.10.7 #1695

Merged

wip

c53c6bf

37ng added 4 commits October 27, 2021 14:34

Libraries

0527886

Fix TestEIP1559Transition

6c7f770

Merge commit '6c7f770cc' into tong/sccc

4838c78

Clean up

31129ec

37ng added 2 commits October 27, 2021 15:48

nits

7daf5a0

nit

c01718b

Remove genesis.json

903891d

Make tx_pool consistent with state_transition

3656f66

37ng requested a review from trianglesphere October 27, 2021 22:38

Renaming in ValidateTransactorBalanceCoversTx

5a550be

trianglesphere approved these changes Oct 29, 2021

View reviewed changes

37ng merged commit bb6e70e into trianglesphere/work Oct 29, 2021

37ng deleted the tong/sccc branch October 29, 2021 20:16

Conversation

37ng commented Sep 17, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Background

Use cases

Current

1. In core.tx_pool_context

New

1. In miner.blockState

2. In core.stateProcessor.Process()

Implementation plan

For use case 1: miner.BlockState

For use case 2: core.stateProcessor.Process()

Other changes

Tested

Related issues

Backwards compatibility

Uh oh!

trianglesphere left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

trianglesphere left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

piersy commented Sep 29, 2021

Uh oh!

piersy commented Sep 30, 2021

Uh oh!

piersy commented Oct 4, 2021

Uh oh!

piersy commented Oct 5, 2021

Uh oh!

piersy commented Oct 5, 2021

Uh oh!

piersy commented Oct 19, 2021

Uh oh!

piersy commented Oct 19, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

piersy commented Oct 19, 2021

Uh oh!

trianglesphere left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

piersy commented Oct 27, 2021

Uh oh!

piersy commented Oct 27, 2021

Uh oh!

piersy commented Oct 27, 2021

Uh oh!

piersy commented Oct 27, 2021

Uh oh!

piersy commented Oct 27, 2021

Uh oh!

piersy commented Oct 27, 2021

Uh oh!

trianglesphere left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

37ng commented Sep 17, 2021 •

edited

Loading

1. In `core.tx_pool_context`

1. In `miner.blockState`

2. In `core.stateProcessor.Process()`