Coreth 0.12.4 x apply #720

ceyonur · 2023-07-10T16:25:20Z

Reapplies #716 to #694

…evm into coreth-0.12.4-x-apply

accounts/abi/bind/backends/simulated.go

accounts/abi/bind/backends/simulated_test.go

params/config.go

accounts/abi/bind/template.go

accounts/abi/error.go

ceyonur · 2023-07-14T13:12:41Z

eth/tracers/api_test.go

@@ -493,7 +493,7 @@ func TestTracingWithOverrides(t *testing.T) {
 				},
 			},
 		},
-		GasLimit: params.SubnetEVMDefaultChainConfig.FeeConfig.GasLimit.Uint64(),
+		GasLimit: params.TestChainConfig.FeeConfig.GasLimit.Uint64(),


this should be same with the config provided above

params/config.go

ceyonur · 2023-07-14T13:14:30Z

params/config.go

@@ -264,48 +286,31 @@ func (c ChainConfig) MarshalJSON() ([]byte, error) {

 // Description returns a human-readable description of ChainConfig.
 func (c *ChainConfig) Description() string {
-	// convert nested data structures to json


I specifically skipped those changes as we have a different descripton here (with fee config + network upgrades + precompiles + upgrade config)

plugin/evm/config.go

plugin/evm/vm.go

eth/api.go

eth/gasprice/gasprice_test.go

ceyonur · 2023-07-17T14:40:05Z

core/bench_test.go

@@ -159,16 +158,14 @@ func benchInsertChain(b *testing.B, disk bool, gen func(int, *BlockGen)) {
 	// Generate a chain of b.N blocks using the supplied block
 	// generator function.
 	gspec := &Genesis{
-		Config:   params.TestChainConfig,
-		Alloc:    GenesisAlloc{benchRootAddr: {Balance: benchRootFunds}},
-		GasLimit: params.TestChainConfig.FeeConfig.GasLimit.Uint64(),


We need to specify gas limit here.

ceyonur · 2023-07-17T14:46:21Z

core/rlp_test.go

@@ -50,9 +50,8 @@ func getBlock(transactions int, uncles int, dataSize int) *types.Block {
 		address = crypto.PubkeyToAddress(key.PublicKey)
 		funds   = big.NewInt(50000 * 225000000000 * 200)
 		gspec   = &Genesis{
-			Config:   params.TestChainConfig,
-			Alloc:    GenesisAlloc{address: {Balance: funds}},
-			GasLimit: params.TestChainConfig.FeeConfig.GasLimit.Uint64(),


We probably need this gas limit

If the tests are passing without it I don't know why we should specify it?

hmm seems we never actually run those checks. this still seems wrong to not specify GasLimit. but let's skip this until this starts failing.

darioush · 2023-07-17T15:32:23Z

core/genesis_test.go

 	customg := Genesis{
-		Config: &copyCfg,


this copy seems unnecessary

…evm into coreth-0.12.4-x-apply

darioush · 2023-07-17T16:31:05Z

core/blockchain_test.go

@@ -1110,6 +1109,7 @@ func TestEIP3651(t *testing.T) {
 					Balance: big.NewInt(0),
 				},
 			},
+			GasLimit: params.TestChainConfig.FeeConfig.GasLimit.Uint64(),


I think we should keep the consistent order, Config, Alloc, GasLimit

* apply diff to rc0 * replace coreth with subnet-evm * go mod tidy * remove must commit * remove apricots * replace coreth with subnet-evm * rename banff and cortina * test memory db * add dUpgrade * fix errors * sync with v0.12.4-rc0 * more diffs * change templates * readd preparePredicateSlots * run goimports * readd tx allow list check to txpool * Fix tests * readd subnet evm check for tests * fix tests * add gas limit & coinbase fakers * Fix timestamp types * check error from newblockchain * fix gas limit in simulated genesis * downgrade ci to go 1.19 * gofmt files * rebump go to 1.20 * bump anr to latest * bump anr to latest * prepare predicate storage slots in Subnet-EVM * uncomment tests * change order of airdrop memory cleanup * add utils import * Coreth 0.12.4 x apply (#720) Co-authored-by: Darioush Jalali <[email protected]> * move instruction sets * revert unpack changes * reduce diffs * move genesis verify to vm (#753) * move genesis verify to vm * fix comment * set a correct default from genesis * fix log * revert change to vm.go --------- Co-authored-by: Darioush Jalali <[email protected]> * avoid adding/removing GasLimits in tests (#755) * move genesis verify to vm * fix comment * set a correct default from genesis * fix log * revert change to vm.go * avoid adding/removing GasLimits in tests * nit --------- Co-authored-by: Ceyhun Onur <[email protected]> --------- Co-authored-by: Darioush Jalali <[email protected]>

* Rename test_ to step_ for clarity (ava-labs#636) * Codeowners fix (specific dir overrides global) (ava-labs#639) * rename state upgrade test (ava-labs#641) * plugin/evm: fix godoc typo (ava-labs#647) Signed-off-by: Gyuho Lee <[email protected]> * plugin/evm: remove unncessary tx.Hash op in map iter (ava-labs#648) Signed-off-by: Gyuho Lee <[email protected]> * deployExampleRewardManager.ts hardhat script fixed (ava-labs#650) * Migrate HardHat tests to DS-tests (Solidity tests) (ava-labs#601) * Increase trie dirty default cache size to 512MB (ava-labs#656) * export gingkgo suites (ava-labs#659) * export gingkgo suites * remove precompiles description from ping tests * update package.json * fix url in package json * change package name * Publish npm module for contract-examples (ava-labs#663) * export gingkgo suites * remove precompiles description from ping tests * update package.json * fix url in package json * change package name * prepare for module publishing * use npm ci * preload ethers * nits * Fix broken path to docs in README. (ava-labs#665) * Fix contract examples package json (ava-labs#672) * rename contract-examples to contracts & fix pack issue * allow custom CMD to be run on blockchains for e2e tests * move default hardhat test to utils * fix comment * add more comments * change folder reference * Bump got and ethereum-waffle in /contracts (ava-labs#680) Removes [got](https://github.com/sindresorhus/got). It's no longer used after updating ancestor dependency [ethereum-waffle](https://github.com/EthWorks/Waffle). These dependencies need to be updated together. Removes `got` Updates `ethereum-waffle` from 3.4.4 to 4.0.10 - [Release notes](https://github.com/EthWorks/Waffle/releases) - [Commits](https://github.com/EthWorks/Waffle/compare/[email protected]@4.0.10) --- updated-dependencies: - dependency-name: got dependency-type: indirect - dependency-name: ethereum-waffle dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump flat and hardhat in /contracts (ava-labs#679) Bumps [flat](https://github.com/hughsk/flat) to 5.0.2 and updates ancestor dependency [hardhat](https://github.com/nomiclabs/hardhat). These dependencies need to be updated together. Updates `flat` from 4.1.1 to 5.0.2 - [Commits](hughsk/flat@4.1.1...5.0.2) Updates `hardhat` from 2.6.1 to 2.15.0 - [Release notes](https://github.com/nomiclabs/hardhat/releases) - [Commits](https://github.com/nomiclabs/hardhat/compare/[email protected]) --- updated-dependencies: - dependency-name: flat dependency-type: indirect - dependency-name: hardhat dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix core benchmarks (ava-labs#697) * remove unused line in test (ava-labs#695) * bump version to v0.5.2 (ava-labs#681) * bump version to v0.5.2 * downgrade avalanchego to 1.10.2 * update compatibility * Remove unused ethereum-waffle and ethereumjs-tx pkgs (ava-labs#685) * move state upgrade related functions to own file (ava-labs#684) * Update load test to use ANR for network setup (ava-labs#579) * Update load test to use ANR for network setup * Remove ToWebsocketURI that relies on strings feature added in go1.20 * Update load test to use ENV var from CI if populated * Move env var logic into NewDefaultANRConfig * Add init functions and clean up comments * Remove unnecessary helper * Remove unneeded cmd * Cleanup * Address PR comments * Move 2 min timeout for SetupNetwork to the start of the function * Turn list of txs into tx sequence (ava-labs#683) * Turn list of txs into tx sequence * Add agent comments * Remove unused code and address comments * add some more comments * address more comments' * lint * Remove :::warning --------- Co-authored-by: Anusha <[email protected]> * Minor simulator fixes (ava-labs#703) * add benchmark to template (ava-labs#705) * add benchmark to template * fix comment * Add metrics for gas price / usage (ava-labs#700) Co-authored-by: aaronbuchwald <[email protected]> * added config setting to prune warpdb (ava-labs#702) * added config setting to prune warpdb * refactored warp prune uint test * message * fixed up nits * fixed nits * fixed nits * Update plugin/evm/config.go * Add wrapped validator state for primary to subnet warp messages (ava-labs#708) * Add wrapped validator state for primary to subnet warp message verification * Address PR comment * upload network runner artifact after e2e test run (ava-labs#709) * Differentiate mandatory/optional Subnet-EVM Network Upgrades (ava-labs#640) * remove network upgrades from upgrade configs and enforce them in vm init * fix tests * remove unused var * remove extra shutdown * copy test chain config when modify * use SimulatedTestChainConfig for simulated tests * copy modified test chain config * add optional upgrades * Add tests * fix comments * use unmarshal in test * unexport functions * add commented out test * add TODO comment * add blockchain.Stop as defer to test (ava-labs#714) Co-authered-by: najeal <[email protected]> Co-authored-by: Ceyhun Onur <[email protected]> * Add support for predicate gas into IntrinsicGas (ava-labs#713) * Add support for predicate gas * Address review * Fix test and add test for PredicateGas * Address comments * Add signature aggregation helpers (ava-labs#711) * Add signature aggregation helpers * Fix * Move WarpQuorumDenominator into new file * Address comments * fix var rename * Improve comments * Address comments * Add predicate packing helper (ava-labs#710) * Add predicate packing helper * move predicate code and add readme * fix moved import * fix merge * Run ginkgo precompile tests in parallel (ava-labs#712) Use SynchronizedBeforeSuite to create the node and all the subnet that are needed to run tests. Pass the blockchainID to each work processor and run the tests in parallel to reduce runtime * Fix BlockContext comment (ava-labs#731) * precompile accepter should take logIdx (ava-labs#728) * precompile accepter should take logIdx * minimize mock * copyright yr * add comments * Improve tests (ava-labs#733) Improve tests based on feedback from ava-labs#712 * Fix precompile test gen template (ava-labs#737) * fix Benchmark * fix spelling/references in Benchmark * Clean up gossip (ava-labs#744) * Remove call from precompile (ava-labs#748) * Fix nil types tmpl (ava-labs#751) * add more nil types and fix int types * readd hash type * remove convertToNil * Sync coreth v0.12.4 rc0 (ava-labs#694) * apply diff to rc0 * replace coreth with subnet-evm * go mod tidy * remove must commit * remove apricots * replace coreth with subnet-evm * rename banff and cortina * test memory db * add dUpgrade * fix errors * sync with v0.12.4-rc0 * more diffs * change templates * readd preparePredicateSlots * run goimports * readd tx allow list check to txpool * Fix tests * readd subnet evm check for tests * fix tests * add gas limit & coinbase fakers * Fix timestamp types * check error from newblockchain * fix gas limit in simulated genesis * downgrade ci to go 1.19 * gofmt files * rebump go to 1.20 * bump anr to latest * bump anr to latest * prepare predicate storage slots in Subnet-EVM * uncomment tests * change order of airdrop memory cleanup * add utils import * Coreth 0.12.4 x apply (ava-labs#720) Co-authored-by: Darioush Jalali <[email protected]> * move instruction sets * revert unpack changes * reduce diffs * move genesis verify to vm (ava-labs#753) * move genesis verify to vm * fix comment * set a correct default from genesis * fix log * revert change to vm.go --------- Co-authored-by: Darioush Jalali <[email protected]> * avoid adding/removing GasLimits in tests (ava-labs#755) * move genesis verify to vm * fix comment * set a correct default from genesis * fix log * revert change to vm.go * avoid adding/removing GasLimits in tests * nit --------- Co-authored-by: Ceyhun Onur <[email protected]> --------- Co-authored-by: Darioush Jalali <[email protected]> * Bump avalanchego to v1.10.5 and bump Subnet-EVM for v0.5.3 release (ava-labs#757) * Bump avalanchego to v1.10.5 and bump Subnet-EVM for v0.5.3 release * bump anr version to v1.7.1 * Migrate ABI unpack fix (ava-labs#750) * change sprintf verb and use values (ava-labs#760) * Generalize precompile test suite (ava-labs#759) * restore old functions, generalize paths in sync subnet creation * add subnet suit struct and methods * move constants * fix reviews * add comment * Update subnet.go Signed-off-by: Ceyhun Onur <[email protected]> --------- Signed-off-by: Ceyhun Onur <[email protected]> * Add warp contract implementation (ava-labs#718) * Add warp contract implementation * Cleanup predicate test * Fix new function signature * Replace invalid fuzz test with unit test * Add chain config to enable warp API for warp e2e test * remove unused var * Add experimental warning and move warp precompile to x/ package * fix warning label * Fix warning * vm test nits * Improve sendWarpMessenger sol comment * more vm warp test nits * Move warp params into params package * More vm warp test nits * Address more PR comments * Remove triggerTx2 * Add check for expected topics from sendWarpMessage log * Fix config test * Fix incorrect replace * remove unnecessary echo * Address comments * Address comments * Address PR comments * Improve comments * Convert [32]byte type to common.Hash * Add base cost for getVerifiedWarpMessage * fix require equal type check * Fix updated awm message format * Update warp message format * Move IWarpMessenger.sol to interfaces/ * Add newline to warp genesis * uncomment assertion * Fix broken links in README * Add metrics to simulator (ava-labs#706) * add tps * get block build metrics * Add issuance time, confirmed time, issued-> acceptance time, verify time * Log times at end of batch * cleaner * address comments * remove unused code block * avoids taking len of channel * nits * pass in stringID * move to loader * remove unused field * revert file back * cleaner * lint * make it work for ws or for rpc * protect * endpoint * no return on defer * sep to a funciton * have blockchainidstr passed in * typo * pass in metrics through config * address comments * address more comments and edit err policy of metrics functions * add more logging to load_test * typo * better check * fix endpoints * typo: * individual * histogram * address feedback: * remove metrics from default * address comments * simplify time metrics * better explanation * address comments * address comments * cleanup * more cleanup * rename vars for clarity * ws * cleanup * address comments * ws * expose metrics add flag * fix blocking issue of http server and gracefully stop it * cleanup * use constant * add issuance to confirmation metrics * ws * simplify metrics server * Bump avalanchego to v1.10.5 and bump Subnet-EVM for v0.5.3 release (ava-labs#757) * Bump avalanchego to v1.10.5 and bump Subnet-EVM for v0.5.3 release * bump anr version to v1.7.1 * handle control c * print out output * clean up * clean up * remove go routines to close client * address comments * memory leak * fix * print * e2e test: connect to appropriate chain (ava-labs#771) * Bump avalanchego dep and update version for next release (ava-labs#770) * Bump avalanchego dep and update version for next release * Update cache sizes * Update flag in run script to replace staking-enabled=false * Update block builder to enforce predicate one tx at a time (ava-labs#773) * Update block builder to enforce predicate one tx at a time * remove dead code * Update miner/worker.go Co-authored-by: Darioush Jalali <[email protected]> Signed-off-by: aaronbuchwald <[email protected]> --------- Signed-off-by: aaronbuchwald <[email protected]> Co-authored-by: Darioush Jalali <[email protected]> * update iocorders address * remove state-sync-enabled from chain config * 1s block ticker * flush hubbleFeed when len > 512 * fix compilation err --------- Signed-off-by: Gyuho Lee <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Ceyhun Onur <[email protected]> Signed-off-by: aaronbuchwald <[email protected]> Co-authored-by: Richard Pringle <[email protected]> Co-authored-by: Darioush Jalali <[email protected]> Co-authored-by: Ceyhun Onur <[email protected]> Co-authored-by: Gyuho Lee <[email protected]> Co-authored-by: İzzet Emre Demir <[email protected]> Co-authored-by: aaronbuchwald <[email protected]> Co-authored-by: Gabriel Cardona <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Anusha <[email protected]> Co-authored-by: Cesar <[email protected]> Co-authored-by: morrisettjohn <[email protected]> Co-authored-by: nathan haim <[email protected]> Co-authored-by: Martin Eckardt <[email protected]> Co-authored-by: rodrigo <[email protected]> Co-authored-by: Anusha <[email protected]>

darioush and others added 8 commits July 6, 2023 13:52

ethdb/

72e686e

core/rawdb

8bc5df0

trie/

faea3b4

core/state

d9ef710

the rest

783606c

reduce diff

9f83a66

Merge branch 'sync-coreth-v0.12.4-rc0' into tmp-x

917b292

reapply review branch

80bdf9f

ceyonur changed the base branch from master to sync-coreth-v0.12.4-rc0 July 10, 2023 16:25

ceyonur marked this pull request as ready for review July 10, 2023 16:51

ceyonur requested review from anusha-ctrl, darioush and aaronbuchwald as code owners July 10, 2023 16:51

ceyonur and others added 4 commits July 10, 2023 20:00

revert ci changes

6b133d0

minimize diff

799f5c1

Merge branch 'sync-coreth-v0.12.4-rc0' of github.com:ava-labs/subnet-…

5d60780

…evm into coreth-0.12.4-x-apply

reduce diff

f79fced

darioush marked this pull request as draft July 10, 2023 18:44

ceyonur commented Jul 14, 2023

View reviewed changes

darioush added 5 commits July 14, 2023 10:07

minimize some diffs

b0d3c4c

remove statesync default

eb7d162

reduce diff

d574e75

reduce diff

e883922

minimize diff

aa54388

ceyonur commented Jul 17, 2023

View reviewed changes

eth/api.go Show resolved Hide resolved

ceyonur commented Jul 17, 2023

View reviewed changes

darioush added 2 commits July 17, 2023 08:31

genesis check fees for SubnetEVM enabled only

47c2bee

fix

821e3f8

darioush reviewed Jul 17, 2023

View reviewed changes

core/genesis_test.go

customg := Genesis{

Config: &copyCfg,

Copy link

Collaborator

darioush Jul 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this copy seems unnecessary

darioush added 5 commits July 17, 2023 08:35

Merge branch 'sync-coreth-v0.12.4-rc0' of github.com:ava-labs/subnet-…

a10a185

…evm into coreth-0.12.4-x-apply

reduce diff

c5a2ea0

reduce diff

d1c41a2

minimize diffs

4f4a6fd

avoid renaming geth forks in comments

a8fe9ff

darioush reviewed Jul 17, 2023

View reviewed changes

ceyonur marked this pull request as ready for review July 17, 2023 17:22

ceyonur added 2 commits July 18, 2023 09:08

Coreth 0.12.4 x apply rev (#736)

c0c694f

Merge branch 'sync-coreth-v0.12.4-rc0' into coreth-0.12.4-x-apply

af0c33f

darioush merged commit 2b6cd7e into sync-coreth-v0.12.4-rc0 Jul 21, 2023

darioush deleted the coreth-0.12.4-x-apply branch July 21, 2023 15:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Coreth 0.12.4 x apply #720

Coreth 0.12.4 x apply #720

ceyonur commented Jul 10, 2023

ceyonur Jul 14, 2023

ceyonur Jul 14, 2023

ceyonur Jul 17, 2023

ceyonur Jul 17, 2023

darioush Jul 17, 2023

ceyonur Jul 17, 2023

darioush Jul 17, 2023

darioush Jul 17, 2023

Coreth 0.12.4 x apply #720

Coreth 0.12.4 x apply #720

Conversation

ceyonur commented Jul 10, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment