Skip to content

Feature/crypto errors #54

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

Merged
benStre merged 5 commits into from
Feb 28, 2026
Merged

Feature/crypto errors #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
be69c31
fix version for wasm wasm-bindgen-cli
jonasstrehle Feb 28, 2026
68bc1a5
Fix crypto
jonasstrehle Feb 28, 2026
fbe4147
Update dependencies to use git sources for datex-core and datex-crypt…
jonasstrehle Feb 28, 2026
8482a3e
Update dependencies to point to release branch for datex-core and dat…
jonasstrehle Feb 28, 2026
36bf447
revert result from random bytes
jonasstrehle Feb 28, 2026
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
56 changes: 39 additions & 17 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DATEX Web
# DATEX

> Check out our specification at [datex.unyt.org](https://datex.unyt.org).

Expand Down
4 changes: 2 additions & 2 deletions rs-lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ panic = "abort"

[dependencies]
log = { version = "0.4", features = ["std", "serde"] }
datex-core = { version = "0.0.9", default-features = false, features = [
datex-core = { git = "https://github.com/unyt-org/datex", branch = "release/0.0.10", version = "0.0.10", default-features = false, features = [
"target_wasm",
"compiler",
"decompiler",
"syntax_highlighting_legacy",
"lsp_wasm",
] }
datex-crypto-facade = { version = "0.0.1" }
datex-crypto-facade = { git = "https://github.com/unyt-org/datex", branch = "release/0.0.10", version = "0.0.2" }

# datex_macros = { git = "https://github.com/unyt-org/datex", branch = "refactor/update-loop", version = "0.1.3", package = "datex_macros" }

Expand Down
22 changes: 12 additions & 10 deletions rs-lib/src/runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,12 @@ impl JSRuntime {
future_to_promise(async move {
let something = b"yellow submarineyellow submarine".to_owned();
let some_check =
b"9At2nzU19GjL8F4WFRyB7RZSGLemMGUMVBZAMChfndF2".to_owned();
"9At2nzU19GjL8F4WFRyB7RZSGLemMGUMVBZAMChfndF2".to_owned();

let based = CryptoImpl::enc_b58(&something).unwrap();
let unbased = CryptoImpl::dec_b58(&some_check).unwrap();
let based = CryptoImpl::enc_b58(&something).as_bytes().to_vec();
let unbased = CryptoImpl::dec_b58_32(&some_check).unwrap();
assert_eq!(something, unbased);
assert_eq!(some_check, based);
assert_eq!(some_check.as_bytes().to_vec(), based);

// Hashes
let mut ikm = Vec::from([0u8; 32]);
Expand Down Expand Up @@ -224,12 +224,14 @@ impl JSRuntime {
assert_ne!(msg, ctr_ciphered);

// AES key wrapping
let wrapped = CryptoImpl::key_upwrap(&random_bytes, &random_bytes)
.await
.unwrap();
let unwrapped = CryptoImpl::key_unwrap(&random_bytes, &wrapped)
.await
.unwrap();
let wrapped =
CryptoImpl::key_wrap_rfc3394(&random_bytes, &random_bytes)
.await
.unwrap();
let unwrapped =
CryptoImpl::key_unwrap_rfc3394(&random_bytes, &wrapped)
.await
.unwrap();
assert_eq!(random_bytes.to_vec(), unwrapped);
// assert_ne!(wrapped, unwrapped);

Expand Down
2 changes: 1 addition & 1 deletion scripts/build-wasm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ async function runWasmBindgen(args: {
}) {
// make sure wasm-bindgen cli is installed
const wasmBindgenInstallProcess = new Deno.Command("cargo", {
args: ["install", "wasm-bindgen-cli"],
args: ["install", "wasm-bindgen-cli", "--version", "0.2.112"],
}).spawn();
const installRes = await wasmBindgenInstallProcess.status;
if (!installRes.success) {
Expand Down