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

chore: updates near-* dependencies to 0.27 release #1254

Merged
merged 5 commits into from
Nov 14, 2024
Merged

chore: updates near-* dependencies to 0.27 release #1254

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f1cde88
chore!: updates near-* dependencies to 0.27 release
akorchyn Nov 12, 2024
6ac7d21
bump up rust as near-crypto doesn't support 1.79 anymore
akorchyn Nov 12, 2024
133a891
update to workflow file
akorchyn Nov 12, 2024
389d2f4
updated readme with minimum supported version
akorchyn Nov 13, 2024
c303874
typo
akorchyn Nov 13, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
matrix:
platform:
- os: ubuntu-latest
rs: 1.79
rs: 1.80.0
akorchyn marked this conversation as resolved.
Show resolved Hide resolved
- os: ubuntu-latest
rs: stable
- os: macos-latest
rs: 1.79
rs: 1.80.0
- os: macos-latest
rs: stable
features: ['', '--features unstable,legacy,__abi-generate']
Expand Down
10 changes: 5 additions & 5 deletions near-sdk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ schemars = { version = "0.8.8", optional = true }
near-abi = { version = "0.4.0", features = [
"__chunked-entries",
], optional = true }
near-vm-runner = { version = "0.26", optional = true }
near-primitives-core = { version = "0.26", optional = true }
near-primitives = { version = "0.26", optional = true }
near-crypto = { version = "0.26", default-features = false, optional = true }
near-parameters = { version = "0.26", optional = true }
near-vm-runner = { version = "0.27", optional = true }
near-primitives-core = { version = "0.27", optional = true }
near-primitives = { version = "0.27", optional = true }
near-crypto = { version = "0.27", default-features = false, optional = true }
near-parameters = { version = "0.27", optional = true }

[dev-dependencies]
near-sdk = { path = ".", features = ["legacy", "unit-testing"] }
Expand Down
6 changes: 4 additions & 2 deletions near-sdk/src/environment/mock/mocked_blockchain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ struct LogicFixture {
ext: Box<MockedExternal>,
fees_config: Arc<RuntimeFeesConfig>,
context: Box<near_vm_runner::logic::VMContext>,
memory: Box<dyn MemoryLike>,
}

impl<Memory> MockedBlockchain<Memory>
Expand Down Expand Up @@ -88,16 +89,17 @@ where
let fees_config = Arc::new(fees_config);
let result_state =
ExecutionResultState::new(&context, context.make_gas_counter(&config), config.clone());
let memory = Box::new(memory.unwrap_or_default());

let mut logic_fixture = LogicFixture { ext, context, fees_config };
let mut logic_fixture = LogicFixture { ext, context, fees_config, memory };

let logic = unsafe {
VMLogic::new(
&mut *(logic_fixture.ext.as_mut() as *mut dyn External),
&*(logic_fixture.context.as_mut() as *mut near_vm_runner::logic::VMContext),
logic_fixture.fees_config.clone(),
result_state,
memory.unwrap_or_default(),
&mut *(logic_fixture.memory.as_mut() as *mut dyn MemoryLike),
)
};

Expand Down
Loading