Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rename the coins folder to networks
Browse files Browse the repository at this point in the history
Ethereum isn't a coin. It's a network.

Resolves #357.
kayabaNerve committed Jul 17, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 40cc180 commit acb4c08
Showing 227 changed files with 96 additions and 95 deletions.
2 changes: 1 addition & 1 deletion .github/actions/bitcoin/action.yml
Original file line number Diff line number Diff line change
@@ -37,4 +37,4 @@ runs:
- name: Bitcoin Regtest Daemon
shell: bash
run: PATH=$PATH:/usr/bin ./orchestration/dev/coins/bitcoin/run.sh -daemon
run: PATH=$PATH:/usr/bin ./orchestration/dev/networks/bitcoin/run.sh -daemon
2 changes: 1 addition & 1 deletion .github/actions/monero/action.yml
Original file line number Diff line number Diff line change
@@ -43,4 +43,4 @@ runs:
- name: Monero Regtest Daemon
shell: bash
run: PATH=$PATH:/usr/bin ./orchestration/dev/coins/monero/run.sh --detach
run: PATH=$PATH:/usr/bin ./orchestration/dev/networks/monero/run.sh --detach
4 changes: 2 additions & 2 deletions .github/workflows/coordinator-tests.yml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ on:
paths:
- "common/**"
- "crypto/**"
- "coins/**"
- "networks/**"
- "message-queue/**"
- "coordinator/**"
- "orchestration/**"
@@ -18,7 +18,7 @@ on:
paths:
- "common/**"
- "crypto/**"
- "coins/**"
- "networks/**"
- "message-queue/**"
- "coordinator/**"
- "orchestration/**"
4 changes: 2 additions & 2 deletions .github/workflows/monero-tests.yaml
Original file line number Diff line number Diff line change
@@ -5,12 +5,12 @@ on:
branches:
- develop
paths:
- "coins/monero/**"
- "networks/monero/**"
- "processor/**"

pull_request:
paths:
- "coins/monero/**"
- "networks/monero/**"
- "processor/**"

workflow_dispatch:
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: coins/ Tests
name: networks/ Tests

on:
push:
@@ -7,13 +7,13 @@ on:
paths:
- "common/**"
- "crypto/**"
- "coins/**"
- "networks/**"

pull_request:
paths:
- "common/**"
- "crypto/**"
- "coins/**"
- "networks/**"

workflow_dispatch:

4 changes: 2 additions & 2 deletions .github/workflows/no-std.yml
Original file line number Diff line number Diff line change
@@ -7,14 +7,14 @@ on:
paths:
- "common/**"
- "crypto/**"
- "coins/**"
- "networks/**"
- "tests/no-std/**"

pull_request:
paths:
- "common/**"
- "crypto/**"
- "coins/**"
- "networks/**"
- "tests/no-std/**"

