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.

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

Jump to bottom

Add EIP-1193 support #414

Merged
merged 14 commits into from
Dec 7, 2020
Merged

Add EIP-1193 support #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5d16f38
Put signing behind an optional feature
enolan Nov 28, 2020
022c4e5
Add EIP-1193 support
enolan Nov 28, 2020
3f10dae
Add eth_requestAccounts method
enolan Nov 28, 2020
15462bc
'cargo check' EIP-1193 code in Travis
enolan Nov 28, 2020
0f4a832
Clean up the feature gates a little
enolan Dec 2, 2020
461bed2
Style cleanup in eip_1193.rs
enolan Dec 2, 2020
ee62eda
remove meaningless #[wasm_bindgen] attribute
enolan Dec 2, 2020
1099ee4
Refactor translating events from JS
enolan Dec 2, 2020
15046bb
Replace some Error::Internals with panics with useful messages
enolan Dec 3, 2020
ca2aaf7
rename get_default -> default
enolan Dec 3, 2020
0656744
Refactor error handling in request_wrapped
enolan Dec 3, 2020
8d63e45
clean up EIP-1193 listeners on Drop
enolan Dec 3, 2020
98caabc
Add support for more EIP-1193 events
enolan Dec 4, 2020
f546e5a
Reduce the number of #[cfg(feature = "signing")] attributes a bit more
enolan Dec 6, 2020
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
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ before_script:
- if [[ "${TRAVIS_RUST_VERSION}" == stable ]]; then
rustup component add rustfmt && cargo install cargo-deny;
fi
- rustup target add wasm32-unknown-unknown

script:
- if [[ "${TRAVIS_RUST_VERSION}" == "stable" ]]; then
Expand All @@ -42,6 +43,7 @@ script:
- cargo build
- cargo test
- cargo check --no-default-features
- cargo check --target wasm32-unknown-unknown --no-default-features --features eip-1193
- cargo check --no-default-features --features http
- cargo check --no-default-features --features http-tls
- cargo check --no-default-features --features ws-tokio
Expand Down
12 changes: 10 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ log = "0.4.6"
parking_lot = "0.11.0"
rlp = "0.4"
rustc-hex = "2.1.0"
secp256k1 = { version = "0.19", features = ["recovery"] }
secp256k1 = { version = "0.19", features = ["recovery"], optional = true }
serde = { version = "1.0.90", features = ["derive"] }
serde_json = "1.0.39"
tiny-keccak = { version = "2.0.1", features = ["keccak"] }
Expand All @@ -44,16 +44,24 @@ soketto = { version = "0.4.1", optional = true }
## Shared (WS, HTTP)
native-tls = { version = "0.2", optional = true }
url = { version = "2.1", optional = true }
## EIP-1193
js-sys = { version = "0.3.45", optional = true }
### This is a transitive dependency, only here so we can turn on its wasm_bindgen feature
rand = { version = "0.7.3", optional = true }
wasm-bindgen = { version = "0.2.68", optional = true, features = ["serde-serialize"] }
wasm-bindgen-futures = { version = "0.4.18", optional = true }

[dev-dependencies]
# For examples
env_logger = "0.8"
tokio = { version = "0.2", features = ["full"] }

[features]
default = ["http-tls", "ws-tls-tokio"]
default = ["http-tls", "signing", "ws-tls-tokio"]
eip-1193 = ["js-sys", "wasm-bindgen", "wasm-bindgen-futures", "futures-timer/wasm-bindgen", "rand/wasm-bindgen"]
http = ["hyper", "hyper-proxy", "url", "base64", "typed-headers"]
http-tls = ["hyper-tls", "native-tls", "http"]
signing = ["secp256k1"]
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of disabling signing capabilities in JS it's actually possible to use libsecpk256k1 which compiles to WASM. See how it's done in ethsign. That said, it might be pretty involved and would rather review that separately in a follow up PR, so we can just create an issue for now.

ws-tokio = ["soketto", "url", "tokio", "tokio-util"]
ws-async-std = ["soketto", "url", "async-std"]
ws-tls-tokio = ["async-native-tls", "native-tls", "async-native-tls/runtime-tokio", "ws-tokio"]
Expand Down
Loading