Skip to content

Commit

Permalink
Merge branch 'feat-2.0' into new-execution-engine
Browse files Browse the repository at this point in the history
 Conflicts:
	Cargo.lock
	binary_port/src/error_code.rs
	execution_engine/src/engine_state/mod.rs
	execution_engine/src/engine_state/wasm_v1.rs
	execution_engine/src/lib.rs
	execution_engine_testing/tests/src/test/contract_api/add_contract_version.rs
	node/src/components/block_validator/state.rs
	node/src/components/contract_runtime/error.rs
	node/src/components/contract_runtime/operations.rs
	node/src/components/contract_runtime/types.rs
	node/src/components/transaction_acceptor.rs
	node/src/components/transaction_acceptor/tests.rs
	node/src/reactor/main_reactor/tests/transactions.rs
	node/src/types/appendable_block.rs
	node/src/types/block/block_payload.rs
	node/src/types/transaction/transaction_footprint.rs
	node/src/utils/specimen.rs
	resources/production/chainspec.toml
	resources/test/sse_data_schema.json
	storage/src/data_access_layer/mint.rs
	storage/src/lib.rs
	storage/src/system/runtime_native.rs
	storage/src/system/transfer.rs
	storage/src/tracking_copy/mod.rs
	types/src/addressable_entity/entry_points.rs
	types/src/block/block_body/block_body_v2.rs
	types/src/block/block_v2.rs
	types/src/block/test_block_builder/test_block_v2_builder.rs
	types/src/chainspec.rs
	types/src/chainspec/transaction_config.rs
	types/src/chainspec/transaction_config/transaction_v1_config.rs
	types/src/gens.rs
	types/src/lib.rs
	types/src/transaction.rs
	types/src/transaction/deploy.rs
	types/src/transaction/transaction_target.rs
	types/src/transaction/transaction_v1.rs
	types/src/transaction/transaction_v1/arg_handling.rs
	types/src/transaction/transaction_v1/errors_v1.rs
	types/src/transaction/transaction_v1/transaction_v1_body.rs
	types/src/transaction/transaction_v1/transaction_v1_builder.rs
	types/src/transaction/transaction_v1/transaction_v1_header.rs
	types/src/transaction/transaction_v1/transaction_v1_lane.rs
  • Loading branch information
mpapierski committed Oct 29, 2024
2 parents 4c578c5 + 9669f5b commit d38dc74
Show file tree
Hide file tree
Showing 298 changed files with 9,642 additions and 6,991 deletions.
126 changes: 88 additions & 38 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d38dc74

Please sign in to comment.