workflow_dispatch:
4 changes: 2 additions & 2 deletions .github/workflows/processor-tests.yml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ on:
paths:
- "common/**"
- "crypto/**"
- "coins/**"
- "networks/**"
- "message-queue/**"
- "processor/**"
- "orchestration/**"
@@ -18,7 +18,7 @@ on:
paths:
- "common/**"
- "crypto/**"
- "coins/**"
- "networks/**"
- "message-queue/**"
- "processor/**"
- "orchestration/**"
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ on:
paths:
- "common/**"
- "crypto/**"
- "coins/**"
- "networks/**"
- "message-queue/**"
- "processor/**"
- "coordinator/**"
@@ -17,7 +17,7 @@ on:
paths:
- "common/**"
- "crypto/**"
- "coins/**"
- "networks/**"
- "message-queue/**"
- "processor/**"
- "coordinator/**"
44 changes: 22 additions & 22 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -37,28 +37,28 @@ members = [
"crypto/frost",
"crypto/schnorrkel",

"coins/bitcoin",

"coins/ethereum/alloy-simple-request-transport",
"coins/ethereum",
"coins/ethereum/relayer",

"coins/monero/io",
"coins/monero/generators",
"coins/monero/primitives",
"coins/monero/ringct/mlsag",
"coins/monero/ringct/clsag",
"coins/monero/ringct/borromean",
"coins/monero/ringct/bulletproofs",
"coins/monero",
"coins/monero/rpc",
"coins/monero/rpc/simple-request",
"coins/monero/wallet/address",
"coins/monero/wallet",
"coins/monero/wallet/seed",
"coins/monero/wallet/polyseed",
"coins/monero/wallet/util",
"coins/monero/verify-chain",
"networks/bitcoin",

"networks/ethereum/alloy-simple-request-transport",
"networks/ethereum",
"networks/ethereum/relayer",

"networks/monero/io",
"networks/monero/generators",
"networks/monero/primitives",
"networks/monero/ringct/mlsag",
"networks/monero/ringct/clsag",
"networks/monero/ringct/borromean",
"networks/monero/ringct/bulletproofs",
"networks/monero",
"networks/monero/rpc",
"networks/monero/rpc/simple-request",
"networks/monero/wallet/address",
"networks/monero/wallet",
"networks/monero/wallet/seed",
"networks/monero/wallet/polyseed",
"networks/monero/wallet/util",
"networks/monero/verify-chain",

"message-queue",

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ wallet.
infrastructure, to our IETF-compliant FROST implementation, to a DLEq proof as
needed for Bitcoin-Monero atomic swaps.

- `coins`: Various coin libraries intended for usage in Serai yet also by the
- `networks`: Various libraries intended for usage in Serai yet also by the
wider community. This means they will always support the functionality Serai
needs, yet won't disadvantage other use cases when possible.

6 changes: 0 additions & 6 deletions audits/Cypher Stack coins bitcoin August 2023/README.md

This file was deleted.

7 changes: 7 additions & 0 deletions audits/Cypher Stack networks bitcoin August 2023/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Cypher Stack /networks/bitcoin Audit, August 2023

This audit was over the `/networks/bitcoin` folder (at the time located at
`/coins/bitcoin`). It is encompassing up to commit
5121ca75199dff7bd34230880a1fdd793012068c.

Please see https://github.com/cypherstack/serai-btc-audit for provenance.
2 changes: 1 addition & 1 deletion coins/bitcoin/Cargo.toml → networks/bitcoin/Cargo.toml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "bitcoin-serai"
version = "0.3.0"
description = "A Bitcoin library for FROST-signing transactions"
license = "MIT"
repository = "https://github.com/serai-dex/serai/tree/develop/coins/bitcoin"
repository = "https://github.com/serai-dex/serai/tree/develop/networks/bitcoin"
authors = ["Luke Parker <[email protected]>", "Vrx <[email protected]>"]
edition = "2021"
rust-version = "1.79"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion coins/ethereum/Cargo.toml → networks/ethereum/Cargo.toml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "ethereum-serai"
version = "0.1.0"
description = "An Ethereum library supporting Schnorr signing and on-chain verification"
license = "AGPL-3.0-only"
repository = "https://github.com/serai-dex/serai/tree/develop/coins/ethereum"
repository = "https://github.com/serai-dex/serai/tree/develop/networks/ethereum"
authors = ["Luke Parker <[email protected]>", "Elizabeth Binks <[email protected]>"]
edition = "2021"
publish = false
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "alloy-simple-request-transport"
version = "0.1.0"
description = "A transport for alloy based off simple-request"
license = "MIT"
repository = "https://github.com/serai-dex/serai/tree/develop/coins/ethereum/alloy-simple-request-transport"
repository = "https://github.com/serai-dex/serai/tree/develop/networks/ethereum/alloy-simple-request-transport"
authors = ["Luke Parker <[email protected]>"]
edition = "2021"
rust-version = "1.74"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "serai-ethereum-relayer"
version = "0.1.0"
description = "A relayer for Serai's Ethereum transactions"
license = "AGPL-3.0-only"
repository = "https://github.com/serai-dex/serai/tree/develop/coins/ethereum/relayer"
repository = "https://github.com/serai-dex/serai/tree/develop/networks/ethereum/relayer"
authors = ["Luke Parker <[email protected]>"]
keywords = []
edition = "2021"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion coins/monero/Cargo.toml → networks/monero/Cargo.toml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "monero-serai"
version = "0.1.4-alpha"
description = "A modern Monero transaction library"
license = "MIT"
repository = "https://github.com/serai-dex/serai/tree/develop/coins/monero"
repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero"
authors = ["Luke Parker <[email protected]>"]
edition = "2021"
rust-version = "1.79"
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "monero-generators"
version = "0.4.0"
description = "Monero's hash to point function and generators"
license = "MIT"
repository = "https://github.com/serai-dex/serai/tree/develop/coins/monero/generators"
repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero/generators"
authors = ["Luke Parker <[email protected]>"]
edition = "2021"

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "monero-io"
version = "0.1.0"
description = "Serialization functions, as within the Monero protocol"
license = "MIT"
repository = "https://github.com/serai-dex/serai/tree/develop/coins/monero/io"
repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero/io"
authors = ["Luke Parker <[email protected]>"]
edition = "2021"

File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "monero-primitives"
version = "0.1.0"
description = "Primitives for the Monero protocol"
license = "MIT"
repository = "https://github.com/serai-dex/serai/tree/develop/coins/monero/primitives"
repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero/primitives"
authors = ["Luke Parker <[email protected]>"]
edition = "2021"
rust-version = "1.79"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "monero-borromean"
version = "0.1.0"
description = "Borromean ring signatures arranged into a range proof, as done by the Monero protocol"
license = "MIT"
repository = "https://github.com/serai-dex/serai/tree/develop/coins/monero/ringct/borromean"
repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero/ringct/borromean"
authors = ["Luke Parker <[email protected]>"]
edition = "2021"
rust-version = "1.79"
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "monero-bulletproofs"
version = "0.1.0"
description = "Bulletproofs(+) range proofs, as defined by the Monero protocol"
license = "MIT"
repository = "https://github.com/serai-dex/serai/tree/develop/coins/monero/ringct/bulletproofs"
repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero/ringct/bulletproofs"
authors = ["Luke Parker <[email protected]>"]
edition = "2021"
rust-version = "1.79"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "monero-clsag"
version = "0.1.0"
description = "The CLSAG linkable ring signature, as defined by the Monero protocol"
license = "MIT"
repository = "https://github.com/serai-dex/serai/tree/develop/coins/monero/ringct/clsag"
repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero/ringct/clsag"
authors = ["Luke Parker <[email protected]>"]
edition = "2021"
rust-version = "1.79"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "monero-mlsag"
version = "0.1.0"
description = "The MLSAG linkable ring signature, as defined by the Monero protocol"
license = "MIT"
repository = "https://github.com/serai-dex/serai/tree/develop/coins/monero/ringct/mlsag"
repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero/ringct/mlsag"
authors = ["Luke Parker <[email protected]>"]
edition = "2021"
rust-version = "1.79"
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "monero-rpc"
version = "0.1.0"
description = "Trait for an RPC connection to a Monero daemon, built around monero-serai"
license = "MIT"
repository = "https://github.com/serai-dex/serai/tree/develop/coins/monero/rpc"
repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero/rpc"
authors = ["Luke Parker <[email protected]>"]
edition = "2021"
rust-version = "1.79"
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "monero-simple-request-rpc"
version = "0.1.0"
description = "RPC connection to a Monero daemon via simple-request, built around monero-serai"
license = "MIT"
repository = "https://github.com/serai-dex/serai/tree/develop/coins/monero/rpc/simple-request"
repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero/rpc/simple-request"
authors = ["Luke Parker <[email protected]>"]
edition = "2021"
rust-version = "1.79"
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -237,7 +237,7 @@ fn rpc_point(point: &str) -> Result<EdwardsPoint, RpcError> {
/// Tor/i2p-based transport, or even a memory buffer an external service somehow routes.
///
/// While no implementors are directly provided, [monero-simple-request-rpc](
/// https://github.com/serai-dex/serai/tree/develop/coins/monero/rpc/simple-request
/// https://github.com/serai-dex/serai/tree/develop/networks/monero/rpc/simple-request
/// ) is recommended.
#[async_trait]
pub trait Rpc: Sync + Clone + Debug {
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "monero-serai-verify-chain"
version = "0.1.0"
description = "A binary to deserialize and verify the Monero blockchain"
license = "MIT"
repository = "https://github.com/serai-dex/serai/tree/develop/coins/monero/verify-chain"
repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero/verify-chain"
authors = ["Luke Parker <[email protected]>"]
edition = "2021"
rust-version = "1.79"
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "monero-wallet"
version = "0.1.0"
description = "Wallet functionality for the Monero protocol, built around monero-serai"
license = "MIT"
repository = "https://github.com/serai-dex/serai/tree/develop/coins/monero/wallet"
repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero/wallet"
authors = ["Luke Parker <[email protected]>"]
edition = "2021"
rust-version = "1.79"
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "monero-address"
version = "0.1.0"
description = "Rust implementation of Monero addresses"
license = "MIT"
repository = "https://github.com/serai-dex/serai/tree/develop/coins/monero/wallet/address"
repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero/wallet/address"
authors = ["Luke Parker <[email protected]>"]
edition = "2021"
rust-version = "1.79"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "polyseed"
version = "0.1.0"
description = "Rust implementation of Polyseed"
license = "MIT"
repository = "https://github.com/serai-dex/serai/tree/develop/coins/monero/wallet/polyseed"
repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero/wallet/polyseed"
authors = ["Luke Parker <[email protected]>"]
edition = "2021"
rust-version = "1.79"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "monero-seed"
version = "0.1.0"
description = "Rust implementation of Monero's seed algorithm"
license = "MIT"
repository = "https://github.com/serai-dex/serai/tree/develop/coins/monero/wallet/seed"
repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero/wallet/seed"
authors = ["Luke Parker <[email protected]>"]
edition = "2021"
rust-version = "1.79"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name = "monero-wallet-util"
version = "0.1.0"
description = "Additional utility functions for monero-wallet"
license = "MIT"
repository = "https://github.com/serai-dex/serai/tree/develop/coins/monero/wallet/util"
repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero/wallet/util"
authors = ["Luke Parker <[email protected]>"]
edition = "2021"
rust-version = "1.79"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion orchestration/src/docker.rs
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ pub fn build(orchestration_path: &Path, network: Network, name: &str) {

let mut dockerfile_path = orchestration_path.to_path_buf();
if HashSet::from(["bitcoin", "ethereum", "monero", "monero-wallet-rpc"]).contains(name) {
dockerfile_path = dockerfile_path.join("coins");
dockerfile_path = dockerfile_path.join("networks");
}
if name.contains("-processor") {
dockerfile_path =
2 changes: 1 addition & 1 deletion orchestration/src/ethereum_relayer.rs
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ CMD {env_vars_str} serai-ethereum-relayer
let res = setup + &run;

let mut ethereum_relayer_path = orchestration_path.to_path_buf();
ethereum_relayer_path.push("coins");
ethereum_relayer_path.push("networks");
ethereum_relayer_path.push("ethereum-relayer");
ethereum_relayer_path.push("Dockerfile");

6 changes: 3 additions & 3 deletions orchestration/src/main.rs
Original file line number Diff line number Diff line change
@@ -29,8 +29,8 @@ use ciphersuite::{
mod mimalloc;
use mimalloc::mimalloc;

mod coins;
use coins::*;
mod networks;
use networks::*;

mod ethereum_relayer;
use ethereum_relayer::ethereum_relayer;
@@ -168,7 +168,7 @@ RUN rustup target add wasm32-unknown-unknown
ADD patches /serai/patches
ADD common /serai/common
ADD crypto /serai/crypto
ADD coins /serai/coins
ADD networks /serai/networks
ADD message-queue /serai/message-queue
ADD processor /serai/processor
ADD coordinator /serai/coordinator
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ COPY --from=bitcoin --chown=bitcoin bitcoind /bin
EXPOSE 8332 8333
ADD /orchestration/{}/coins/bitcoin/run.sh /
ADD /orchestration/{}/networks/bitcoin/run.sh /
CMD ["/run.sh"]
"#,
network.label()
@@ -47,7 +47,7 @@ CMD ["/run.sh"]
let res = setup + &run;

let mut bitcoin_path = orchestration_path.to_path_buf();
bitcoin_path.push("coins");
bitcoin_path.push("networks");
bitcoin_path.push("bitcoin");
bitcoin_path.push("Dockerfile");

Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ RUN tar xvf lighthouse-v${LIGHTHOUSE_VERSION}-$(uname -m)-unknown-linux-gnu.tar.
r#"
COPY --from=lighthouse --chown=ethereum lighthouse /bin
ADD /orchestration/{}/coins/ethereum/consensus/lighthouse/run.sh /consensus_layer.sh
ADD /orchestration/{}/networks/ethereum/consensus/lighthouse/run.sh /consensus_layer.sh
"#,
network.label()
);
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ RUN sha512sum nimbus | grep {checksum}
r#"
COPY --from=nimbus --chown=ethereum nimbus /bin
ADD /orchestration/{}/coins/ethereum/consensus/nimbus/run.sh /consensus_layer.sh
ADD /orchestration/{}/networks/ethereum/consensus/nimbus/run.sh /consensus_layer.sh
"#,
network.label()
);
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ COPY --from=reth --chown=ethereum reth /bin
EXPOSE 30303 9001 8545
ADD /orchestration/{}/coins/ethereum/execution/reth/run.sh /execution_layer.sh
ADD /orchestration/{}/networks/ethereum/execution/reth/run.sh /execution_layer.sh
"#,
network.label()
);
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ pub fn ethereum(orchestration_path: &Path, network: Network) {

let run = format!(
r#"
ADD /orchestration/{}/coins/ethereum/run.sh /run.sh
ADD /orchestration/{}/networks/ethereum/run.sh /run.sh
CMD ["/run.sh"]
"#,
network.label()
@@ -35,7 +35,7 @@ CMD ["/run.sh"]
let res = download + &run;

let mut ethereum_path = orchestration_path.to_path_buf();
ethereum_path.push("coins");
ethereum_path.push("networks");
ethereum_path.push("ethereum");
ethereum_path.push("Dockerfile");

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ RUN apk --no-cache add gnupg
RUN wget https://downloads.getmonero.org/cli/monero-linux-{arch}-v{MONERO_VERSION}.tar.bz2
# Verify Binary -- fingerprint from https://github.com/monero-project/monero-site/issues/1949
ADD orchestration/{}/coins/monero/hashes-v{MONERO_VERSION}.txt .
ADD orchestration/{}/networks/monero/hashes-v{MONERO_VERSION}.txt .
RUN gpg --keyserver hkp://keyserver.ubuntu.com:80 --keyserver-options no-self-sigs-only --receive-keys 81AC591FE9C4B65C5806AFC3F0AF4D462A0BDF92 && \
gpg --verify hashes-v{MONERO_VERSION}.txt && \
grep "$(sha256sum monero-linux-{arch}-v{MONERO_VERSION}.tar.bz2 | cut -c 1-64)" hashes-v{MONERO_VERSION}.txt
@@ -49,7 +49,7 @@ COPY --from=monero --chown=monero:nogroup {monero_binary} /bin
EXPOSE {ports}
ADD /orchestration/{}/coins/{folder}/run.sh /
ADD /orchestration/{}/networks/{folder}/run.sh /
CMD ["/run.sh"]
"#,
network.label(),
@@ -61,7 +61,7 @@ CMD ["/run.sh"]
let res = setup + &run;

let mut monero_path = orchestration_path.to_path_buf();
monero_path.push("coins");
monero_path.push("networks");
monero_path.push(folder);
monero_path.push("Dockerfile");

10 changes: 5 additions & 5 deletions processor/Cargo.toml
Original file line number Diff line number Diff line change
@@ -45,15 +45,15 @@ k256 = { version = "^0.13.1", default-features = false, features = ["std"], opti

# Bitcoin
secp256k1 = { version = "0.29", default-features = false, features = ["std", "global-context", "rand-std"], optional = true }
bitcoin-serai = { path = "../coins/bitcoin", default-features = false, features = ["std"], optional = true }
bitcoin-serai = { path = "../networks/bitcoin", default-features = false, features = ["std"], optional = true }

# Ethereum
ethereum-serai = { path = "../coins/ethereum", default-features = false, optional = true }
ethereum-serai = { path = "../networks/ethereum", default-features = false, optional = true }

# Monero
dalek-ff-group = { path = "../crypto/dalek-ff-group", default-features = false, features = ["std"], optional = true }
monero-simple-request-rpc = { path = "../coins/monero/rpc/simple-request", default-features = false, optional = true }
monero-wallet = { path = "../coins/monero/wallet", default-features = false, features = ["std", "multisig", "compile-time-generators"], optional = true }
monero-simple-request-rpc = { path = "../networks/monero/rpc/simple-request", default-features = false, optional = true }
monero-wallet = { path = "../networks/monero/wallet", default-features = false, features = ["std", "multisig", "compile-time-generators"], optional = true }

# Application
log = { version = "0.4", default-features = false, features = ["std"] }
@@ -75,7 +75,7 @@ frost = { package = "modular-frost", path = "../crypto/frost", features = ["test

sp-application-crypto = { git = "https://github.com/serai-dex/substrate", default-features = false, features = ["std"] }

ethereum-serai = { path = "../coins/ethereum", default-features = false, features = ["tests"] }
ethereum-serai = { path = "../networks/ethereum", default-features = false, features = ["tests"] }

dockertest = "0.4"
serai-docker-tests = { path = "../tests/docker" }
2 changes: 1 addition & 1 deletion substrate/client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ simple-request = { path = "../../common/request", version = "0.1", optional = tr
bitcoin = { version = "0.32", optional = true }

ciphersuite = { path = "../../crypto/ciphersuite", version = "0.4", optional = true }
monero-wallet = { path = "../../coins/monero/wallet", version = "0.1.0", default-features = false, features = ["std"], optional = true }
monero-wallet = { path = "../../networks/monero/wallet", version = "0.1.0", default-features = false, features = ["std"], optional = true }

[dev-dependencies]
rand_core = "0.6"
6 changes: 3 additions & 3 deletions tests/full-stack/Cargo.toml
Original file line number Diff line number Diff line change
@@ -26,9 +26,9 @@ rand_core = { version = "0.6", default-features = false }

curve25519-dalek = { version = "4", features = ["rand_core"] }

bitcoin-serai = { path = "../../coins/bitcoin" }
monero-simple-request-rpc = { path = "../../coins/monero/rpc/simple-request" }
monero-wallet = { path = "../../coins/monero/wallet" }
bitcoin-serai = { path = "../../networks/bitcoin" }
monero-simple-request-rpc = { path = "../../networks/monero/rpc/simple-request" }
monero-wallet = { path = "../../networks/monero/wallet" }

scale = { package = "parity-scale-codec", version = "3" }
serde = "1"
4 changes: 2 additions & 2 deletions tests/no-std/Cargo.toml
Original file line number Diff line number Diff line change
@@ -33,6 +33,6 @@ dkg = { path = "../../crypto/dkg", default-features = false }
# modular-frost = { path = "../../crypto/frost", default-features = false }
# frost-schnorrkel = { path = "../../crypto/schnorrkel", default-features = false }

bitcoin-serai = { path = "../../coins/bitcoin", default-features = false, features = ["hazmat"] }
bitcoin-serai = { path = "../../networks/bitcoin", default-features = false, features = ["hazmat"] }

monero-wallet-util = { path = "../../coins/monero/wallet/util", default-features = false, features = ["compile-time-generators"] }
monero-wallet-util = { path = "../../networks/monero/wallet/util", default-features = false, features = ["compile-time-generators"] }
8 changes: 4 additions & 4 deletions tests/processor/Cargo.toml
Original file line number Diff line number Diff line change
@@ -26,13 +26,13 @@ curve25519-dalek = "4"
ciphersuite = { path = "../../crypto/ciphersuite", default-features = false, features = ["secp256k1", "ristretto"] }
dkg = { path = "../../crypto/dkg", default-features = false, features = ["tests"] }

bitcoin-serai = { path = "../../coins/bitcoin" }
bitcoin-serai = { path = "../../networks/bitcoin" }

k256 = "0.13"
ethereum-serai = { path = "../../coins/ethereum" }
ethereum-serai = { path = "../../networks/ethereum" }

monero-simple-request-rpc = { path = "../../coins/monero/rpc/simple-request" }
monero-wallet = { path = "../../coins/monero/wallet" }
monero-simple-request-rpc = { path = "../../networks/monero/rpc/simple-request" }
monero-wallet = { path = "../../networks/monero/wallet" }

messages = { package = "serai-processor-messages", path = "../../processor/messages" }

0 comments on commit acb4c08

Please sign in to comment.