Skip to content

Commit

Permalink
Merge branch 'main' into 02/19/25-implement-new-modal-and-tx-types-in…
Browse files Browse the repository at this point in the history
…-transactionStore
  • Loading branch information
hardyjosh authored Feb 21, 2025
2 parents f0d827d + c892500 commit b585fb2
Show file tree
Hide file tree
Showing 243 changed files with 4,885 additions and 4,659 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ dist
packages/orderbook/cjs.js
packages/orderbook/cjs.d.ts
packages/orderbook/esm.js
packages/orderbook/esm.d.ts
packages/orderbook/esm.d.ts
tauri-app/src/lib/types
98 changes: 34 additions & 64 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,10 @@ comfy-table = "7.1.0"
cynic-codegen = { version = "3.4.0", features = ["rkyv"] }
cynic = "3.7.3"
chrono = "0.4.31"
typeshare = { git = "https://github.com/tomjw64/typeshare", rev = "556b44aafd5304eedf17206800f69834e3820b7c" }
thiserror = "1.0.56"
strict-yaml-rust = "0.1.2"
dotrain = "6.0.1-alpha.18"
dotrain-lsp = "6.0.1-alpha.18"
dotrain = "6.0.1-alpha.24"
dotrain-lsp = "6.0.1-alpha.24"
rain-metadata = { path = "lib/rain.interpreter/lib/rain.metadata/crates/cli" }
rain-metadata-bindings = { path = "lib/rain.interpreter/lib/rain.metadata/crates/bindings" }
rain-metaboard-subgraph = { path = "lib/rain.interpreter/lib/rain.metadata/crates/metaboard" }
Expand All @@ -54,6 +53,7 @@ test-context = "0.3.0"
portpicker = "0.1.1"
rain-erc = { git = "https://github.com/rainlanguage/rain.erc", rev = "0106e645ebd49334addc698c5aad9a85370eb54d" }
rain-error-decoding = { git = "https://github.com/rainlanguage/rain.error", rev = "72d9577fdaf7135113847027ba951f9a43b41827" }
wasm-bindgen-utils = "0.0"

[workspace.dependencies.rain_orderbook_bindings]
path = "crates/bindings"
Expand Down
5 changes: 1 addition & 4 deletions crates/bindings/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ alloy = { workspace = true, features = ["sol-types", "json"] }
serde = { workspace = true, features = ["derive", "rc"] }

[target.'cfg(target_family = "wasm")'.dependencies]
js-sys = { version = "0.3.69" }
wasm-bindgen = { version = "0.2.92" }
serde-wasm-bindgen = { version = "0.6.5" }
tsify = { version = "0.4.5", default-features = false, features = ["js", "wasm-bindgen"] }
wasm-bindgen-utils = { workspace = true }

[dev-dependencies]
wasm-bindgen-test = "0.3.42"
Loading

0 comments on commit b585fb2

Please sign in to comment.