Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(runtime): borsh deserialized wasmer 0.x #4448

Merged
merged 23 commits into from
Jul 26, 2021
Merged

feat(runtime): borsh deserialized wasmer 0.x #4448

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
fa29af4
bump to borsh 0.9 for usize
ailisp Jul 1, 2021
0893b94
fix cargo check
ailisp Jul 1, 2021
24caca7
fix cargo deny
ailisp Jul 1, 2021
ada1266
backward compatible deserialize
ailisp Jul 1, 2021
91b2f85
borsh deser only
ailisp Jul 2, 2021
5245b5a
cargo.lock
ailisp Jul 2, 2021
c9fc7cd
Merge branch 'master' into use-borsh-deser-wasmer0
ailisp Jul 2, 2021
538dc0e
invalidate old bincode based cache by bump cache version
ailisp Jul 2, 2021
c79fe6e
use borsh 0.8.1
ailisp Jul 6, 2021
606efdd
merge master
ailisp Jul 6, 2021
5f0fb45
cargo.lock
ailisp Jul 6, 2021
f9e51f7
Merge branch 'master' into use-borsh-deser-wasmer0
ailisp Jul 8, 2021
3f55c88
use wasmer-near 0.18.0, migrations
ailisp Jul 9, 2021
da5d0d3
cargo lock
ailisp Jul 9, 2021
d8cfe26
Merge branch 'use-borsh-deser-wasmer0' of github.com:near/nearcore in…
ailisp Jul 9, 2021
0dea3db
merge master
ailisp Jul 9, 2021
3bf942f
Merge branch 'master' into use-borsh-deser-wasmer0
ailisp Jul 12, 2021
2bb876f
resolve conflict
ailisp Jul 22, 2021
fb8efdf
wasmer near 0.18.0
ailisp Jul 22, 2021
10beb9b
assert call deserialized contract also success
ailisp Jul 26, 2021
0b18cb2
0.18.1
ailisp Jul 26, 2021
5f8a57e
Merge branch 'master' into use-borsh-deser-wasmer0
ailisp Jul 26, 2021
8a09bce
Merge branch 'master' into use-borsh-deser-wasmer0
matklad Jul 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 79 additions & 32 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion core/primitives/src/version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub struct Version {
pub type DbVersion = u32;

/// Current version of the database.
pub const DB_VERSION: DbVersion = 23;
pub const DB_VERSION: DbVersion = 24;

/// Protocol version type.
pub use near_primitives_core::types::ProtocolVersion;
Expand Down
9 changes: 9 additions & 0 deletions core/store/src/migrations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,15 @@ pub fn migrate_21_to_22(path: &String) {
set_store_version(&store, 22);
}

pub fn migrate_23_to_24(path: &String) {
let store = create_store(path);
let mut store_update = store.store_update();
store_update.delete_all(DBCol::ColCachedContractCode);
store_update.commit().unwrap();

set_store_version(&store, 24);
}
Copy link
Contributor

@matklad matklad Jul 26, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

I think it's fine to just completely bust the precompilation cache at this time, as we haven't yet deployed compilation on contract deployment to the main net, and the code is written in such a way that empty cache causes slowdowns, rather then errors, so testnet should be fine.

That is, it's fine to land this without tackling #4473 first. @bowenwang1996 please veto this if I am mistaken in my assumptions here.

You've already approved this, so I'll auto-merge, but wanted to call this out just in case.


#[cfg(feature = "protocol_feature_block_header_v3")]
pub fn migrate_18_to_new_validator_stake(store: &Store) {
use near_primitives::epoch_manager::block_info::{BlockInfo, BlockInfoV1};
Expand Down
6 changes: 6 additions & 0 deletions deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,12 @@ skip = [
# hashbrown uses an older version
{ name = "ahash", version = "=0.4.7" },

# zeropool-bn use borsh 0.8.1
{ name = "borsh", version = "=0.8.1" },
{ name = "borsh-derive", version = "=0.8.1" },
{ name = "borsh-derive-internal", version = "=0.8.1" },
{ name = "borsh-schema-derive-internal", version = "=0.8.1" },

# rocksdb (transitively through clang-sys) uses this as a build
# dependency which conflicts with 0.6.7 that wasmer-engine-native
# uses.
Expand Down
7 changes: 6 additions & 1 deletion nearcore/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ pub use crate::runtime::NightshadeRuntime;
use near_store::migrations::{
fill_col_outcomes_by_hash, fill_col_transaction_refcount, get_store_version, migrate_10_to_11,
migrate_11_to_12, migrate_13_to_14, migrate_14_to_15, migrate_17_to_18, migrate_21_to_22,
migrate_6_to_7, migrate_7_to_8, migrate_8_to_9, migrate_9_to_10, set_store_version,
migrate_23_to_24, migrate_6_to_7, migrate_7_to_8, migrate_8_to_9, migrate_9_to_10,
set_store_version,
};

#[cfg(feature = "protocol_feature_block_header_v3")]
Expand Down Expand Up @@ -215,6 +216,10 @@ pub fn apply_store_migrations(path: &String, near_config: &NearConfig) {
info!(target: "near", "Migrate DB from version 22 to 23");
migrate_22_to_23(&path, &near_config);
}
if db_version <= 23 {
info!(target: "near", "Migrate DB from version 23 to 24");
migrate_23_to_24(&path);
}
#[cfg(feature = "nightly_protocol")]
{
let store = create_store(&path);
Expand Down
4 changes: 2 additions & 2 deletions runtime/near-vm-runner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ This crate implements the specification of the interface that Near blockchain ex
[dependencies]
borsh = "0.8.1"
serde = { version = "1", features = ["derive"] }
wasmer-runtime = { version="0.17.1", features = ["default-backend-singlepass"], default-features = false, package = "wasmer-runtime-near", optional = true }
wasmer-runtime = { version = "0.18.0-pre.1", features = ["default-backend-singlepass"], default-features = false, package = "wasmer-runtime-near", optional = true }
# Always used even for wasmer 1.0 for validating wasm, will be replaced when refactor prepare.rs
wasmer-runtime-core = {version = "0.17.4", package = "wasmer-runtime-core-near" }
wasmer-runtime-core = { version = "0.18.0-pre.1", package = "wasmer-runtime-core-near" }
wasmer = { version = "1.0.2", optional = true }
wasmer-types = { version = "1.0.2", optional = true }
wasmer-compiler-singlepass = { version = "1.0.2", optional = true, default-features = false, features = ["std", "enable-serde"] } # disable `rayon` feature.
Expand Down
Loading