Skip to content

Commit

Permalink
Imported template substrate projects. (0xProject#51)
Browse files Browse the repository at this point in the history
Made changes to the ci to not build the substrate as well.
  • Loading branch information
Paul Vienhage authored Aug 13, 2019
1 parent 85247d8 commit a0e74ab
Show file tree
Hide file tree
Showing 22 changed files with 1,276 additions and 10 deletions.
21 changes: 16 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@ jobs:
command: |
sudo apt-get update
sudo apt-get install jq
sudo apt-get install -y cmake
sudo apt-get install -y pkg-config
sudo apt-get install libssl-dev
sudo apt-get install git
sudo apt-get install -y clang
sudo apt-get install -y libclang-dev
rustup update nightly
rustup target add wasm32-unknown-unknown --toolchain nightly
rustup update stable
cargo install --git https://github.com/alexcrichton/wasm-gc
rustup component add rustfmt clippy
rustup toolchain install nightly-2019-07-31
rustup component add rustfmt --toolchain nightly-2019-07-31
Expand All @@ -35,16 +45,17 @@ jobs:
- run:
name: Linting
command: |
cargo +nightly-2019-07-31 fmt --all -- --check
cargo clippy --all --all-targets
cargo +nightly-2019-07-31 fmt -p ecc primefield starkdex starkcrypto-wasm stark macros-decl macros-impl macros-lib -- --check
cargo clippy -p ecc -p primefield -p starkdex -p starkcrypto-wasm -p stark -p macros-decl -p macros-impl -p macros-lib --all-targets
- run:
name: Build all targets
command: cargo build --all --all-targets
command: |
cargo build -p ecc -p primefield -p starkdex -p starkcrypto-wasm -p stark -p macros-decl -p macros-impl -p macros-lib --all-targets
- run:
name: Test in debug and release mode
command: |
cargo test --all -- --nocapture
cargo test --release -- --nocapture
cargo test -p ecc -p primefield -p starkdex -p starkcrypto-wasm -p stark -p macros-decl -p macros-impl -p macros-lib -- --nocapture
cargo test --release -p ecc -p primefield -p starkdex -p starkcrypto-wasm -p stark -p macros-decl -p macros-impl -p macros-lib -- --nocapture
- run:
name: Run benchmarks as tests
command: |
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ wasm-pack.log

# Vim swap files
*.swp

# Ignore the substrate ui for now
substrate-ui
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ members = [
"macros_decl",
"macros_impl",
"macros_lib",
"substrate-node",
]

# Don't forget to run `cargo clean` to force a rebuild of all dependencies!
Expand Down
2 changes: 1 addition & 1 deletion rustfmt.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ space_after_colon = true
format_code_in_doc_comments = true
overflow_delimited_expr = true
blank_lines_lower_bound = 0
normalize_doc_attributes = true
normalize_doc_attributes = true
8 changes: 4 additions & 4 deletions stark/src/proofs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ pub struct ProofParams {
#[allow(clippy::type_complexity)]
pub struct Constraint<'a, Public> {
pub num_constraints: usize,
pub eval: &'a Fn(
pub eval: &'a dyn Fn(
&FieldElement, // X point
&[&[FieldElement]], // Polynomials
&Public, // Public input
&[FieldElement], // Constraint_coefficient
) -> FieldElement,
pub eval_loop: Option<
&'a Fn(
&'a dyn Fn(
&[&[FieldElement]], // Evaluated polynomials (LDEn)
&[FieldElement], // Constraint Coefficents
&Public, // Public input
Expand All @@ -104,14 +104,14 @@ impl<'a> Constraint<'a, PublicInput> {
#[allow(clippy::type_complexity)]
pub fn new(
num_constraints: usize,
eval: &'a Fn(
eval: &'a dyn Fn(
&FieldElement,
&[&[FieldElement]],
&PublicInput,
&[FieldElement],
) -> FieldElement,
eval_loop: Option<
&'a Fn(&[&[FieldElement]], &[FieldElement], &PublicInput) -> Vec<FieldElement>,
&'a dyn Fn(&[&[FieldElement]], &[FieldElement], &PublicInput) -> Vec<FieldElement>,
>,
) -> Self {
Self {
Expand Down
83 changes: 83 additions & 0 deletions substrate-node/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
[package]
authors = ['Parity Technologies <[email protected]>']
build = 'build.rs'
edition = '2018'
name = 'substrate-node'
version = '1.0.0'

[dependencies]
error-chain = '0.12'
exit-future = '0.1'
futures = '0.1'
hex-literal = '0.1'
log = '0.4'
parity-codec = '3.2'
parking_lot = '0.7.1'
tokio = '0.1'
trie-root = '0.12.0'

[dependencies.basic-authorship]
git = 'https://github.com/paritytech/substrate.git'
package = 'substrate-basic-authorship'
rev = 'fc206f3a009b64fc746202e5b4c701bf7e24d1f1'

[dependencies.consensus]
git = 'https://github.com/paritytech/substrate.git'
package = 'substrate-consensus-aura'
rev = 'fc206f3a009b64fc746202e5b4c701bf7e24d1f1'

[dependencies.ctrlc]
features = ['termination']
version = '3.0'

[dependencies.inherents]
git = 'https://github.com/paritytech/substrate.git'
package = 'substrate-inherents'
rev = 'fc206f3a009b64fc746202e5b4c701bf7e24d1f1'

[dependencies.network]
git = 'https://github.com/paritytech/substrate.git'
package = 'substrate-network'
rev = 'fc206f3a009b64fc746202e5b4c701bf7e24d1f1'

[dependencies.substrate-node-runtime]
path = 'runtime'

[dependencies.primitives]
git = 'https://github.com/paritytech/substrate.git'
package = 'substrate-primitives'
rev = 'fc206f3a009b64fc746202e5b4c701bf7e24d1f1'

[dependencies.sr-io]
git = 'https://github.com/paritytech/substrate.git'
rev = 'fc206f3a009b64fc746202e5b4c701bf7e24d1f1'

[dependencies.substrate-cli]
git = 'https://github.com/paritytech/substrate.git'
rev = 'fc206f3a009b64fc746202e5b4c701bf7e24d1f1'

[dependencies.substrate-client]
git = 'https://github.com/paritytech/substrate.git'
rev = 'fc206f3a009b64fc746202e5b4c701bf7e24d1f1'

[dependencies.substrate-executor]
git = 'https://github.com/paritytech/substrate.git'
rev = 'fc206f3a009b64fc746202e5b4c701bf7e24d1f1'

[dependencies.substrate-service]
git = 'https://github.com/paritytech/substrate.git'
rev = 'fc206f3a009b64fc746202e5b4c701bf7e24d1f1'

[dependencies.transaction-pool]
git = 'https://github.com/paritytech/substrate.git'
package = 'substrate-transaction-pool'
rev = 'fc206f3a009b64fc746202e5b4c701bf7e24d1f1'

[build-dependencies]
vergen = '3'
[profile.release]
panic = 'unwind'

[[bin]]
name = 'substrate-node'
path = 'src/main.rs'
24 changes: 24 additions & 0 deletions substrate-node/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
This is free and unencumbered software released into the public domain.

Anyone is free to copy, modify, publish, use, compile, sell, or
distribute this software, either in source code form or as a compiled
binary, for any purpose, commercial or non-commercial, and by any
means.

In jurisdictions that recognize copyright laws, the author or authors
of this software dedicate any and all copyright interest in the
software to the public domain. We make this dedication for the benefit
of the public at large and to the detriment of our heirs and
successors. We intend this dedication to be an overt act of
relinquishment in perpetuity of all present and future rights to this
software under copyright law.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

For more information, please refer to <http://unlicense.org>
67 changes: 67 additions & 0 deletions substrate-node/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# Our substrate node
This package is a thin node template from the substrate team which we are modifying to run the STARK based exchange chain. Please see below for the node building and deploying instructions from the Substrate team :

# Building

Install Rust:

```bash
curl https://sh.rustup.rs -sSf | sh
```

Install required tools:

```bash
./scripts/init.sh
```

Build the WebAssembly binary:

```bash
./scripts/build.sh
```

Build all native code:

```bash
cargo build
```

# Run

You can start a development chain with:

```bash
cargo run -- --dev
```

Detailed logs may be shown by running the node with the following environment variables set: `RUST_LOG=debug RUST_BACKTRACE=1 cargo run -- --dev`.

If you want to see the multi-node consensus algorithm in action locally, then you can create a local testnet with two validator nodes for Alice and Bob, who are the initial authorities of the genesis chain that have been endowed with testnet units. Give each node a name and expose them so they are listed on the Polkadot [telemetry site](https://telemetry.polkadot.io/#/Local%20Testnet). You'll need two terminal windows open.

We'll start Alice's substrate node first on default TCP port 30333 with her chain database stored locally at `/tmp/alice`. The bootnode ID of her node is `QmQZ8TjTqeDj3ciwr93EJ95hxfDsb9pEYDizUAbWpigtQN`, which is generated from the `--node-key` value that we specify below:

```bash
cargo run -- \
--base-path /tmp/alice \
--chain=local \
--alice \
--node-key 0000000000000000000000000000000000000000000000000000000000000001 \
--telemetry-url ws://telemetry.polkadot.io:1024 \
--validator
```

In the second terminal, we'll start Bob's substrate node on a different TCP port of 30334, and with his chain database stored locally at `/tmp/bob`. We'll specify a value for the `--bootnodes` option that will connect his node to Alice's bootnode ID on TCP port 30333:

```bash
cargo run -- \
--base-path /tmp/bob \
--bootnodes /ip4/127.0.0.1/tcp/30333/p2p/QmQZ8TjTqeDj3ciwr93EJ95hxfDsb9pEYDizUAbWpigtQN \
--chain=local \
--bob \
--port 30334 \
--telemetry-url ws://telemetry.polkadot.io:1024 \
--validator
```

Additional CLI usage options are available and may be shown by running `cargo run -- --help`.
8 changes: 8 additions & 0 deletions substrate-node/build.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
use vergen::{generate_cargo_keys, ConstantsFlags};

const ERROR_MSG: &str = "Failed to generate metadata files";

fn main() {
generate_cargo_keys(ConstantsFlags::all()).expect(ERROR_MSG);
println!("cargo:rerun-if-changed=.git/HEAD");
}
Loading

0 comments on commit a0e74ab

Please sign in to comment.