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

Upstream 0.24.2 #142

Merged
merged 78 commits into from
Feb 27, 2025
Merged
Changes from 1 commit
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
737c273
impl #BE-1771: Library provider updated
dbaranovstonfi Dec 19, 2024
acecb3b
Merge branch 'be-1771' into 'main'
dbaranovstonfi Dec 19, 2024
d7f8d7a
Impl #BE-1843: Bencmark for contract emulator
dbaranovstonfi Dec 19, 2024
b939948
Merge branch 'be-1843' into 'main'
Dec 19, 2024
5d9abe0
NI: #BE-1771: fix vb comments
dbaranovstonfi Dec 19, 2024
fbf57dc
Merge branch 'ni-comments-for-be-1771' into 'main'
dbaranovstonfi Dec 19, 2024
201f7f9
Downstream 0.22.4
dbaranovstonfi Dec 22, 2024
1409bcb
Merge branch 'downstream-0.22.4' into 'main'
dbaranovstonfi Dec 22, 2024
e14ca13
Impl #NI: try fix another leak
Dec 25, 2024
6d0dc82
Merge branch 'ni-try-fix-another-leak' into 'main'
Dec 25, 2024
fa7aa72
Impl #BE-1881: Replaced dashmap by tokio::sync:Mutex to avoid mem leaks
dbaranovstonfi Jan 2, 2025
ea864f0
Merge branch 'be-1881' into 'main'
dbaranovstonfi Jan 2, 2025
0d6c833
Impl #BE-1846 : library cache
dbaranovstonfi Jan 3, 2025
b4cab00
Merge branch 'be-1846' into 'main'
dbaranovstonfi Jan 3, 2025
672bf3d
retrying invokes on connection
dbaranov34 Jan 6, 2025
113ab4a
Merge branch 'main' of ssh://git.stonfi.net:2222/ston-fi/rust/tonlib-…
dbaranov34 Jan 6, 2025
f454e75
Revert "Merge branch 'main' of ssh://git.stonfi.net:2222/ston-fi/rust…
dbaranov34 Jan 6, 2025
63eba99
Revert "retrying invokes on connection"
dbaranov34 Jan 6, 2025
65a126a
Retrying invoke on connection
dbaranov34 Jan 6, 2025
0a88179
Merge branch 'be-1879-3' into 'main'
dbaranovstonfi Jan 6, 2025
79535ea
Revert "Merge branch 'be-1879-3' into 'main'"
dbaranov34 Jan 6, 2025
b086d40
Reapply "Merge branch 'main' of ssh://git.stonfi.net:2222/ston-fi/rus…
dbaranov34 Jan 6, 2025
b591f69
impl display for TonHash
dbaranov34 Jan 7, 2025
b2b896d
Merge branch 'be-1892' into 'main'
dbaranovstonfi Jan 7, 2025
925ccd7
Impl #BE-1839: Boxed long errors, updated builder methods
dbaranovstonfi Jan 7, 2025
408fc81
Merge branch 'be-1839' into 'main'
dbaranovstonfi Jan 7, 2025
07f1890
Impl: #BE-1893: Library provider trait and implementation of BlockCh…
dbaranovstonfi Jan 9, 2025
cacc166
Merge branch 'be-1893' into 'main'
dbaranovstonfi Jan 9, 2025
2a37aab
NI: bump tonlib-sys to 2024.10.4
dbaranovstonfi Jan 9, 2025
7704938
Merge branch 'NI-bump-tonlib-sys-2024.10.4' into 'main'
dbaranovstonfi Jan 9, 2025
dd1d66c
Release v0.23.0
dbaranov34 Jan 9, 2025
684119f
NI: default disable cache
dbaranovstonfi Jan 9, 2025
4a057be
Merge branch 'NI-default-cache-disabled' into 'main'
dbaranovstonfi Jan 9, 2025
9970227
factory cache disabled by default
dbaranov34 Jan 9, 2025
b85f5cf
implement load/store tonhash
BokarevNik Jan 13, 2025
fae525b
Merge branch 'BE-1784-store-load-tonhash' into 'main'
dbaranovstonfi Jan 14, 2025
c2bfa0b
Downstream 0.23.1
dbaranovstonfi Jan 14, 2025
e11b432
Merge branch 'downstream-0.23.1' into 'main'
dbaranovstonfi Jan 14, 2025
ea6213a
Impl #BE-1988: Impl TLB-types and support anycast in tonaddress
dbaranovstonfi Jan 28, 2025
cf16c7d
Merge branch 'ni-tonaddress-anycast' into 'main'
Jan 28, 2025
1bba156
Release v0.23.2
dbaranov34 Jan 28, 2025
ba5ca64
Impl #BE-2034: support state_init tlb
Feb 4, 2025
ad1fed9
Merge branch 'BE-2034-support-tlb-state-init' into 'main'
Feb 6, 2025
7ee94e6
Impl #BE-2032: suport tlb message
Feb 4, 2025
2b91bcb
Impl #BE-2032: review fixes
Feb 7, 2025
ce0b30e
Merge branch 'BE-2032-support-tlb-message' into 'main'
Feb 7, 2025
f66a0f0
Impl #BE-1989: load address using tlb, remove Copy from TonHash
Feb 9, 2025
cc5912f
Impl #BE-1989: review fixes
Feb 10, 2025
19e836b
Merge branch 'BE-1989-store-address-using-tlb' into 'main'
Feb 10, 2025
17829ac
Impl #NI: add tests for library_helper & store_dict_data
Feb 11, 2025
6aead88
Merge branch 'ni-add-tests' into 'main'
Feb 12, 2025
6e20a1e
Impl #BE-2088: cleanup wallet
Feb 12, 2025
439b215
Merge branch 'BE-2088-support-wallet-w5-message-build' into 'main'
Feb 13, 2025
2ae3f01
Impl #BE-2088: split WalletExtMsgBody
Feb 12, 2025
284186e
Merge branch 'BE-2088-support-wallet-w5-message-build-part2' into 'main'
Feb 13, 2025
3341eb4
Impl #NI: 2088: support wallet v5
Feb 13, 2025
8c07cad
Merge branch 'BE-2088-support-wallet-w5-message-build-part3' into 'main'
Feb 18, 2025
b155764
Impl #BE-2088: Cell::from_boc without overhead
Feb 17, 2025
dad79d0
Impl #BE-2088: cleanup tests
Feb 17, 2025
a6d8d3b
Merge branch 'BE-2088-support-wallet-w5-message-build-part4' into 'main'
Feb 18, 2025
62184bc
Impl #NI: handle empty boc, support default_seqno for testnet
Feb 18, 2025
70d2a53
Merge branch 'ni-handle-state-abscence' into 'main'
Feb 18, 2025
c7a4129
Impl #BE-2117: don't validate big stack size for get_wallet_data
Feb 19, 2025
0a51c03
Merge branch 'BE-2117-dont-validate-stack-size-for-get-wallet-data' i…
dbaranovstonfi Feb 20, 2025
ff08355
Impl #NI: up tonlib-sys
Feb 19, 2025
57aa3aa
fix lib test
Feb 20, 2025
401afe1
Merge branch 'up-tonlib-sys' into 'main'
dbaranovstonfi Feb 21, 2025
1fd1c0f
Ignored test with ub
dbaranovstonfi Feb 21, 2025
c3a7305
Merge branch 'NI-comment-out-test-with-ub' into 'main'
dbaranovstonfi Feb 21, 2025
e74f655
NI: bump sys to 2025.2 version
dbaranovstonfi Feb 21, 2025
4281391
Merge branch 'NI-bump-sys-to-2025.2' into 'main'
dbaranovstonfi Feb 21, 2025
5796e3e
Release v0.24.1
dbaranov34 Feb 21, 2025
f87aafc
Bump tonlib-sys to 2025.2.2
dbaranovstonfi Feb 27, 2025
dca4f76
Merge branch 'NI-bump-sys-to-2025.2.2' into 'main'
dbaranovstonfi Feb 27, 2025
bd7dcfc
Release v0.24.2
dbaranov34 Feb 27, 2025
ae07a2d
release 0.24.2
dbaranov34 Feb 27, 2025
aac6946
merge upstream/main
dbaranov34 Feb 27, 2025
f6d09b4
Merge branch 'upstream-0.24.2' into downstream-0.24.1
dbaranov34 Feb 27, 2025
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
Prev Previous commit
Next Next commit
impl display for TonHash
dbaranov34 committed Jan 7, 2025
commit b591f6959bd8347cf409d0da848778653cc44e02
20 changes: 1 addition & 19 deletions client/src/contract/factory/library_loader.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
use std::collections::HashMap;
use std::sync::Arc;

