Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -376,3 +376,4 @@ sb.debug

# Rust
/target
.gitnexus
104 changes: 64 additions & 40 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ members = [".", "napi"]
[package]
edition = "2021"
name = "datalayer-driver"
version = "4.0.0"
version = "5.0.0"
license = "MIT"
authors = ["yakuhito <y@kuhi.to>", "William Wills <wwills2@protonmail.com>"]
homepage = "https://github.com/DIG-Network/DataLayer-Driver"
Expand All @@ -26,7 +26,7 @@ chia-puzzle-types = "0.36.1"
thiserror = "1.0.61"
clvmr = "0.16.2"
tokio = "1.39.3"
chia-wallet-sdk = { version = "0.34.0", features = ["chip-0035", "native-tls", "peer-simulator", "action-layer"] }
chia-wallet-sdk = { version = "0.36.0", features = ["chip-0035", "native-tls", "peer-simulator", "action-layer"] }
hex-literal = "0.4.1"
num-bigint = "0.4.6"
hex = "0.4.3"
Expand Down
2 changes: 1 addition & 1 deletion napi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ chia-puzzle-types = "0.36.1"
chia-traits = "0.36.1"
thiserror = "1.0.61"
tokio = "1.39.3"
chia-wallet-sdk = { version = "0.34.0", features = ["chip-0035", "native-tls", "peer-simulator", "action-layer"] }
chia-wallet-sdk = { version = "0.36.0", features = ["chip-0035", "native-tls", "peer-simulator", "action-layer"] }
hex = "0.4.3"
rand = "0.8"
futures-util = "0.3"
Expand Down
4 changes: 2 additions & 2 deletions napi/package-lock.json

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

2 changes: 1 addition & 1 deletion napi/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dignetwork/datalayer-driver",
"version": "3.0.0",
"version": "3.0.1",
"main": "index.js",
"types": "index.d.ts",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion napi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pub use datalayer_driver::{
master_secret_key_to_wallet_synthetic_secret_key, master_to_wallet_unhardened,
oracle_delegated_puzzle, secret_key_to_public_key, synthetic_key_to_puzzle_hash, types, wallet,
writer_delegated_puzzle_from_key, xch_server_coin, BlsPair, Bytes, Bytes32, Coin, CoinSpend,
CoinState, DataStoreInfo, EveProof, LineageProof, Program, Proof, PublicKey, SecretKey,
CoinState, DatastoreInfo, EveProof, LineageProof, Program, Proof, PublicKey, SecretKey,
Signature, SimulatorPuzzle, SpendBundle, XchServerCoin,
};

Expand Down
28 changes: 22 additions & 6 deletions napi/src/napi_lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,28 @@ use crate::js::{

// Import from the main datalayer-driver crate
use datalayer_driver::{
master_to_wallet_unhardened, types, wallet, xch_server_coin, Bytes as RustBytes,
Bytes32 as RustBytes32, Coin as RustCoin, CoinSpend as RustCoinSpend,
DataStore as RustDataStore, DataStoreInfo as RustDataStoreInfo,
DataStoreMetadata as RustDataStoreMetadata, DelegatedPuzzle as RustDelegatedPuzzle,
Peer as RustPeer, Proof as RustProof, PublicKey as RustPublicKey, SecretKey as RustSecretKey,
Signature as RustSignature, SpendBundle as RustSpendBundle,
master_to_wallet_unhardened,
types,
wallet,
xch_server_coin,
Bytes as RustBytes,
Bytes32 as RustBytes32,
Coin as RustCoin,
CoinSpend as RustCoinSpend,
// The chia-wallet-sdk 0.36 rename (`DataStore` -> `Datastore`) is absorbed HERE, at the
// aliases. The JS-facing `DataStore`/`DataStoreMetadata` structs below deliberately keep
// their original names: they are the published npm/TypeScript surface, and renaming them
// would break every JS consumer for an upstream capitalisation change they cannot observe.
Datastore as RustDataStore,
DatastoreInfo as RustDataStoreInfo,
DatastoreMetadata as RustDataStoreMetadata,
DelegatedPuzzle as RustDelegatedPuzzle,
Peer as RustPeer,
Proof as RustProof,
PublicKey as RustPublicKey,
SecretKey as RustSecretKey,
Signature as RustSignature,
SpendBundle as RustSpendBundle,
};

use chia_protocol::{CoinStateUpdate, NewPeakWallet, ProtocolMessageTypes};
Expand Down
Loading
Loading