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 12 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
110 changes: 77 additions & 33 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.

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 @@ -129,4 +129,10 @@ 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" },
]
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 = { git = "https://github.com/near/wasmer", rev = "f1d5f06a3b42215524290652af52d079da9f5b22", 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 = {git = "https://github.com/near/wasmer", rev = "f1d5f06a3b42215524290652af52d079da9f5b22", 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
9 changes: 8 additions & 1 deletion runtime/near-vm-runner/src/cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ enum ContractCacheKey {
vm_kind: VMKind,
vm_hash: u64,
},
// bump to depreciate bincode/serde-bench based wasmer 0.x cache
Version3 {
ailisp marked this conversation as resolved.
Show resolved Hide resolved
code_hash: CryptoHash,
vm_config_non_crypto_hash: u64,
vm_kind: VMKind,
vm_hash: u64,
},
}

#[derive(Debug, Clone, BorshDeserialize, BorshSerialize)]
Expand All @@ -52,7 +59,7 @@ pub fn get_contract_cache_key(
config: &VMConfig,
) -> CryptoHash {
let _span = tracing::debug_span!(target: "vm", "get_key").entered();
let key = ContractCacheKey::Version2 {
let key = ContractCacheKey::Version3 {
Copy link
Member Author

Choose a reason for hiding this comment

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

@olonho This change invalidated old keys in cache and make it pass the upgradable test. Without this change it fails of deserialization cache failed

Copy link
Member Author

Choose a reason for hiding this comment

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

Also @bowenwang1996

code_hash: code.hash,
vm_config_non_crypto_hash: config.non_crypto_hash(),
vm_kind,
Expand Down
2 changes: 1 addition & 1 deletion runtime/near-vm-runner/src/wasmer_runner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use wasmer_runtime::{ImportObject, Module};
fn check_method(module: &Module, method_name: &str) -> Result<(), VMError> {
let info = module.info();
use wasmer_runtime_core::module::ExportIndex::Func;
if let Some(Func(index)) = info.exports.get(method_name) {
if let Some(Func(index)) = info.exports.map.get(method_name) {
let func = info.func_assoc.get(index.clone()).unwrap();
let sig = info.signatures.get(func.clone()).unwrap();
if sig.params().is_empty() && sig.returns().is_empty() {
Expand Down