use async_trait::async_trait;
use tonlib_core::cell::dict::predefined_writers::val_writer_ref_cell;
use tonlib_core::cell::{ArcCell, BagOfCells, CellBuilder, TonCellError};
use tonlib_core::cell::{ArcCell, BagOfCells};
use tonlib_core::TonHash;

use crate::client::{TonClient, TonClientInterface};
@@ -16,22 +14,6 @@ pub struct ContractLibraryDict {
pub keys: Vec<TonHash>,
}

impl TryFrom<HashMap<TonHash, ArcCell>> for ContractLibraryDict {
type Error = TonCellError;

fn try_from(value: HashMap<TonHash, ArcCell>) -> Result<Self, Self::Error> {
let keys = value.keys().copied().collect();
let lib_cell = CellBuilder::new()
.store_dict_data(256, val_writer_ref_cell, value)?
.build()?;

let dict_boc = BagOfCells::from_root(lib_cell).serialize(false)?;

let dict = ContractLibraryDict { dict_boc, keys };
Ok(dict)
}
}

#[async_trait]
pub trait LibraryLoader: Send + Sync {
async fn load_libraries(
20 changes: 19 additions & 1 deletion core/src/types.rs
Original file line number Diff line number Diff line change
@@ -2,6 +2,8 @@ mod address;
mod error;
mod tx_id;

use std::fmt;

pub use address::*;
use base64::prelude::BASE64_URL_SAFE_NO_PAD;
use base64::Engine;
@@ -19,7 +21,7 @@ pub const DEFAULT_CELL_HASH: TonHash = TonHash([
93, 197, 184, 126, 65, 11, 120, 99, 10, 9, 207, 199,
]);

#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize, PartialOrd, Ord)]
#[derive(Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize, PartialOrd, Ord)]
pub struct TonHash([u8; TON_HASH_LEN]);

impl TonHash {
@@ -113,3 +115,19 @@ impl TryFrom<Vec<u8>> for TonHash {
Self::try_from(value.as_slice())
}
}

impl fmt::Debug for TonHash {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
// Delegate to Display for Debug formatting
fmt::Display::fmt(self, f)
}
}

impl fmt::Display for TonHash {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
for byte in &self.0 {
write!(f, "{:02x}", byte)?;
}
Ok(())
}
}