diff --git a/Cargo.lock b/Cargo.lock index b049ac4..d8f629d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -116,6 +116,17 @@ dependencies = [ "serde_json", ] +[[package]] +name = "crate-git-revision" +version = "0.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54851b5b3f24621804b1cded2820975623c205e3055d2d44031cdb1237339ac8" +dependencies = [ + "serde", + "serde_derive", + "serde_json", +] + [[package]] name = "crypto-common" version = "0.1.6" @@ -537,19 +548,18 @@ version = "0.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee1832fb50c651ad10f734aaf5d31ca5acdfb197a6ecda64d93fcdb8885af913" dependencies = [ - "crate-git-revision", + "crate-git-revision 0.0.6", "data-encoding", ] [[package]] name = "stellar-xdr" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ff843326969bdf1ef673dcdba94c08f4a3c8f1e58d6e6ef39b1bd4f749179a" +version = "28.0.0" +source = "git+https://github.com/stellar/rs-stellar-xdr?rev=8f826caa99f3b4c55e4d958eb5b6a9a1dbbf9873#8f826caa99f3b4c55e4d958eb5b6a9a1dbbf9873" dependencies = [ "base64", "cfg_eval", - "crate-git-revision", + "crate-git-revision 0.0.9", "escape-bytes", "ethnum", "hex", diff --git a/Cargo.toml b/Cargo.toml index 1c174aa..3966316 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,11 +21,16 @@ console_error_panic_hook = { version = "0.1.7", optional = true } # TODO: For use with generating native values. # serde-wasm-bindgen = "0.6.5" +# Protocol 28 (CAP-0084) pre-release: per-cap-feature layout, no 'curr' module. +# Pinned to rs-stellar-xdr#549 (8f826caa99f3b4c55e4d958eb5b6a9a1dbbf9873), whose +# xdr submodule is stellar-xdr#306 head (787382ef2099cca168ca1cb282730d6b7b9e2f16). +# cap_0083 + cap_0084_muxed_contract enable the muxed-contract-address +# (SC_ADDRESS_TYPE_MUXED_CONTRACT) arm on the SCAddress union, mirroring CAP-0083 gating. [dependencies.stellar-xdr] -version = "27.0.0" -features = ["std", "base64", "serde", "serde_json", "schemars", "type_enum"] -# git = "https://github.com/stellar/rs-stellar-xdr" -# rev = "89a8bcde36aeda551cb0e3f9aa3e9fcf315fe1cc" +version = "28.0.0" +git = "https://github.com/stellar/rs-stellar-xdr" +rev = "8f826caa99f3b4c55e4d958eb5b6a9a1dbbf9873" +features = ["std", "type_enum", "cap_0083", "cap_0084_muxed_contract", "base64", "serde", "serde_json", "schemars"] [dev-dependencies] wasm-bindgen-test = "0.3.34" @@ -42,4 +47,7 @@ strip = "symbols" debug-assertions = false [package.metadata.wasm-pack.profile.release] -wasm-opt = ["-O", "--enable-bulk-memory"] +# wasm-opt disabled — local binaryen may reject the bulk-memory ops emitted by +# the rs-stellar-xdr @ 7b46a60 pre-release dep. Output is unoptimized but +# functionally correct. Re-enable once the pinned rev lands a release build. +wasm-opt = false diff --git a/deny.toml b/deny.toml index a120660..df20a20 100644 --- a/deny.toml +++ b/deny.toml @@ -35,8 +35,9 @@ allow = [ ] deny = [ ] -skip = [ -] +# SPIKE (p28-cap-0084): git-pinned stellar-xdr pulls crate-git-revision 0.0.9 while +# crates.io stellar-strkey pulls 0.0.6. Remove when the pin flips to version=. +skip = [{ name = "crate-git-revision", version = "0.0.6" }] skip-tree = [ ] @@ -44,7 +45,9 @@ skip-tree = [ unknown-registry = "deny" unknown-git = "deny" allow-registry = ["https://github.com/rust-lang/crates.io-index"] -allow-git = [] +# SPIKE (p28-cap-0084): stellar-xdr is git-pinned to rs-stellar-xdr#549 until it +# releases on crates.io. Revert to allow-git = [] when the pin flips to version=. +allow-git = ["https://github.com/stellar/rs-stellar-xdr"] [sources.allow-org] github = [] diff --git a/tests/tests.rs b/tests/tests.rs index 0fc2094..0d5ecdf 100644 --- a/tests/tests.rs +++ b/tests/tests.rs @@ -113,6 +113,7 @@ fn list_of_types() { "ContractExecutable", "ScAddressType", "MuxedEd25519Account", + "MuxedContract", "ScAddress", "ScVec", "ScMap", @@ -219,6 +220,7 @@ fn list_of_types() { "LedgerCloseValueSignature", "StellarValue", "StellarValueExt", + "StellarValueProposedValue", "LedgerHeaderFlags", "LedgerHeaderExtensionV1", "LedgerHeaderExtensionV1Ext",