Merge remote-tracking branch 'benma/drop-eth-crate'

Author: benma

src/rust/Cargo.lock

@@ -18,7 +18,6 @@ members = [
     "bitbox02-rust-c",
     "bitbox02-rust",
     "util",
-    "apps/ethereum",
     "bitbox02-noise",
     "bitbox02",
     "bitbox02-sys",

src/rust/Cargo.toml

@@ -27,7 +27,6 @@ bitbox02-rust = { path = "../bitbox02-rust", optional = true }
 bitbox02 = { path = "../bitbox02", optional = true }
 bitbox02-noise = { path = "../bitbox02-noise", optional = true }
 util = { path = "../util" }
-ethereum = { path = "../apps/ethereum", optional = true }
 hex = { version = "0.4", default-features = false }
 sha2 = { version = "0.9.2", default-features = false, optional = true }
 
@@ -55,8 +54,6 @@ firmware = ["bitbox02-rust", "bitbox02", "bitbox02-noise", "sha2"]
 testing = ["bitbox02/testing"]
 
 app-ethereum = [
-  # these are dependencies
-  "ethereum",
   # enable this feature in the deps
   "bitbox02-rust/app-ethereum",
   "bitbox02/app-ethereum",

src/rust/apps/ethereum/Cargo.toml

@@ -28,7 +28,6 @@ doctest = false
 [dependencies]
 bitbox02 = {path = "../bitbox02"}
 util = {path = "../util"}
-ethereum = { path = "../apps/ethereum", optional = true }
 binascii = { version = "0.1.4", default-features = false, features = ["encode"] }
 bitbox02-noise = {path = "../bitbox02-noise"}
 hex = { version = "0.4", default-features = false }
@@ -52,7 +51,6 @@ features = ["prost-derive"]
 [features]
 app-ethereum = [
   # enable these dependencies
-  "ethereum",
   "sha3",
   "num-bigint",
   # enable this feature in the deps

src/rust/apps/ethereum/src/keypath.rs

@@ -17,6 +17,7 @@ compile_error!(
     "Ethereum code is being compiled even though the app-ethereum feature is not enabled"
 );
 
+mod address;
 mod amount;
 mod keypath;
 mod pubrequest;

src/rust/apps/ethereum/src/lib.rs

@@ -1,3 +1,17 @@
+// Copyright 2021 Shift Crypto AG
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use sha3::digest::Digest;
 
 use alloc::string::String;
@@ -38,7 +52,6 @@ pub fn from_pubkey(pubkey_uncompressed: &[u8; 65]) -> String {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::prelude::v1::*;
 
     #[test]
     fn test_from_pubkey_hash() {