bless
This commit is contained in:
Victor Vobis
parent
55b575b62e
commit
954a7219b0
@ -168,17 +168,3 @@ pub struct CliArgs {
|
|||||||
#[arg(short = 's', long = "seed", action = clap::ArgAction::SetTrue)]
|
#[arg(short = 's', long = "seed", action = clap::ArgAction::SetTrue)]
|
||||||
pub seed: bool,
|
pub seed: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Subcommand, Debug)]
|
|
||||||
pub enum Commands {}
|
|
||||||
|
|
||||||
#[derive(Subcommand, Debug)]
|
|
||||||
pub enum TxCmd {
|
|
||||||
/// Add a new transaction to the DB
|
|
||||||
#[command(short_flag = 'a')]
|
|
||||||
Add(core::Tx),
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_args() -> CliArgs {
|
|
||||||
CliArgs::parse()
|
|
||||||
}
|
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
pub type Address = String;
|
pub type Address = [u8; 20];
|
||||||
|
|||||||
@ -26,20 +26,6 @@ pub enum TxError {
|
|||||||
UnknownAccount(String),
|
UnknownAccount(String),
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn print_error_chain(err: &anyhow::Error) {
|
|
||||||
let mut err_string = String::from(format!("Error: {}\n", err));
|
|
||||||
|
|
||||||
let mut source = err.source();
|
|
||||||
let mut level = 1;
|
|
||||||
|
|
||||||
while let Some(err) = source {
|
|
||||||
err_string.push_str(format!(" {}: {}\n", level, err).as_str());
|
|
||||||
source = err.source();
|
|
||||||
level += 1;
|
|
||||||
}
|
|
||||||
log(err_string)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(
|
#[derive(
|
||||||
serde::Deserialize, serde::Serialize, Debug, clap::Args, Clone, bincode::Encode, bincode::Decode,
|
serde::Deserialize, serde::Serialize, Debug, clap::Args, Clone, bincode::Encode, bincode::Decode,
|
||||||
)]
|
)]
|
||||||
@ -49,7 +35,21 @@ pub struct Tx {
|
|||||||
value: u64,
|
value: u64,
|
||||||
data: String,
|
data: String,
|
||||||
nonce: u64,
|
nonce: u64,
|
||||||
signature: Vec<u8>,
|
}
|
||||||
|
|
||||||
|
pub struct SignedTransaction {
|
||||||
|
tx: Tx,
|
||||||
|
signature: [u8; 32],
|
||||||
|
}
|
||||||
|
|
||||||
|
impl SignedTransaction {
|
||||||
|
pub fn new(tx: Tx, signature: [u8; 32]) -> Self {
|
||||||
|
Self {
|
||||||
|
tx,
|
||||||
|
signature
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Tx {
|
impl Tx {
|
||||||
@ -60,7 +60,6 @@ impl Tx {
|
|||||||
value,
|
value,
|
||||||
data,
|
data,
|
||||||
nonce,
|
nonce,
|
||||||
signature: vec![],
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -72,11 +71,6 @@ impl Tx {
|
|||||||
} else if self.value == 0 {
|
} else if self.value == 0 {
|
||||||
return Err(TxError::ValueEmpty);
|
return Err(TxError::ValueEmpty);
|
||||||
}
|
}
|
||||||
//let secp = secp256k1::Secp256k1::new();
|
|
||||||
//let mut tx_hash = [0u8; 32];
|
|
||||||
//tx_hash.copy_from_slice(self.hash().as_bytes());
|
|
||||||
//let message = secp256k1::Message::from_digest(tx_hash);
|
|
||||||
//let signature = secp256k1::ecdsa::Signature::from_compact(&self.signature).unwrap();
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -15,6 +15,20 @@ pub mod core {
|
|||||||
pub use address::*;
|
pub use address::*;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn print_error_chain(err: &anyhow::Error) {
|
||||||
|
let mut err_string = String::from(format!("Error: {}\n", err));
|
||||||
|
|
||||||
|
let mut source = err.source();
|
||||||
|
let mut level = 1;
|
||||||
|
|
||||||
|
while let Some(err) = source {
|
||||||
|
err_string.push_str(format!(" {}: {}\n", level, err).as_str());
|
||||||
|
source = err.source();
|
||||||
|
level += 1;
|
||||||
|
}
|
||||||
|
log(err_string)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn log(msg: String) {
|
pub fn log(msg: String) {
|
||||||
println!("{msg}")
|
println!("{msg}")
|
||||||
}
|
}
|
||||||
|
|||||||
3000
wallet/Cargo.lock
generated
3000
wallet/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -3,237 +3,8 @@ name = "wallet"
|
|||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[package.metadata.docs.rs]
|
|
||||||
all-features = true
|
|
||||||
targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]
|
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
egui = "0.32"
|
hex = "0.4.3"
|
||||||
eframe = { version = "0.32", default-features = false, features = [
|
k256 = { version = "0.13.4", features = ["serde"] }
|
||||||
# "accesskit", # Make egui compatible with screen readers. NOTE: adds a lot of dependencies.
|
sha3 = "0.10.8"
|
||||||
"default_fonts", # Embed the default egui fonts.
|
shared = { path = "../shared" }
|
||||||
"glow", # Use the glow rendering backend. Alternative: "wgpu".
|
|
||||||
"persistence", # Enable restoring app state when restarting the app.
|
|
||||||
"wayland", # To support Linux (and CI)
|
|
||||||
"x11", # To support older Linux distributions (restores one of the default features)
|
|
||||||
] }
|
|
||||||
log = "0.4.27"
|
|
||||||
|
|
||||||
# You only need serde if you want app persistence:
|
|
||||||
serde = { version = "1.0.219", features = ["derive"] }
|
|
||||||
egui_file = "0.23.1"
|
|
||||||
|
|
||||||
# native:
|
|
||||||
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
|
|
||||||
env_logger = "0.11.8"
|
|
||||||
k256 = "0.13.4"
|
|
||||||
|
|
||||||
# web:
|
|
||||||
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
|
||||||
wasm-bindgen-futures = "0.4.50"
|
|
||||||
web-sys = "0.3.70" # to access the DOM (to hide the loading text)
|
|
||||||
|
|
||||||
[profile.release]
|
|
||||||
opt-level = 2 # fast and small wasm
|
|
||||||
|
|
||||||
# Optimize all dependencies even in debug builds:
|
|
||||||
[profile.dev.package."*"]
|
|
||||||
opt-level = 2
|
|
||||||
|
|
||||||
|
|
||||||
[patch.crates-io]
|
|
||||||
|
|
||||||
# If you want to use the bleeding edge version of egui and eframe:
|
|
||||||
# egui = { git = "https://github.com/emilk/egui", branch = "main" }
|
|
||||||
# eframe = { git = "https://github.com/emilk/egui", branch = "main" }
|
|
||||||
|
|
||||||
# If you fork https://github.com/emilk/egui you can test with:
|
|
||||||
# egui = { path = "../egui/crates/egui" }
|
|
||||||
# eframe = { path = "../egui/crates/eframe" }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------------------------
|
|
||||||
# Lints:
|
|
||||||
|
|
||||||
[lints]
|
|
||||||
workspace = true
|
|
||||||
|
|
||||||
[workspace.lints.rust]
|
|
||||||
unsafe_code = "deny"
|
|
||||||
|
|
||||||
elided_lifetimes_in_paths = "warn"
|
|
||||||
future_incompatible = { level = "warn", priority = -1 }
|
|
||||||
nonstandard_style = { level = "warn", priority = -1 }
|
|
||||||
rust_2018_idioms = { level = "warn", priority = -1 }
|
|
||||||
rust_2021_prelude_collisions = "warn"
|
|
||||||
semicolon_in_expressions_from_macros = "warn"
|
|
||||||
trivial_numeric_casts = "warn"
|
|
||||||
unsafe_op_in_unsafe_fn = "warn" # `unsafe_op_in_unsafe_fn` may become the default in future Rust versions: https://github.com/rust-lang/rust/issues/71668
|
|
||||||
unused_extern_crates = "warn"
|
|
||||||
unused_import_braces = "warn"
|
|
||||||
unused_lifetimes = "warn"
|
|
||||||
|
|
||||||
trivial_casts = "allow"
|
|
||||||
unused_qualifications = "allow"
|
|
||||||
|
|
||||||
|
|
||||||
[workspace.lints.rustdoc]
|
|
||||||
all = "warn"
|
|
||||||
missing_crate_level_docs = "warn"
|
|
||||||
|
|
||||||
|
|
||||||
[workspace.lints.clippy]
|
|
||||||
allow_attributes = "warn"
|
|
||||||
as_ptr_cast_mut = "warn"
|
|
||||||
await_holding_lock = "warn"
|
|
||||||
bool_to_int_with_if = "warn"
|
|
||||||
char_lit_as_u8 = "warn"
|
|
||||||
checked_conversions = "warn"
|
|
||||||
clear_with_drain = "warn"
|
|
||||||
cloned_instead_of_copied = "warn"
|
|
||||||
dbg_macro = "warn"
|
|
||||||
debug_assert_with_mut_call = "warn"
|
|
||||||
derive_partial_eq_without_eq = "warn"
|
|
||||||
disallowed_macros = "warn" # See clippy.toml
|
|
||||||
disallowed_methods = "warn" # See clippy.toml
|
|
||||||
disallowed_names = "warn" # See clippy.toml
|
|
||||||
disallowed_script_idents = "warn" # See clippy.toml
|
|
||||||
disallowed_types = "warn" # See clippy.toml
|
|
||||||
doc_include_without_cfg = "warn"
|
|
||||||
doc_link_with_quotes = "warn"
|
|
||||||
doc_markdown = "warn"
|
|
||||||
empty_enum = "warn"
|
|
||||||
empty_enum_variants_with_brackets = "warn"
|
|
||||||
enum_glob_use = "warn"
|
|
||||||
equatable_if_let = "warn"
|
|
||||||
exit = "warn"
|
|
||||||
expl_impl_clone_on_copy = "warn"
|
|
||||||
explicit_deref_methods = "warn"
|
|
||||||
explicit_into_iter_loop = "warn"
|
|
||||||
explicit_iter_loop = "warn"
|
|
||||||
fallible_impl_from = "warn"
|
|
||||||
filter_map_next = "warn"
|
|
||||||
flat_map_option = "warn"
|
|
||||||
float_cmp_const = "warn"
|
|
||||||
fn_params_excessive_bools = "warn"
|
|
||||||
fn_to_numeric_cast_any = "warn"
|
|
||||||
from_iter_instead_of_collect = "warn"
|
|
||||||
get_unwrap = "warn"
|
|
||||||
implicit_clone = "warn"
|
|
||||||
imprecise_flops = "warn"
|
|
||||||
index_refutable_slice = "warn"
|
|
||||||
inefficient_to_string = "warn"
|
|
||||||
infinite_loop = "warn"
|
|
||||||
into_iter_without_iter = "warn"
|
|
||||||
invalid_upcast_comparisons = "warn"
|
|
||||||
iter_filter_is_ok = "warn"
|
|
||||||
iter_filter_is_some = "warn"
|
|
||||||
iter_not_returning_iterator = "warn"
|
|
||||||
iter_on_empty_collections = "warn"
|
|
||||||
iter_on_single_items = "warn"
|
|
||||||
iter_over_hash_type = "warn"
|
|
||||||
iter_without_into_iter = "warn"
|
|
||||||
large_digit_groups = "warn"
|
|
||||||
large_include_file = "warn"
|
|
||||||
large_stack_arrays = "warn"
|
|
||||||
large_stack_frames = "warn"
|
|
||||||
large_types_passed_by_value = "warn"
|
|
||||||
let_underscore_must_use = "warn"
|
|
||||||
let_underscore_untyped = "warn"
|
|
||||||
let_unit_value = "warn"
|
|
||||||
linkedlist = "warn"
|
|
||||||
literal_string_with_formatting_args = "warn"
|
|
||||||
lossy_float_literal = "warn"
|
|
||||||
macro_use_imports = "warn"
|
|
||||||
manual_assert = "warn"
|
|
||||||
manual_clamp = "warn"
|
|
||||||
manual_instant_elapsed = "warn"
|
|
||||||
manual_is_power_of_two = "warn"
|
|
||||||
manual_is_variant_and = "warn"
|
|
||||||
manual_let_else = "warn"
|
|
||||||
manual_ok_or = "warn"
|
|
||||||
manual_string_new = "warn"
|
|
||||||
map_err_ignore = "warn"
|
|
||||||
map_flatten = "warn"
|
|
||||||
match_bool = "warn"
|
|
||||||
match_on_vec_items = "warn"
|
|
||||||
match_same_arms = "warn"
|
|
||||||
match_wild_err_arm = "warn"
|
|
||||||
match_wildcard_for_single_variants = "warn"
|
|
||||||
mem_forget = "warn"
|
|
||||||
mismatching_type_param_order = "warn"
|
|
||||||
missing_assert_message = "warn"
|
|
||||||
missing_enforced_import_renames = "warn"
|
|
||||||
missing_safety_doc = "warn"
|
|
||||||
mixed_attributes_style = "warn"
|
|
||||||
mut_mut = "warn"
|
|
||||||
mutex_integer = "warn"
|
|
||||||
needless_borrow = "warn"
|
|
||||||
needless_continue = "warn"
|
|
||||||
needless_for_each = "warn"
|
|
||||||
needless_pass_by_ref_mut = "warn"
|
|
||||||
needless_pass_by_value = "warn"
|
|
||||||
negative_feature_names = "warn"
|
|
||||||
non_zero_suggestions = "warn"
|
|
||||||
nonstandard_macro_braces = "warn"
|
|
||||||
option_as_ref_cloned = "warn"
|
|
||||||
option_option = "warn"
|
|
||||||
path_buf_push_overwrite = "warn"
|
|
||||||
pathbuf_init_then_push = "warn"
|
|
||||||
ptr_as_ptr = "warn"
|
|
||||||
ptr_cast_constness = "warn"
|
|
||||||
pub_underscore_fields = "warn"
|
|
||||||
pub_without_shorthand = "warn"
|
|
||||||
rc_mutex = "warn"
|
|
||||||
readonly_write_lock = "warn"
|
|
||||||
redundant_type_annotations = "warn"
|
|
||||||
ref_as_ptr = "warn"
|
|
||||||
ref_option_ref = "warn"
|
|
||||||
rest_pat_in_fully_bound_structs = "warn"
|
|
||||||
same_functions_in_if_condition = "warn"
|
|
||||||
semicolon_if_nothing_returned = "warn"
|
|
||||||
set_contains_or_insert = "warn"
|
|
||||||
should_panic_without_expect = "warn"
|
|
||||||
single_char_pattern = "warn"
|
|
||||||
single_match_else = "warn"
|
|
||||||
str_split_at_newline = "warn"
|
|
||||||
str_to_string = "warn"
|
|
||||||
string_add = "warn"
|
|
||||||
string_add_assign = "warn"
|
|
||||||
string_lit_as_bytes = "warn"
|
|
||||||
string_lit_chars_any = "warn"
|
|
||||||
string_to_string = "warn"
|
|
||||||
suspicious_command_arg_space = "warn"
|
|
||||||
suspicious_xor_used_as_pow = "warn"
|
|
||||||
todo = "warn"
|
|
||||||
too_long_first_doc_paragraph = "warn"
|
|
||||||
too_many_lines = "warn"
|
|
||||||
trailing_empty_array = "warn"
|
|
||||||
trait_duplication_in_bounds = "warn"
|
|
||||||
tuple_array_conversions = "warn"
|
|
||||||
unchecked_duration_subtraction = "warn"
|
|
||||||
undocumented_unsafe_blocks = "warn"
|
|
||||||
unimplemented = "warn"
|
|
||||||
uninhabited_references = "warn"
|
|
||||||
uninlined_format_args = "warn"
|
|
||||||
unnecessary_box_returns = "warn"
|
|
||||||
unnecessary_literal_bound = "warn"
|
|
||||||
unnecessary_safety_doc = "warn"
|
|
||||||
unnecessary_struct_initialization = "warn"
|
|
||||||
unnecessary_wraps = "warn"
|
|
||||||
unnested_or_patterns = "warn"
|
|
||||||
unused_peekable = "warn"
|
|
||||||
unused_rounding = "warn"
|
|
||||||
unused_self = "warn"
|
|
||||||
unused_trait_names = "warn"
|
|
||||||
unwrap_used = "warn"
|
|
||||||
use_self = "warn"
|
|
||||||
useless_transmute = "warn"
|
|
||||||
verbose_file_reads = "warn"
|
|
||||||
wildcard_dependencies = "warn"
|
|
||||||
wildcard_imports = "warn"
|
|
||||||
zero_sized_map_values = "warn"
|
|
||||||
|
|
||||||
manual_range_contains = "allow" # this is better on 'allow'
|
|
||||||
map_unwrap_or = "allow" # this is better on 'allow'
|
|
||||||
|
|||||||
@ -1,135 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
|
||||||
|
|
||||||
<!-- Disable zooming: -->
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<!-- change this to your project name -->
|
|
||||||
<title>eframe template</title>
|
|
||||||
|
|
||||||
<!-- config for our rust wasm binary. go to https://trunkrs.dev/assets/#rust for more customization -->
|
|
||||||
<link data-trunk rel="rust" data-wasm-opt="2" />
|
|
||||||
<!-- this is the base url relative to which other urls will be constructed. trunk will insert this from the public-url option -->
|
|
||||||
<base data-trunk-public-url />
|
|
||||||
|
|
||||||
<meta name="theme-color" media="(prefers-color-scheme: light)" content="white">
|
|
||||||
<meta name="theme-color" media="(prefers-color-scheme: dark)" content="#404040">
|
|
||||||
|
|
||||||
<style>
|
|
||||||
html {
|
|
||||||
/* Remove touch delay: */
|
|
||||||
touch-action: manipulation;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
/* Light mode background color for what is not covered by the egui canvas,
|
|
||||||
or where the egui canvas is translucent. */
|
|
||||||
background: #909090;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (prefers-color-scheme: dark) {
|
|
||||||
body {
|
|
||||||
/* Dark mode background color for what is not covered by the egui canvas,
|
|
||||||
or where the egui canvas is translucent. */
|
|
||||||
background: #404040;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Allow canvas to fill entire web page: */
|
|
||||||
html,
|
|
||||||
body {
|
|
||||||
overflow: hidden;
|
|
||||||
margin: 0 !important;
|
|
||||||
padding: 0 !important;
|
|
||||||
height: 100%;
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Make canvas fill entire document: */
|
|
||||||
canvas {
|
|
||||||
margin-right: auto;
|
|
||||||
margin-left: auto;
|
|
||||||
display: block;
|
|
||||||
position: absolute;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.centered {
|
|
||||||
margin-right: auto;
|
|
||||||
margin-left: auto;
|
|
||||||
display: block;
|
|
||||||
position: absolute;
|
|
||||||
top: 50%;
|
|
||||||
left: 50%;
|
|
||||||
transform: translate(-50%, -50%);
|
|
||||||
color: #f0f0f0;
|
|
||||||
font-size: 24px;
|
|
||||||
font-family: Ubuntu-Light, Helvetica, sans-serif;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ---------------------------------------------- */
|
|
||||||
/* Loading animation from https://loading.io/css/ */
|
|
||||||
.lds-dual-ring {
|
|
||||||
display: inline-block;
|
|
||||||
width: 24px;
|
|
||||||
height: 24px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.lds-dual-ring:after {
|
|
||||||
content: " ";
|
|
||||||
display: block;
|
|
||||||
width: 24px;
|
|
||||||
height: 24px;
|
|
||||||
margin: 0px;
|
|
||||||
border-radius: 50%;
|
|
||||||
border: 3px solid #fff;
|
|
||||||
border-color: #fff transparent #fff transparent;
|
|
||||||
animation: lds-dual-ring 1.2s linear infinite;
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes lds-dual-ring {
|
|
||||||
0% {
|
|
||||||
transform: rotate(0deg);
|
|
||||||
}
|
|
||||||
|
|
||||||
100% {
|
|
||||||
transform: rotate(360deg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<!-- The WASM code will resize the canvas dynamically -->
|
|
||||||
<!-- the id is hardcoded in main.rs . so, make sure both match. -->
|
|
||||||
<canvas id="the_canvas_id"></canvas>
|
|
||||||
|
|
||||||
<!-- the loading spinner will be removed in main.rs -->
|
|
||||||
<div class="centered" id="loading_text">
|
|
||||||
<p style="font-size:16px">
|
|
||||||
Loading…
|
|
||||||
</p>
|
|
||||||
<div class="lds-dual-ring"></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!--Register Service Worker. this will cache the wasm / js scripts for offline use (for PWA functionality). -->
|
|
||||||
<!-- Force refresh (Ctrl + F5) to load the latest files instead of cached files -->
|
|
||||||
<script>
|
|
||||||
// We disable caching during development so that we always view the latest version.
|
|
||||||
if ('serviceWorker' in navigator && window.location.hash !== "#dev") {
|
|
||||||
window.addEventListener('load', function () {
|
|
||||||
navigator.serviceWorker.register('sw.js');
|
|
||||||
});
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
||||||
|
|
||||||
<!-- Powered by egui: https://github.com/emilk/egui/ -->
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
// use sha2::{Sha256, Digest};
|
|
||||||
// use secp256k1::rand;
|
|
||||||
// use secp256k1::{Secp256k1, PublicKey, SecretKey};
|
|
||||||
// use shared::core::Address;
|
|
||||||
//
|
|
||||||
// #[derive(Debug)]
|
|
||||||
// pub struct Account {
|
|
||||||
// address: Address,
|
|
||||||
// balance: u64,
|
|
||||||
// nonce: u64,
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// impl Account {
|
|
||||||
// pub fn public_key_to_address(public_key: &PublicKey) -> Address {
|
|
||||||
// let pk_ser = public_key.serialize();
|
|
||||||
// let hash = Sha256::digest(&pk_ser);
|
|
||||||
// hex::encode(&hash[..20])
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// pub fn nonce(&self) -> u64 {
|
|
||||||
// self.nonce
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// pub fn balance(&self) -> u64 {
|
|
||||||
// self.balance
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// pub fn address(&self) -> &Address {
|
|
||||||
// &self.address
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// pub fn new() -> Self {
|
|
||||||
// let secp = Secp256k1::new();
|
|
||||||
// let (secret_key, public_key) = secp.generate_keypair(&mut rand::rng());
|
|
||||||
// let addr = Self::public_key_to_address(&public_key);
|
|
||||||
//
|
|
||||||
// println!("{:?}", secret_key);
|
|
||||||
//
|
|
||||||
// Self {
|
|
||||||
// address: addr,
|
|
||||||
// balance: 0,
|
|
||||||
// nonce: 0,
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// #[test]
|
|
||||||
// fn test_acc_new() {
|
|
||||||
// Account::new();
|
|
||||||
// }
|
|
||||||
@ -1,125 +0,0 @@
|
|||||||
use egui_file::FileDialog;
|
|
||||||
|
|
||||||
/// We derive Deserialize/Serialize so we can persist app state on shutdown.
|
|
||||||
#[derive(serde::Deserialize, serde::Serialize)]
|
|
||||||
#[serde(default)] // if we add new fields, give them default values when deserializing old state
|
|
||||||
pub struct TemplateApp {
|
|
||||||
// Example stuff:
|
|
||||||
label: String,
|
|
||||||
|
|
||||||
#[serde(skip)] // This how you opt-out of serialization of a field
|
|
||||||
value: f32,
|
|
||||||
#[serde(skip)]
|
|
||||||
file_dialog: Option<FileDialog>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Default for TemplateApp {
|
|
||||||
fn default() -> Self {
|
|
||||||
Self {
|
|
||||||
// Example stuff:
|
|
||||||
label: "Hello World!".to_owned(),
|
|
||||||
value: 2.7,
|
|
||||||
file_dialog: None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TemplateApp {
|
|
||||||
/// Called once before the first frame.
|
|
||||||
pub fn new(cc: &eframe::CreationContext<'_>) -> Self {
|
|
||||||
// This is also where you can customize the look and feel of egui using
|
|
||||||
// `cc.egui_ctx.set_visuals` and `cc.egui_ctx.set_fonts`.
|
|
||||||
|
|
||||||
// Load previous app state (if any).
|
|
||||||
// Note that you must enable the `persistence` feature for this to work.
|
|
||||||
if let Some(storage) = cc.storage {
|
|
||||||
eframe::get_value(storage, eframe::APP_KEY).unwrap_or_default()
|
|
||||||
} else {
|
|
||||||
Default::default()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl eframe::App for TemplateApp {
|
|
||||||
/// Called by the framework to save state before shutdown.
|
|
||||||
fn save(&mut self, storage: &mut dyn eframe::Storage) {
|
|
||||||
eframe::set_value(storage, eframe::APP_KEY, self);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Called each time the UI needs repainting, which may be many times per second.
|
|
||||||
fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
|
|
||||||
// Put your widgets into a `SidePanel`, `TopBottomPanel`, `CentralPanel`, `Window` or `Area`.
|
|
||||||
// For inspiration and more examples, go to https://emilk.github.io/egui
|
|
||||||
|
|
||||||
egui::TopBottomPanel::top("top_panel").show(ctx, |ui| {
|
|
||||||
// The top panel is often a good place for a menu bar:
|
|
||||||
|
|
||||||
egui::MenuBar::new().ui(ui, |ui| {
|
|
||||||
// NOTE: no File->Quit on web pages!
|
|
||||||
let is_web = cfg!(target_arch = "wasm32");
|
|
||||||
if !is_web {
|
|
||||||
ui.menu_button("File", |ui| {
|
|
||||||
if ui.button("Quit").clicked() {
|
|
||||||
ctx.send_viewport_cmd(egui::ViewportCommand::Close);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
ui.add_space(16.0);
|
|
||||||
}
|
|
||||||
|
|
||||||
egui::widgets::global_theme_preference_buttons(ui);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
egui::CentralPanel::default().show(ctx, |ui| {
|
|
||||||
// The central panel the region left after adding TopPanel's and SidePanel's
|
|
||||||
ui.heading("eframe template");
|
|
||||||
|
|
||||||
ui.horizontal(|ui| {
|
|
||||||
ui.label("Write something: ");
|
|
||||||
ui.text_edit_singleline(&mut self.label);
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
if ui.button("Open File").clicked() {
|
|
||||||
let mut dialog = FileDialog::open_file(None);
|
|
||||||
dialog.open();
|
|
||||||
self.file_dialog = Some(dialog);
|
|
||||||
}
|
|
||||||
|
|
||||||
ui.add(egui::Slider::new(&mut self.value, 0.0..=10.0).text("value"));
|
|
||||||
if ui.button("Increment").clicked() {
|
|
||||||
self.value += 1.0;
|
|
||||||
}
|
|
||||||
|
|
||||||
ui.separator();
|
|
||||||
|
|
||||||
if let Some(dialog) = &mut self.file_dialog {
|
|
||||||
dialog.pick_file()
|
|
||||||
}
|
|
||||||
|
|
||||||
ui.add(egui::github_link_file!(
|
|
||||||
"https://github.com/emilk/eframe_template/blob/main/",
|
|
||||||
"Source code."
|
|
||||||
));
|
|
||||||
|
|
||||||
ui.with_layout(egui::Layout::bottom_up(egui::Align::LEFT), |ui| {
|
|
||||||
powered_by_egui_and_eframe(ui);
|
|
||||||
egui::warn_if_debug_build(ui);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn powered_by_egui_and_eframe(ui: &mut egui::Ui) {
|
|
||||||
ui.horizontal(|ui| {
|
|
||||||
ui.spacing_mut().item_spacing.x = 0.0;
|
|
||||||
ui.label("Powered by ");
|
|
||||||
ui.hyperlink_to("egui", "https://github.com/emilk/egui");
|
|
||||||
ui.label(" and ");
|
|
||||||
ui.hyperlink_to(
|
|
||||||
"eframe",
|
|
||||||
"https://github.com/emilk/egui/tree/master/crates/eframe",
|
|
||||||
);
|
|
||||||
ui.label(".");
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@ -1,2 +1 @@
|
|||||||
mod app;
|
pub mod wallet;
|
||||||
pub use app::TemplateApp;
|
|
||||||
|
|||||||
@ -1,67 +0,0 @@
|
|||||||
#![warn(clippy::all, rust_2018_idioms)]
|
|
||||||
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
|
|
||||||
|
|
||||||
// When compiling natively:
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
|
||||||
fn main() -> eframe::Result {
|
|
||||||
env_logger::init(); // Log to stderr (if you run with `RUST_LOG=debug`).
|
|
||||||
|
|
||||||
let native_options = eframe::NativeOptions {
|
|
||||||
viewport: egui::ViewportBuilder::default()
|
|
||||||
.with_inner_size([400.0, 300.0])
|
|
||||||
.with_min_inner_size([300.0, 220.0]),
|
|
||||||
..Default::default()
|
|
||||||
};
|
|
||||||
eframe::run_native(
|
|
||||||
"eframe template",
|
|
||||||
native_options,
|
|
||||||
Box::new(|cc| Ok(Box::new(wallet::TemplateApp::new(cc)))),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// When compiling to web using trunk:
|
|
||||||
#[cfg(target_arch = "wasm32")]
|
|
||||||
fn main() {
|
|
||||||
use eframe::wasm_bindgen::JsCast as _;
|
|
||||||
|
|
||||||
// Redirect `log` message to `console.log` and friends:
|
|
||||||
eframe::WebLogger::init(log::LevelFilter::Debug).ok();
|
|
||||||
|
|
||||||
let web_options = eframe::WebOptions::default();
|
|
||||||
|
|
||||||
wasm_bindgen_futures::spawn_local(async {
|
|
||||||
let document = web_sys::window()
|
|
||||||
.expect("No window")
|
|
||||||
.document()
|
|
||||||
.expect("No document");
|
|
||||||
|
|
||||||
let canvas = document
|
|
||||||
.get_element_by_id("the_canvas_id")
|
|
||||||
.expect("Failed to find the_canvas_id")
|
|
||||||
.dyn_into::<web_sys::HtmlCanvasElement>()
|
|
||||||
.expect("the_canvas_id was not a HtmlCanvasElement");
|
|
||||||
|
|
||||||
let start_result = eframe::WebRunner::new()
|
|
||||||
.start(
|
|
||||||
canvas,
|
|
||||||
web_options,
|
|
||||||
Box::new(|cc| Ok(Box::new(wallet::TemplateApp::new(cc)))),
|
|
||||||
)
|
|
||||||
.await;
|
|
||||||
|
|
||||||
// Remove the loading text and spinner:
|
|
||||||
if let Some(loading_text) = document.get_element_by_id("loading_text") {
|
|
||||||
match start_result {
|
|
||||||
Ok(_) => {
|
|
||||||
loading_text.remove();
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
loading_text.set_inner_html(
|
|
||||||
"<p> The app has crashed. See the developer console for details. </p>",
|
|
||||||
);
|
|
||||||
panic!("Failed to start eframe: {e:?}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
63
wallet/src/wallet.rs
Normal file
63
wallet/src/wallet.rs
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
use k256::sha2::{Sha256, Digest};
|
||||||
|
use k256::ecdsa::{
|
||||||
|
self,
|
||||||
|
SigningKey,
|
||||||
|
VerifyingKey,
|
||||||
|
RecoveryId,
|
||||||
|
Signature,
|
||||||
|
};
|
||||||
|
use shared::core::Address;
|
||||||
|
use k256::elliptic_curve::rand_core::OsRng;
|
||||||
|
use sha3::Keccak256;
|
||||||
|
|
||||||
|
use shared::core::{ Tx, SignedTransaction };
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct Wallet {
|
||||||
|
address: Address,
|
||||||
|
balance: u64,
|
||||||
|
nonce: u64,
|
||||||
|
private_key: SigningKey,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn sign_key_test() -> Result<(Signature, RecoveryId), ecdsa::Error> {
|
||||||
|
let signing_key = SigningKey::random(&mut OsRng);
|
||||||
|
|
||||||
|
let message = b"ECDSA message";
|
||||||
|
|
||||||
|
let hash = Keccak256::digest(message);
|
||||||
|
signing_key.sign_prehash_recoverable(&hash)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn verify_message(
|
||||||
|
message: &[u8; 32],
|
||||||
|
signature: &Signature,
|
||||||
|
recovery_id: &RecoveryId
|
||||||
|
) -> Result<VerifyingKey, ecdsa::Error>{
|
||||||
|
VerifyingKey::recover_from_prehash(message, signature, *recovery_id)
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Wallet {
|
||||||
|
pub fn address_from_pubkey(key: VerifyingKey) -> Address {
|
||||||
|
let addr = key.to_encoded_point(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn new() -> Self {
|
||||||
|
let key = SigningKey::random(&mut OsRng);
|
||||||
|
let pub_key = key.verifying_key();
|
||||||
|
Self {
|
||||||
|
nonce: 0,
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn sign(&self, transaction: Tx) -> SignedTransaction {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_acc_new() {
|
||||||
|
Wallet::new();
|
||||||
|
let (k, r) = sign_key_test().unwrap();
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user