Skip to content

Commit 95dc3e5

Browse files
authored
Merge branch 'main' into anodar/3569-6-chain-aware-presigs
2 parents 66b3305 + cbb9a06 commit 95dc3e5

15 files changed

Lines changed: 1840 additions & 1607 deletions

File tree

Cargo.lock

Lines changed: 206 additions & 112 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/contract/src/api.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
//! The contract's entrypoint surface, one module per feature.
22
33
pub mod authorization;
4+
pub mod ckd;
45
pub mod common;
6+
pub mod governance;
7+
pub mod key_events;
58
pub mod keys;
9+
pub mod lifecycle;
610
pub mod sign;
711
#[cfg(not(target_arch = "wasm32"))]
812
#[cfg(test)]

crates/contract/src/api/ckd.rs

Lines changed: 513 additions & 0 deletions
Large diffs are not rendered by default.

crates/contract/src/api/common.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
33
use crate::errors::{InvalidParameters, RequestError, TeeError};
44
use crate::{MpcContract, MpcContractExt};
5+
use dtos::{DomainConfig, DomainId, DomainPurpose};
56
use near_mpc_contract_interface::types as dtos;
67
use near_sdk::{AccountId, CryptoHash, Gas, GasWeight, NearToken, Promise, env, log, near};
78

8-
use dtos::{DomainConfig, DomainId, DomainPurpose};
9-
109
/// Register used to receive data id from `promise_await_data`.
1110
/// Note: This is an implementation constant, not a configurable policy value.
1211
const DATA_ID_REGISTER: u64 = 0;
@@ -157,11 +156,12 @@ pub(crate) fn refund_to(account_id: &AccountId, amount: NearToken) {
157156
#[expect(non_snake_case)]
158157
mod tests {
159158
use super::*;
160-
use crate::api::test_utils::*;
159+
use crate::api::test_utils::basic_setup;
161160
use dtos::Curve;
162161
use near_sdk::test_utils::VMContextBuilder;
163162
use near_sdk::testing_env;
164-
use rand::{SeedableRng, rngs::OsRng};
163+
use rand::SeedableRng;
164+
use rand::rngs::OsRng;
165165

166166
fn override_context_for_preconditions(deposit: NearToken, prepaid_gas: Gas) {
167167
let predecessor: AccountId = "contract_account.near".parse().unwrap();

0 commit comments

Comments
 (0)