Skip to content

Commit fae828e

Browse files
authored
Merge branch 'main' into anodar/3569-5-node-available-chains-switch
2 parents 6ce5767 + 7fd6c77 commit fae828e

22 files changed

Lines changed: 83 additions & 61 deletions

File tree

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ near-crypto-public = { version = "0.37.1", package = "near-crypto" }
188188
near-gas = "0.3.4"
189189
near-jsonrpc-client = "0.22.0"
190190
near-jsonrpc-primitives = "0.37.1"
191-
near-kit = { version = "0.12.1", default-features = false }
191+
near-kit = { version = "0.14.0", default-features = false, features = ["rpc"] }
192192
near-primitives = "0.37.1"
193193
near-sandbox = "0.3.11"
194194
near-sdk = { version = "5.29.0", features = [

Makefile.toml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,14 @@ args = ["scripts/check-third-party-licenses.sh"]
135135
[tasks.check-docs]
136136
description = "Check rustdoc for broken intra-doc links"
137137
command = "cargo"
138-
args = ["doc", "--workspace", "--no-deps"]
138+
args = [
139+
"doc",
140+
"--workspace",
141+
"--no-deps",
142+
"--all-features",
143+
"--document-private-items",
144+
"--locked",
145+
]
139146

140147
[tasks.check-docs.env]
141148
RUSTDOCFLAGS = "-D warnings"

crates/contract/tests/sandbox/utils/sign_utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ async fn await_request_in_contract_queue<T: ContractQueueRequest>(
406406
}
407407
}
408408

409-
/// Derives a confidential key following https://github.com/near/threshold-signatures/blob/main/docs/confidential_key_derivation.md
409+
/// Derives a confidential key following <https://github.com/near/threshold-signatures/blob/main/docs/confidential_key_derivation.md>
410410
pub fn create_response_ckd(
411411
account_id: &AccountId,
412412
app_public_key: &dtos::Bls12381G1PublicKey,

crates/e2e-tests/src/blockchain.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use ed25519_dalek::SigningKey;
22
use near_contract_transport::{CallContract, FunctionCallArgs};
3-
use near_kit::FinalExecutionOutcome;
3+
use near_kit::{Final, FinalExecutionOutcome};
44
use near_mpc_contract_interface::client::MpcContractHandle;
55
use near_mpc_contract_interface::types::ProtocolContractState;
66
use serde::de::DeserializeOwned;
@@ -78,7 +78,7 @@ impl NearBlockchain {
7878
tx = tx.add_full_access_key(key.to_near_public_key());
7979
}
8080

81-
tx.wait_until(near_kit::Final)
81+
tx.wait_until::<Final>()
8282
.await
8383
.map_err(|e| anyhow::anyhow!("failed to create account {name}: {e}"))?;
8484
Ok(())
@@ -97,7 +97,7 @@ impl NearBlockchain {
9797
.transfer(near_kit::NearToken::from_near(balance_near))
9898
.add_full_access_key(key.to_near_public_key())
9999
.deploy(wasm.to_vec())
100-
.wait_until(near_kit::Final)
100+
.wait_until::<Final>()
101101
.await
102102
.map_err(|e| anyhow::anyhow!("failed to create account and deploy to {name}: {e}"))?;
103103

crates/foreign-chain-inspector/src/bitcoin/inspector.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ use foreign_chain_rpc_interfaces::bitcoin::{
77
GetRawTransactionVerboseResponse, TransportBitcoinBlockHash, TransportBitcoinTransactionHash,
88
};
99

10-
/// https://developer.bitcoin.org/reference/rpc/getrawtransaction.html
10+
/// <https://developer.bitcoin.org/reference/rpc/getrawtransaction.html>
1111
const GET_RAW_TRANSACTION_METHOD: &str = "getrawtransaction";
1212
const VERBOSE_RESPONSE: bool = true;
1313

14-
/// https://developer.bitcoin.org/reference/rpc/getblockheader.html
14+
/// <https://developer.bitcoin.org/reference/rpc/getblockheader.html>
1515
const GET_BLOCK_HEADER_METHOD: &str = "getblockheader";
16-
/// https://developer.bitcoin.org/reference/rpc/getblockhash.html
16+
/// <https://developer.bitcoin.org/reference/rpc/getblockhash.html>
1717
const GET_BLOCK_HASH_METHOD: &str = "getblockhash";
1818

1919
#[derive(Clone)]

crates/foreign-chain-inspector/tests/aptos_rpc_manual.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const PUBLIC_NODE_URL: &str = "https://fullnode.mainnet.aptoslabs.com/v1";
1313

1414
/// A committed Aptos mainnet transaction (ledger version 5667962944) whose first event is
1515
/// `0x1::block::NewBlockEvent` emitted by the framework account `0x1`.
16-
/// https://explorer.aptoslabs.com/txn/0xadc6b85a0931fc7f0d7e3839b52d63105e22cec1cb1cdee48aa2065773098c3c?network=mainnet
16+
/// <https://explorer.aptoslabs.com/txn/0xadc6b85a0931fc7f0d7e3839b52d63105e22cec1cb1cdee48aa2065773098c3c?network=mainnet>
1717
const COMMITTED_TX_HASH: &str = "adc6b85a0931fc7f0d7e3839b52d63105e22cec1cb1cdee48aa2065773098c3c";
1818
const EXPECTED_EVENT_TYPE_TAG: &str = "0x1::block::NewBlockEvent";
1919
const EXPECTED_EVENT_SEQUENCE_NUMBER: u64 = 822_198_006;

crates/foreign-chain-inspector/tests/starknet_rpc_manual.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use serde::Deserialize;
1313
const PUBLIC_NODE_URL: &str = "https://starknet-rpc.publicnode.com";
1414

1515
/// A known L1-finalized Starknet mainnet tx in block 6_868_546.
16-
/// https://starkscan.co/tx/0x52a6c2b9d1d1b77dbc322b298fd91f39e3cca9bf1db4a7aa79f14a90efa633e
16+
/// <https://starkscan.co/tx/0x52a6c2b9d1d1b77dbc322b298fd91f39e3cca9bf1db4a7aa79f14a90efa633e>
1717
const FINALIZED_TX_HASH: &str = "0x52a6c2b9d1d1b77dbc322b298fd91f39e3cca9bf1db4a7aa79f14a90efa633e";
1818
const FINALIZED_BLOCK_HASH: &str =
1919
"0x1b716b05027567f9f4a2fe37f8769dc3b04a2e5a3893f6e0ed45f24c7c0ffa5";

crates/foreign-chain-inspector/tests/sui_rpc_manual.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const PUBLIC_ARCHIVE_URL: &str = "https://archive.mainnet.sui.io";
1616

1717
/// The first epoch-change transaction on Sui mainnet (checkpoint 9769), whose first event
1818
/// is `0x3::validator_set::ValidatorEpochInfoEventV2` emitted by the system package `0x3`.
19-
/// https://suiscan.xyz/mainnet/tx/8eBMXpC8Np7RNDwwiGwSmeev1cSoc7w3fPXdikhH7RZo
19+
/// <https://suiscan.xyz/mainnet/tx/8eBMXpC8Np7RNDwwiGwSmeev1cSoc7w3fPXdikhH7RZo>
2020
const CHECKPOINTED_TX_DIGEST: &str = "8eBMXpC8Np7RNDwwiGwSmeev1cSoc7w3fPXdikhH7RZo";
2121
const EXPECTED_EVENT_MODULE: &str = "sui_system";
2222

crates/node/src/indexer/real.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub async fn check_block_processing(process_blocks_sender: watch::Sender<bool>,
5151
}
5252
}
5353

54-
/// Spawns a real indexer, returning a handle to the indexer, [`IndexerApi`].
54+
/// Spawns a real indexer, returning a handle to the indexer, [`IndexerAPI`].
5555
///
5656
/// If an unrecoverable error occurs, the spawned indexer will terminate, and the provided [`oneshot::Sender`]
5757
/// will be used to propagate the error.

0 commit comments

Comments
 (0)