Compare commits

...

7 Commits

Author SHA1 Message Date
794f5baee3 Extracted args
All checks were successful
continuous-integration/drone/push Build is passing
2021-06-16 22:16:22 +01:00
1e8f9da839 formatting
All checks were successful
continuous-integration/drone/push Build is passing
2021-06-16 22:00:05 +01:00
b7d9d19c4c initial node parameters
Some checks failed
continuous-integration/drone/push Build is failing
2021-06-16 21:59:12 +01:00
63a746521c formatting
All checks were successful
continuous-integration/drone/push Build is passing
2021-06-16 21:08:49 +01:00
eb594f2b89 node arguments
Some checks failed
continuous-integration/drone/push Build is failing
2021-06-16 21:07:26 +01:00
d2bef67eaa Empty validate_chain function 2021-06-16 21:05:33 +01:00
e0dc8c845a Began adding chain logic
All checks were successful
continuous-integration/drone/push Build is passing
2021-06-14 22:43:43 +01:00
7 changed files with 342 additions and 2 deletions

222
Cargo.lock generated
View File

@ -1,17 +1,239 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
name = "ansi_term"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
dependencies = [
"winapi",
]
[[package]]
name = "atty"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
"hermit-abi",
"libc",
"winapi",
]
[[package]]
name = "bitflags"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
[[package]]
name = "clap"
version = "2.33.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
dependencies = [
"ansi_term",
"atty",
"bitflags",
"strsim",
"textwrap",
"unicode-width",
"vec_map",
]
[[package]]
name = "currency"
version = "0.1.0"
[[package]]
name = "farm"
version = "0.1.0"
[[package]]
name = "heck"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
dependencies = [
"unicode-segmentation",
]
[[package]]
name = "hermit-abi"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
dependencies = [
"libc",
]
[[package]]
name = "lazy_static"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
version = "0.2.97"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6"
[[package]]
name = "node"
version = "0.1.0"
dependencies = [
"structopt",
]
[[package]]
name = "plot"
version = "0.1.0"
[[package]]
name = "proc-macro-error"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
"syn",
"version_check",
]
[[package]]
name = "proc-macro-error-attr"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
"proc-macro2",
"quote",
"version_check",
]
[[package]]
name = "proc-macro2"
version = "1.0.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
dependencies = [
"unicode-xid",
]
[[package]]
name = "quote"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
dependencies = [
"proc-macro2",
]
[[package]]
name = "strsim"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "structopt"
version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c"
dependencies = [
"clap",
"lazy_static",
"structopt-derive",
]
[[package]]
name = "structopt-derive"
version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90"
dependencies = [
"heck",
"proc-macro-error",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "syn"
version = "1.0.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7"
dependencies = [
"proc-macro2",
"quote",
"unicode-xid",
]
[[package]]
name = "textwrap"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
dependencies = [
"unicode-width",
]
[[package]]
name = "unicode-segmentation"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
[[package]]
name = "unicode-width"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
[[package]]
name = "unicode-xid"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
[[package]]
name = "vec_map"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "version_check"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
[[package]]
name = "wallet"
version = "0.1.0"
[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
]
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

View File

@ -1,6 +1,7 @@
[workspace]
members = [
"currency",
"farm",
"node",
"plot",

9
currency/Cargo.toml Normal file
View File

@ -0,0 +1,9 @@
[package]
name = "currency"
version = "0.1.0"
authors = ["Jake Hillion <jake@hillion.co.uk>"]
edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]

42
currency/src/lib.rs Normal file
View File

@ -0,0 +1,42 @@
use std::collections::HashMap;
type Hash = [u8; 64];
type Signature = [u8; 64];
type Address = [u8; 32];
type ChainHeight = u64;
type ChainSize = u64;
type Cost = u128;
type ChainIndex = u64;
pub enum ValidationError {}
pub struct BeaconEntry {
pub prev: Hash,
pub height: ChainHeight,
}
pub struct ShardEntry {
pub prev: Hash,
pub height: ChainHeight,
pub transactions: Vec<Transaction>,
}
pub struct Transaction {
pub address: Address,
pub signature: Signature,
}
impl Transaction {
fn get_cost(transaction: &Transaction, sizes: HashMap<ChainIndex, ChainSize>) -> Cost {
todo!()
}
}
pub fn validate_chain<T>(
top: Hash,
getter: HashMap<ChainIndex, &dyn Fn(Hash) -> Result<ShardEntry, T>>,
) -> Result<Result<(), ValidationError>, T> {
Ok(Ok(()))
}

View File

@ -7,3 +7,4 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
structopt = "0.3"

52
node/src/args.rs Normal file
View File

@ -0,0 +1,52 @@
use std::net::SocketAddr;
use std::net::ToSocketAddrs;
use std::path::PathBuf;
use std::io;
use structopt::StructOpt;
pub const DEFAULT_PORT: u16 = 8443;
const DEFAULT_PORT_STR: &str = "8443";
#[derive(Debug, StructOpt)]
pub enum Args {
/// Run the node
Run(Run),
}
impl Args {
pub fn from_args() -> Self {
StructOpt::from_args()
}
}
#[derive(Debug, StructOpt)]
pub struct Run {
/// Exit once the node has caught up
#[structopt(short = "s", long = "short")]
short: bool,
/// Fork and run as a daemon
#[structopt(short = "d", long = "daemon")]
daemon: bool,
/// Port on which to run the node
#[structopt(short = "p", long = "port", default_value = DEFAULT_PORT_STR)]
port: u16,
/// Path in which to store node content
#[structopt(long = "path", default_value = ".unnamed/node")]
path: PathBuf,
/// Nodes to initially connect to
#[structopt(long = "initial_nodes", parse(try_from_str = parse_connection_address))]
initial_nodes: Vec<SocketAddr>,
}
fn parse_connection_address(arg: &str) -> io::Result<SocketAddr> {
let mut addrs = arg
.to_socket_addrs()
.or_else(|_| (arg, DEFAULT_PORT).to_socket_addrs())?;
Ok(addrs.next().expect("no socket addr"))
}

View File

@ -1,3 +1,16 @@
fn main() {
println!("Hello, world!");
mod args;
#[derive(Debug)]
enum Error {}
fn main() -> Result<(), Error> {
let node = args::Args::from_args();
match node {
args::Args::Run(args) => run(&args),
}
}
fn run(args: &args::Run) -> Result<(), Error> {
Ok(())
}