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.

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

Bump wasmer #8323

Closed
wants to merge 104 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
a3363f0
bump wasmer to a version with finite-wasm enabled
invalid-email-address Nov 25, 2022
4d565dd
remove pwasm-utils-based instrumentation
Ekleog-NEAR Jan 4, 2023
aba0e65
make VMLogic API consistent
Ekleog-NEAR Jan 6, 2023
94466cd
fix deprecation warnings from chrono, replacing with previous impl
Ekleog-NEAR Jan 6, 2023
442cc00
update the expect strings, disable testing for wasmer0/wasmtime that …
Ekleog-NEAR Jan 6, 2023
fdceb8b
fix gas amounts
Ekleog-NEAR Jan 9, 2023
92f8711
make tests pass
Ekleog-NEAR Jan 10, 2023
0721823
make a protocol change for the wasmer bump
Ekleog-NEAR Jan 17, 2023
8e4317e
adjust to latest wasmer
Ekleog-NEAR Feb 2, 2023
917b870
cargo fmt
Ekleog-NEAR Feb 2, 2023
4ca05b7
Bump wasmer to latest near-main
Ekleog-NEAR Feb 10, 2023
28e6690
vendor wasmer into nearcore
Ekleog-NEAR Feb 10, 2023
091220a
wip
Ekleog-NEAR Feb 10, 2023
4f7772e
Remove things that have no reason to stay now near-vm is vendored in …
Ekleog-NEAR Feb 15, 2023
773695f
Merge the two workspaces
Ekleog-NEAR Feb 15, 2023
58b6672
Fix tests building
Ekleog-NEAR Feb 15, 2023
5699dfd
Set stack limit properly
Ekleog-NEAR Feb 15, 2023
33bf680
Investigate test failure
Ekleog-NEAR Feb 15, 2023
031908f
Fix integration tests
Ekleog-NEAR Feb 15, 2023
904bfd7
cargo fmt
Ekleog-NEAR Feb 15, 2023
3d686eb
Implement proper stack frame size accounting
Ekleog-NEAR Feb 15, 2023
1fd914f
Fix sanity check now that we have proper instrumentation
Ekleog-NEAR Feb 15, 2023
0235e30
Also accept cargo-insta snapshot changes to gas costs
Ekleog-NEAR Feb 15, 2023
bb6b607
Accept more insta snapshot changes
Ekleog-NEAR Feb 15, 2023
2a2374b
Set max stack size to twice what it was with pwasm-utils; fix the las…
Ekleog-NEAR Feb 17, 2023
229afe2
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Feb 21, 2023
b9fde88
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Mar 7, 2023
e9aee79
prepare: split out preparation code into separate files
nagisa Jan 31, 2023
5912044
fix tests
Ekleog-NEAR Mar 8, 2023
93b5811
deps: add dependency on finite-wasm, upgrade wasmtime
nagisa Feb 2, 2023
22c609c
prepare: add skeleton for v2 preparation code
nagisa Feb 3, 2023
651f7d6
prepare_v2: skeleton for the preparation code
nagisa Feb 3, 2023
e56a050
fix build
Ekleog-NEAR Mar 8, 2023
acfc3af
fix tests
Ekleog-NEAR Mar 8, 2023
a353762
fixup needed changes, near-vm-runner tests pass
Ekleog-NEAR Mar 9, 2023
13b987c
wip
Ekleog-NEAR Mar 10, 2023
6e88603
fix some more tests
Ekleog-NEAR Mar 13, 2023
2510451
rename wasmer-* crates into near-vm-* crates for near-vm
Ekleog-NEAR Mar 13, 2023
b59ef06
take finite-wasm from workspace for near-vm
Ekleog-NEAR Mar 13, 2023
4291ee9
implement the missing finite-wasm functions for non-near-vm
Ekleog-NEAR Mar 16, 2023
905e667
handle nagisa’s review comments
Ekleog-NEAR Mar 16, 2023
0dbdfa3
re-enable all tests and fix all remaining test failures
Ekleog-NEAR Mar 17, 2023
f737c36
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Mar 17, 2023
468be11
stop requiring finite-wasm#42
Ekleog-NEAR Mar 20, 2023
67f276f
handle review comments
Ekleog-NEAR Mar 20, 2023
d8e374e
ignore unused argument
Ekleog-NEAR Mar 20, 2023
670efc6
introduce fuzzers for v2 prep
Ekleog-NEAR Mar 21, 2023
bcc0dc4
fix ci build
Ekleog-NEAR Mar 21, 2023
819d52e
remove tests that no longer make sense now the gas intrinsic is a no-op
Ekleog-NEAR Mar 21, 2023
ebef7bc
fix expect tests from ci
Ekleog-NEAR Mar 21, 2023
3deda8b
fix sanity checks
Ekleog-NEAR Mar 23, 2023
b0aed9a
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Mar 24, 2023
b2c3f01
do not publish near-vm crates
Ekleog-NEAR Mar 24, 2023
d862138
fix sanity checks
Ekleog-NEAR Mar 24, 2023
7b735d4
remove versions from path-local dependencies
Ekleog-NEAR Mar 24, 2023
4b03a0c
bump bolero in near-vm
Ekleog-NEAR Mar 24, 2023
3309152
use a recent wasm-smith for near-vm’s fuzzer
Ekleog-NEAR Mar 24, 2023
61e5fd5
use a recent wast in near-vm’s tests
Ekleog-NEAR Mar 24, 2023
81a5efd
update cargo.lock
Ekleog-NEAR Mar 24, 2023
8d9d234
remove core feature of near-vm-types
Ekleog-NEAR Mar 24, 2023
4b3cf10
ignore wasm-encoder duplication
Ekleog-NEAR Mar 24, 2023
08d511f
fix cargo deny
Ekleog-NEAR Mar 24, 2023
c8c4abc
remove no-longer-existing pay_wasm_gas function call
Ekleog-NEAR Mar 24, 2023
b415228
remove core feature of near-vm-compiler
Ekleog-NEAR Mar 24, 2023
dd0fe86
remove core feature of compiler-singlepass
Ekleog-NEAR Mar 24, 2023
f448c78
remove the fuzzers for now
Ekleog-NEAR Mar 24, 2023
8d0864c
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Mar 24, 2023
1e1c439
fix clippy lints
Ekleog-NEAR Mar 24, 2023
b07d3c5
cargo fmt
Ekleog-NEAR Mar 24, 2023
73c353b
fix clippy lints
Ekleog-NEAR Mar 24, 2023
0004936
accept cargo insta change
Ekleog-NEAR Mar 24, 2023
ad68f92
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Mar 28, 2023
547f9a3
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Mar 29, 2023
ab84b5d
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Mar 29, 2023
67ebaad
fix merge conflict mishap
Ekleog-NEAR Mar 29, 2023
0a707ae
adjust to change in InstanceConfig api
Ekleog-NEAR Mar 29, 2023
b492ee9
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Mar 30, 2023
f3f0752
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Mar 30, 2023
d56259c
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Mar 31, 2023
6f16b55
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Mar 31, 2023
7ada83f
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Apr 3, 2023
91d699b
remove meaningless changes
Ekleog-NEAR Apr 3, 2023
3ca03fc
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Apr 3, 2023
6ca0360
remove duplicate deps
Ekleog-NEAR Apr 3, 2023
b95e453
fix dep definition
Ekleog-NEAR Apr 3, 2023
6e11257
remove duplicate test introduced by merge
Ekleog-NEAR Apr 4, 2023
cc27981
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Apr 4, 2023
a1dae61
remove no-longer-needed snaps
Ekleog-NEAR Apr 4, 2023
8532791
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Apr 5, 2023
7fbb029
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Apr 5, 2023
42f3c74
fix merge mistake
Ekleog-NEAR Apr 5, 2023
e6e8db5
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Apr 6, 2023
7565f25
also test near-vm as soon as protocol upgrade is done
Ekleog-NEAR Apr 7, 2023
02476a2
fix merge conflict
Ekleog-NEAR Apr 7, 2023
da17009
discard pointless failing test
Ekleog-NEAR Apr 7, 2023
bc33889
fix build
Ekleog-NEAR Apr 7, 2023
d743026
run near-vm in with_vm_variants
Ekleog-NEAR Apr 7, 2023
5ce42b9
fix typo
Ekleog-NEAR Apr 10, 2023
db17b59
fix test
Ekleog-NEAR Apr 10, 2023
111ef0b
add some traces
Ekleog-NEAR Apr 10, 2023
ceed403
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Apr 13, 2023
1637628
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Apr 13, 2023
b0cf7a3
Merge remote-tracking branch 'upstream/master' into wasmer-bump
Ekleog-NEAR Apr 25, 2023
e133a46
fix merge mistake
Ekleog-NEAR Apr 25, 2023
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
131 changes: 54 additions & 77 deletions Cargo.lock

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

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ elastic-array = "0.11"
enum-map = "2.1.0"
enumset = "1.0"
expect-test = "1.3.0"
finite-wasm = "0.3.0"
finite-wasm = { version = "0.3.1", features = ["instrument"] }
flate2 = "1.0.22"
fs2 = "0.4"
futures = "0.3.5"
Expand Down Expand Up @@ -299,8 +299,8 @@ tracing-subscriber = { version = "0.3.15", features = ["env-filter", "fmt", "reg
trybuild = "1.0.11"
turn = "0.6"
validator = "0.12"
wasm-encoder = "0.11.0"
wasm-smith = "0.10"
wasm-encoder = "0.22.0"
wasm-smith = "0.12.0"
wasmer-compiler = { package = "wasmer-compiler-near", version = "=2.4.0" }
wasmer-compiler-singlepass = { package = "wasmer-compiler-singlepass-near", version = "=2.4.0" }
wasmer-engine = { package = "wasmer-engine-near", version = "=2.4.0" }
Expand All @@ -309,9 +309,9 @@ wasmer-runtime = { version = "0.18.0", package = "wasmer-runtime-near", features
wasmer-runtime-core = { version = "0.18.2", package = "wasmer-runtime-core-near" }
wasmer-types = { package = "wasmer-types-near", version = "=2.4.0" }
wasmer-vm = { package = "wasmer-vm-near", version = "=2.4.0" }
wasmparser = "0.78" # TODO: unify at least the versions of wasmparser we have in our codebase
wasmparser = "0.99.0" # TODO: unify at least the versions of wasmparser we have in our codebase
wasmprinter = "0.2"
wasmtime = { version = "4.0.0", default-features = false, features = ["cranelift"] }
wasmtime = { version = "5.0.0", default-features = false, features = ["cranelift"] }
wast = "40.0"
wat = "1.0.40"
webrtc-util = "0.7"
Expand Down
4 changes: 2 additions & 2 deletions chain/chain/src/chain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3867,8 +3867,8 @@ impl Chain {
&transaction.transaction.block_hash,
transaction_validity_period,
)
.map_err(|_| {
tracing::warn!("Invalid Transactions for mock node");
.map_err(|err| {
tracing::warn!(?err, "Invalid Transactions for mock node");
Error::from(Error::InvalidTransactions)
})?;
}
Expand Down
1 change: 1 addition & 0 deletions core/primitives-core/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ pub struct VMLimitConfig {
pub contract_prepare_version: ContractPrepareVersion,

/// The initial number of memory pages.
///
/// NOTE: It's not a limiter itself, but it's a value we use for initial_memory_pages.
pub initial_memory_pages: u32,
/// What is the maximal memory pages amount is allowed to have for a contract.
Expand Down
Loading