diff --git a/.github/actions/bitcoin/action.yml b/.github/actions/bitcoin/action.yml index 2a6dbce3..6f628172 100644 --- a/.github/actions/bitcoin/action.yml +++ b/.github/actions/bitcoin/action.yml @@ -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 diff --git a/.github/actions/monero/action.yml b/.github/actions/monero/action.yml index 8dff093a..4edbb4d4 100644 --- a/.github/actions/monero/action.yml +++ b/.github/actions/monero/action.yml @@ -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 diff --git a/.github/workflows/coordinator-tests.yml b/.github/workflows/coordinator-tests.yml index 1ef27704..b956f752 100644 --- a/.github/workflows/coordinator-tests.yml +++ b/.github/workflows/coordinator-tests.yml @@ -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/**" diff --git a/.github/workflows/monero-tests.yaml b/.github/workflows/monero-tests.yaml index 1901b256..a05adeac 100644 --- a/.github/workflows/monero-tests.yaml +++ b/.github/workflows/monero-tests.yaml @@ -5,12 +5,12 @@ on: branches: - develop paths: - - "coins/monero/**" + - "networks/monero/**" - "processor/**" pull_request: paths: - - "coins/monero/**" + - "networks/monero/**" - "processor/**" workflow_dispatch: diff --git a/.github/workflows/coins-tests.yml b/.github/workflows/networks-tests.yml similarity index 93% rename from .github/workflows/coins-tests.yml rename to .github/workflows/networks-tests.yml index 65d2b6dc..f346b986 100644 --- a/.github/workflows/coins-tests.yml +++ b/.github/workflows/networks-tests.yml @@ -1,4 +1,4 @@ -name: coins/ Tests +name: networks/ Tests on: push: @@ -7,18 +7,18 @@ on: paths: - "common/**" - "crypto/**" - - "coins/**" + - "networks/**" pull_request: paths: - "common/**" - "crypto/**" - - "coins/**" + - "networks/**" workflow_dispatch: jobs: - test-coins: + test-networks: runs-on: ubuntu-latest steps: - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac diff --git a/.github/workflows/no-std.yml b/.github/workflows/no-std.yml index 4e446daf..fa39690a 100644 --- a/.github/workflows/no-std.yml +++ b/.github/workflows/no-std.yml @@ -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: diff --git a/.github/workflows/processor-tests.yml b/.github/workflows/processor-tests.yml index c5b02321..5f6043eb 100644 --- a/.github/workflows/processor-tests.yml +++ b/.github/workflows/processor-tests.yml @@ -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/**" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e32d2119..0270bee2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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/**" diff --git a/Cargo.toml b/Cargo.toml index 7f63f626..4593d40d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,28 +37,28 @@ members = [ "crypto/frost", "crypto/schnorrkel", - "coins/bitcoin", + "networks/bitcoin", - "coins/ethereum/alloy-simple-request-transport", - "coins/ethereum", - "coins/ethereum/relayer", + "networks/ethereum/alloy-simple-request-transport", + "networks/ethereum", + "networks/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/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", diff --git a/README.md b/README.md index 4a8ac4d5..319c05db 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/audits/Cypher Stack coins bitcoin August 2023/README.md b/audits/Cypher Stack coins bitcoin August 2023/README.md deleted file mode 100644 index 97507bd3..00000000 --- a/audits/Cypher Stack coins bitcoin August 2023/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# Cypher Stack /coins/bitcoin Audit, August 2023 - -This audit was over the /coins/bitcoin folder. It is encompassing up to commit -5121ca75199dff7bd34230880a1fdd793012068c. - -Please see https://github.com/cypherstack/serai-btc-audit for provenance. diff --git a/audits/Cypher Stack coins bitcoin August 2023/Audit.pdf b/audits/Cypher Stack networks bitcoin August 2023/Audit.pdf similarity index 100% rename from audits/Cypher Stack coins bitcoin August 2023/Audit.pdf rename to audits/Cypher Stack networks bitcoin August 2023/Audit.pdf diff --git a/audits/Cypher Stack coins bitcoin August 2023/LICENSE b/audits/Cypher Stack networks bitcoin August 2023/LICENSE similarity index 100% rename from audits/Cypher Stack coins bitcoin August 2023/LICENSE rename to audits/Cypher Stack networks bitcoin August 2023/LICENSE diff --git a/audits/Cypher Stack networks bitcoin August 2023/README.md b/audits/Cypher Stack networks bitcoin August 2023/README.md new file mode 100644 index 00000000..9ab8aa4d --- /dev/null +++ b/audits/Cypher Stack networks bitcoin August 2023/README.md @@ -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. diff --git a/coins/bitcoin/Cargo.toml b/networks/bitcoin/Cargo.toml similarity index 96% rename from coins/bitcoin/Cargo.toml rename to networks/bitcoin/Cargo.toml index f003b36f..7d6c9412 100644 --- a/coins/bitcoin/Cargo.toml +++ b/networks/bitcoin/Cargo.toml @@ -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 ", "Vrx "] edition = "2021" rust-version = "1.79" diff --git a/coins/bitcoin/LICENSE b/networks/bitcoin/LICENSE similarity index 100% rename from coins/bitcoin/LICENSE rename to networks/bitcoin/LICENSE diff --git a/coins/bitcoin/README.md b/networks/bitcoin/README.md similarity index 100% rename from coins/bitcoin/README.md rename to networks/bitcoin/README.md diff --git a/coins/bitcoin/src/crypto.rs b/networks/bitcoin/src/crypto.rs similarity index 100% rename from coins/bitcoin/src/crypto.rs rename to networks/bitcoin/src/crypto.rs diff --git a/coins/bitcoin/src/lib.rs b/networks/bitcoin/src/lib.rs similarity index 100% rename from coins/bitcoin/src/lib.rs rename to networks/bitcoin/src/lib.rs diff --git a/coins/bitcoin/src/rpc.rs b/networks/bitcoin/src/rpc.rs similarity index 100% rename from coins/bitcoin/src/rpc.rs rename to networks/bitcoin/src/rpc.rs diff --git a/coins/bitcoin/src/tests/crypto.rs b/networks/bitcoin/src/tests/crypto.rs similarity index 100% rename from coins/bitcoin/src/tests/crypto.rs rename to networks/bitcoin/src/tests/crypto.rs diff --git a/coins/bitcoin/src/tests/mod.rs b/networks/bitcoin/src/tests/mod.rs similarity index 100% rename from coins/bitcoin/src/tests/mod.rs rename to networks/bitcoin/src/tests/mod.rs diff --git a/coins/bitcoin/src/wallet/mod.rs b/networks/bitcoin/src/wallet/mod.rs similarity index 100% rename from coins/bitcoin/src/wallet/mod.rs rename to networks/bitcoin/src/wallet/mod.rs diff --git a/coins/bitcoin/src/wallet/send.rs b/networks/bitcoin/src/wallet/send.rs similarity index 100% rename from coins/bitcoin/src/wallet/send.rs rename to networks/bitcoin/src/wallet/send.rs diff --git a/coins/bitcoin/tests/rpc.rs b/networks/bitcoin/tests/rpc.rs similarity index 100% rename from coins/bitcoin/tests/rpc.rs rename to networks/bitcoin/tests/rpc.rs diff --git a/coins/bitcoin/tests/runner.rs b/networks/bitcoin/tests/runner.rs similarity index 100% rename from coins/bitcoin/tests/runner.rs rename to networks/bitcoin/tests/runner.rs diff --git a/coins/bitcoin/tests/wallet.rs b/networks/bitcoin/tests/wallet.rs similarity index 100% rename from coins/bitcoin/tests/wallet.rs rename to networks/bitcoin/tests/wallet.rs diff --git a/coins/ethereum/.gitignore b/networks/ethereum/.gitignore similarity index 100% rename from coins/ethereum/.gitignore rename to networks/ethereum/.gitignore diff --git a/coins/ethereum/Cargo.toml b/networks/ethereum/Cargo.toml similarity index 96% rename from coins/ethereum/Cargo.toml rename to networks/ethereum/Cargo.toml index f454c9d5..a700d117 100644 --- a/coins/ethereum/Cargo.toml +++ b/networks/ethereum/Cargo.toml @@ -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 ", "Elizabeth Binks "] edition = "2021" publish = false diff --git a/coins/ethereum/LICENSE b/networks/ethereum/LICENSE similarity index 100% rename from coins/ethereum/LICENSE rename to networks/ethereum/LICENSE diff --git a/coins/ethereum/README.md b/networks/ethereum/README.md similarity index 100% rename from coins/ethereum/README.md rename to networks/ethereum/README.md diff --git a/coins/ethereum/alloy-simple-request-transport/Cargo.toml b/networks/ethereum/alloy-simple-request-transport/Cargo.toml similarity index 86% rename from coins/ethereum/alloy-simple-request-transport/Cargo.toml rename to networks/ethereum/alloy-simple-request-transport/Cargo.toml index 9a192c17..973888dc 100644 --- a/coins/ethereum/alloy-simple-request-transport/Cargo.toml +++ b/networks/ethereum/alloy-simple-request-transport/Cargo.toml @@ -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 "] edition = "2021" rust-version = "1.74" diff --git a/coins/ethereum/alloy-simple-request-transport/LICENSE b/networks/ethereum/alloy-simple-request-transport/LICENSE similarity index 100% rename from coins/ethereum/alloy-simple-request-transport/LICENSE rename to networks/ethereum/alloy-simple-request-transport/LICENSE diff --git a/coins/ethereum/alloy-simple-request-transport/README.md b/networks/ethereum/alloy-simple-request-transport/README.md similarity index 100% rename from coins/ethereum/alloy-simple-request-transport/README.md rename to networks/ethereum/alloy-simple-request-transport/README.md diff --git a/coins/ethereum/alloy-simple-request-transport/src/lib.rs b/networks/ethereum/alloy-simple-request-transport/src/lib.rs similarity index 100% rename from coins/ethereum/alloy-simple-request-transport/src/lib.rs rename to networks/ethereum/alloy-simple-request-transport/src/lib.rs diff --git a/coins/ethereum/build.rs b/networks/ethereum/build.rs similarity index 100% rename from coins/ethereum/build.rs rename to networks/ethereum/build.rs diff --git a/coins/ethereum/contracts/Deployer.sol b/networks/ethereum/contracts/Deployer.sol similarity index 100% rename from coins/ethereum/contracts/Deployer.sol rename to networks/ethereum/contracts/Deployer.sol diff --git a/coins/ethereum/contracts/IERC20.sol b/networks/ethereum/contracts/IERC20.sol similarity index 100% rename from coins/ethereum/contracts/IERC20.sol rename to networks/ethereum/contracts/IERC20.sol diff --git a/coins/ethereum/contracts/Router.sol b/networks/ethereum/contracts/Router.sol similarity index 100% rename from coins/ethereum/contracts/Router.sol rename to networks/ethereum/contracts/Router.sol diff --git a/coins/ethereum/contracts/Sandbox.sol b/networks/ethereum/contracts/Sandbox.sol similarity index 100% rename from coins/ethereum/contracts/Sandbox.sol rename to networks/ethereum/contracts/Sandbox.sol diff --git a/coins/ethereum/contracts/Schnorr.sol b/networks/ethereum/contracts/Schnorr.sol similarity index 100% rename from coins/ethereum/contracts/Schnorr.sol rename to networks/ethereum/contracts/Schnorr.sol diff --git a/coins/ethereum/relayer/Cargo.toml b/networks/ethereum/relayer/Cargo.toml similarity index 90% rename from coins/ethereum/relayer/Cargo.toml rename to networks/ethereum/relayer/Cargo.toml index 22c20076..89d8e99e 100644 --- a/coins/ethereum/relayer/Cargo.toml +++ b/networks/ethereum/relayer/Cargo.toml @@ -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 "] keywords = [] edition = "2021" diff --git a/coins/ethereum/relayer/LICENSE b/networks/ethereum/relayer/LICENSE similarity index 100% rename from coins/ethereum/relayer/LICENSE rename to networks/ethereum/relayer/LICENSE diff --git a/coins/ethereum/relayer/README.md b/networks/ethereum/relayer/README.md similarity index 100% rename from coins/ethereum/relayer/README.md rename to networks/ethereum/relayer/README.md diff --git a/coins/ethereum/relayer/src/main.rs b/networks/ethereum/relayer/src/main.rs similarity index 100% rename from coins/ethereum/relayer/src/main.rs rename to networks/ethereum/relayer/src/main.rs diff --git a/coins/ethereum/src/abi/mod.rs b/networks/ethereum/src/abi/mod.rs similarity index 100% rename from coins/ethereum/src/abi/mod.rs rename to networks/ethereum/src/abi/mod.rs diff --git a/coins/ethereum/src/crypto.rs b/networks/ethereum/src/crypto.rs similarity index 100% rename from coins/ethereum/src/crypto.rs rename to networks/ethereum/src/crypto.rs diff --git a/coins/ethereum/src/deployer.rs b/networks/ethereum/src/deployer.rs similarity index 100% rename from coins/ethereum/src/deployer.rs rename to networks/ethereum/src/deployer.rs diff --git a/coins/ethereum/src/erc20.rs b/networks/ethereum/src/erc20.rs similarity index 100% rename from coins/ethereum/src/erc20.rs rename to networks/ethereum/src/erc20.rs diff --git a/coins/ethereum/src/lib.rs b/networks/ethereum/src/lib.rs similarity index 100% rename from coins/ethereum/src/lib.rs rename to networks/ethereum/src/lib.rs diff --git a/coins/ethereum/src/machine.rs b/networks/ethereum/src/machine.rs similarity index 100% rename from coins/ethereum/src/machine.rs rename to networks/ethereum/src/machine.rs diff --git a/coins/ethereum/src/router.rs b/networks/ethereum/src/router.rs similarity index 100% rename from coins/ethereum/src/router.rs rename to networks/ethereum/src/router.rs diff --git a/coins/ethereum/src/tests/abi/mod.rs b/networks/ethereum/src/tests/abi/mod.rs similarity index 100% rename from coins/ethereum/src/tests/abi/mod.rs rename to networks/ethereum/src/tests/abi/mod.rs diff --git a/coins/ethereum/src/tests/contracts/ERC20.sol b/networks/ethereum/src/tests/contracts/ERC20.sol similarity index 100% rename from coins/ethereum/src/tests/contracts/ERC20.sol rename to networks/ethereum/src/tests/contracts/ERC20.sol diff --git a/coins/ethereum/src/tests/contracts/Schnorr.sol b/networks/ethereum/src/tests/contracts/Schnorr.sol similarity index 100% rename from coins/ethereum/src/tests/contracts/Schnorr.sol rename to networks/ethereum/src/tests/contracts/Schnorr.sol diff --git a/coins/ethereum/src/tests/crypto.rs b/networks/ethereum/src/tests/crypto.rs similarity index 100% rename from coins/ethereum/src/tests/crypto.rs rename to networks/ethereum/src/tests/crypto.rs diff --git a/coins/ethereum/src/tests/mod.rs b/networks/ethereum/src/tests/mod.rs similarity index 100% rename from coins/ethereum/src/tests/mod.rs rename to networks/ethereum/src/tests/mod.rs diff --git a/coins/ethereum/src/tests/router.rs b/networks/ethereum/src/tests/router.rs similarity index 100% rename from coins/ethereum/src/tests/router.rs rename to networks/ethereum/src/tests/router.rs diff --git a/coins/ethereum/src/tests/schnorr.rs b/networks/ethereum/src/tests/schnorr.rs similarity index 100% rename from coins/ethereum/src/tests/schnorr.rs rename to networks/ethereum/src/tests/schnorr.rs diff --git a/coins/monero/Cargo.toml b/networks/monero/Cargo.toml similarity index 96% rename from coins/monero/Cargo.toml rename to networks/monero/Cargo.toml index ebdbe076..73ce850c 100644 --- a/coins/monero/Cargo.toml +++ b/networks/monero/Cargo.toml @@ -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 "] edition = "2021" rust-version = "1.79" diff --git a/coins/monero/LICENSE b/networks/monero/LICENSE similarity index 100% rename from coins/monero/LICENSE rename to networks/monero/LICENSE diff --git a/coins/monero/README.md b/networks/monero/README.md similarity index 100% rename from coins/monero/README.md rename to networks/monero/README.md diff --git a/coins/monero/generators/Cargo.toml b/networks/monero/generators/Cargo.toml similarity index 92% rename from coins/monero/generators/Cargo.toml rename to networks/monero/generators/Cargo.toml index 0796eb13..af8cbcd9 100644 --- a/coins/monero/generators/Cargo.toml +++ b/networks/monero/generators/Cargo.toml @@ -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 "] edition = "2021" diff --git a/coins/monero/generators/LICENSE b/networks/monero/generators/LICENSE similarity index 100% rename from coins/monero/generators/LICENSE rename to networks/monero/generators/LICENSE diff --git a/coins/monero/generators/README.md b/networks/monero/generators/README.md similarity index 100% rename from coins/monero/generators/README.md rename to networks/monero/generators/README.md diff --git a/coins/monero/generators/src/hash_to_point.rs b/networks/monero/generators/src/hash_to_point.rs similarity index 100% rename from coins/monero/generators/src/hash_to_point.rs rename to networks/monero/generators/src/hash_to_point.rs diff --git a/coins/monero/generators/src/lib.rs b/networks/monero/generators/src/lib.rs similarity index 100% rename from coins/monero/generators/src/lib.rs rename to networks/monero/generators/src/lib.rs diff --git a/coins/monero/generators/src/tests/mod.rs b/networks/monero/generators/src/tests/mod.rs similarity index 100% rename from coins/monero/generators/src/tests/mod.rs rename to networks/monero/generators/src/tests/mod.rs diff --git a/coins/monero/generators/src/tests/tests.txt b/networks/monero/generators/src/tests/tests.txt similarity index 100% rename from coins/monero/generators/src/tests/tests.txt rename to networks/monero/generators/src/tests/tests.txt diff --git a/coins/monero/io/Cargo.toml b/networks/monero/io/Cargo.toml similarity index 87% rename from coins/monero/io/Cargo.toml rename to networks/monero/io/Cargo.toml index f43f6448..a4270738 100644 --- a/coins/monero/io/Cargo.toml +++ b/networks/monero/io/Cargo.toml @@ -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 "] edition = "2021" diff --git a/coins/monero/io/LICENSE b/networks/monero/io/LICENSE similarity index 100% rename from coins/monero/io/LICENSE rename to networks/monero/io/LICENSE diff --git a/coins/monero/io/README.md b/networks/monero/io/README.md similarity index 100% rename from coins/monero/io/README.md rename to networks/monero/io/README.md diff --git a/coins/monero/io/src/lib.rs b/networks/monero/io/src/lib.rs similarity index 100% rename from coins/monero/io/src/lib.rs rename to networks/monero/io/src/lib.rs diff --git a/coins/monero/primitives/Cargo.toml b/networks/monero/primitives/Cargo.toml similarity index 92% rename from coins/monero/primitives/Cargo.toml rename to networks/monero/primitives/Cargo.toml index 9477d641..2e0bb5cd 100644 --- a/coins/monero/primitives/Cargo.toml +++ b/networks/monero/primitives/Cargo.toml @@ -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 "] edition = "2021" rust-version = "1.79" diff --git a/coins/monero/primitives/LICENSE b/networks/monero/primitives/LICENSE similarity index 100% rename from coins/monero/primitives/LICENSE rename to networks/monero/primitives/LICENSE diff --git a/coins/monero/primitives/README.md b/networks/monero/primitives/README.md similarity index 100% rename from coins/monero/primitives/README.md rename to networks/monero/primitives/README.md diff --git a/coins/monero/primitives/src/lib.rs b/networks/monero/primitives/src/lib.rs similarity index 100% rename from coins/monero/primitives/src/lib.rs rename to networks/monero/primitives/src/lib.rs diff --git a/coins/monero/primitives/src/tests.rs b/networks/monero/primitives/src/tests.rs similarity index 100% rename from coins/monero/primitives/src/tests.rs rename to networks/monero/primitives/src/tests.rs diff --git a/coins/monero/primitives/src/unreduced_scalar.rs b/networks/monero/primitives/src/unreduced_scalar.rs similarity index 100% rename from coins/monero/primitives/src/unreduced_scalar.rs rename to networks/monero/primitives/src/unreduced_scalar.rs diff --git a/coins/monero/ringct/borromean/Cargo.toml b/networks/monero/ringct/borromean/Cargo.toml similarity index 92% rename from coins/monero/ringct/borromean/Cargo.toml rename to networks/monero/ringct/borromean/Cargo.toml index b239a8c3..b720c0e2 100644 --- a/coins/monero/ringct/borromean/Cargo.toml +++ b/networks/monero/ringct/borromean/Cargo.toml @@ -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 "] edition = "2021" rust-version = "1.79" diff --git a/coins/monero/ringct/borromean/LICENSE b/networks/monero/ringct/borromean/LICENSE similarity index 100% rename from coins/monero/ringct/borromean/LICENSE rename to networks/monero/ringct/borromean/LICENSE diff --git a/coins/monero/ringct/borromean/README.md b/networks/monero/ringct/borromean/README.md similarity index 100% rename from coins/monero/ringct/borromean/README.md rename to networks/monero/ringct/borromean/README.md diff --git a/coins/monero/ringct/borromean/src/lib.rs b/networks/monero/ringct/borromean/src/lib.rs similarity index 100% rename from coins/monero/ringct/borromean/src/lib.rs rename to networks/monero/ringct/borromean/src/lib.rs diff --git a/coins/monero/ringct/bulletproofs/Cargo.toml b/networks/monero/ringct/bulletproofs/Cargo.toml similarity index 94% rename from coins/monero/ringct/bulletproofs/Cargo.toml rename to networks/monero/ringct/bulletproofs/Cargo.toml index f5b44622..a4d395e0 100644 --- a/coins/monero/ringct/bulletproofs/Cargo.toml +++ b/networks/monero/ringct/bulletproofs/Cargo.toml @@ -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 "] edition = "2021" rust-version = "1.79" diff --git a/coins/monero/ringct/bulletproofs/LICENSE b/networks/monero/ringct/bulletproofs/LICENSE similarity index 100% rename from coins/monero/ringct/bulletproofs/LICENSE rename to networks/monero/ringct/bulletproofs/LICENSE diff --git a/coins/monero/ringct/bulletproofs/README.md b/networks/monero/ringct/bulletproofs/README.md similarity index 100% rename from coins/monero/ringct/bulletproofs/README.md rename to networks/monero/ringct/bulletproofs/README.md diff --git a/coins/monero/ringct/bulletproofs/build.rs b/networks/monero/ringct/bulletproofs/build.rs similarity index 100% rename from coins/monero/ringct/bulletproofs/build.rs rename to networks/monero/ringct/bulletproofs/build.rs diff --git a/coins/monero/ringct/bulletproofs/src/batch_verifier.rs b/networks/monero/ringct/bulletproofs/src/batch_verifier.rs similarity index 100% rename from coins/monero/ringct/bulletproofs/src/batch_verifier.rs rename to networks/monero/ringct/bulletproofs/src/batch_verifier.rs diff --git a/coins/monero/ringct/bulletproofs/src/core.rs b/networks/monero/ringct/bulletproofs/src/core.rs similarity index 100% rename from coins/monero/ringct/bulletproofs/src/core.rs rename to networks/monero/ringct/bulletproofs/src/core.rs diff --git a/coins/monero/ringct/bulletproofs/src/lib.rs b/networks/monero/ringct/bulletproofs/src/lib.rs similarity index 100% rename from coins/monero/ringct/bulletproofs/src/lib.rs rename to networks/monero/ringct/bulletproofs/src/lib.rs diff --git a/coins/monero/ringct/bulletproofs/src/original/inner_product.rs b/networks/monero/ringct/bulletproofs/src/original/inner_product.rs similarity index 100% rename from coins/monero/ringct/bulletproofs/src/original/inner_product.rs rename to networks/monero/ringct/bulletproofs/src/original/inner_product.rs diff --git a/coins/monero/ringct/bulletproofs/src/original/mod.rs b/networks/monero/ringct/bulletproofs/src/original/mod.rs similarity index 100% rename from coins/monero/ringct/bulletproofs/src/original/mod.rs rename to networks/monero/ringct/bulletproofs/src/original/mod.rs diff --git a/coins/monero/ringct/bulletproofs/src/plus/aggregate_range_proof.rs b/networks/monero/ringct/bulletproofs/src/plus/aggregate_range_proof.rs similarity index 100% rename from coins/monero/ringct/bulletproofs/src/plus/aggregate_range_proof.rs rename to networks/monero/ringct/bulletproofs/src/plus/aggregate_range_proof.rs diff --git a/coins/monero/ringct/bulletproofs/src/plus/mod.rs b/networks/monero/ringct/bulletproofs/src/plus/mod.rs similarity index 100% rename from coins/monero/ringct/bulletproofs/src/plus/mod.rs rename to networks/monero/ringct/bulletproofs/src/plus/mod.rs diff --git a/coins/monero/ringct/bulletproofs/src/plus/transcript.rs b/networks/monero/ringct/bulletproofs/src/plus/transcript.rs similarity index 100% rename from coins/monero/ringct/bulletproofs/src/plus/transcript.rs rename to networks/monero/ringct/bulletproofs/src/plus/transcript.rs diff --git a/coins/monero/ringct/bulletproofs/src/plus/weighted_inner_product.rs b/networks/monero/ringct/bulletproofs/src/plus/weighted_inner_product.rs similarity index 100% rename from coins/monero/ringct/bulletproofs/src/plus/weighted_inner_product.rs rename to networks/monero/ringct/bulletproofs/src/plus/weighted_inner_product.rs diff --git a/coins/monero/ringct/bulletproofs/src/point_vector.rs b/networks/monero/ringct/bulletproofs/src/point_vector.rs similarity index 100% rename from coins/monero/ringct/bulletproofs/src/point_vector.rs rename to networks/monero/ringct/bulletproofs/src/point_vector.rs diff --git a/coins/monero/ringct/bulletproofs/src/scalar_vector.rs b/networks/monero/ringct/bulletproofs/src/scalar_vector.rs similarity index 100% rename from coins/monero/ringct/bulletproofs/src/scalar_vector.rs rename to networks/monero/ringct/bulletproofs/src/scalar_vector.rs diff --git a/coins/monero/ringct/bulletproofs/src/tests/mod.rs b/networks/monero/ringct/bulletproofs/src/tests/mod.rs similarity index 100% rename from coins/monero/ringct/bulletproofs/src/tests/mod.rs rename to networks/monero/ringct/bulletproofs/src/tests/mod.rs diff --git a/coins/monero/ringct/bulletproofs/src/tests/original/inner_product.rs b/networks/monero/ringct/bulletproofs/src/tests/original/inner_product.rs similarity index 100% rename from coins/monero/ringct/bulletproofs/src/tests/original/inner_product.rs rename to networks/monero/ringct/bulletproofs/src/tests/original/inner_product.rs diff --git a/coins/monero/ringct/bulletproofs/src/tests/original/mod.rs b/networks/monero/ringct/bulletproofs/src/tests/original/mod.rs similarity index 100% rename from coins/monero/ringct/bulletproofs/src/tests/original/mod.rs rename to networks/monero/ringct/bulletproofs/src/tests/original/mod.rs diff --git a/coins/monero/ringct/bulletproofs/src/tests/plus/aggregate_range_proof.rs b/networks/monero/ringct/bulletproofs/src/tests/plus/aggregate_range_proof.rs similarity index 100% rename from coins/monero/ringct/bulletproofs/src/tests/plus/aggregate_range_proof.rs rename to networks/monero/ringct/bulletproofs/src/tests/plus/aggregate_range_proof.rs diff --git a/coins/monero/ringct/bulletproofs/src/tests/plus/mod.rs b/networks/monero/ringct/bulletproofs/src/tests/plus/mod.rs similarity index 100% rename from coins/monero/ringct/bulletproofs/src/tests/plus/mod.rs rename to networks/monero/ringct/bulletproofs/src/tests/plus/mod.rs diff --git a/coins/monero/ringct/bulletproofs/src/tests/plus/weighted_inner_product.rs b/networks/monero/ringct/bulletproofs/src/tests/plus/weighted_inner_product.rs similarity index 100% rename from coins/monero/ringct/bulletproofs/src/tests/plus/weighted_inner_product.rs rename to networks/monero/ringct/bulletproofs/src/tests/plus/weighted_inner_product.rs diff --git a/coins/monero/ringct/clsag/Cargo.toml b/networks/monero/ringct/clsag/Cargo.toml similarity index 96% rename from coins/monero/ringct/clsag/Cargo.toml rename to networks/monero/ringct/clsag/Cargo.toml index 59aaff57..27e100ee 100644 --- a/coins/monero/ringct/clsag/Cargo.toml +++ b/networks/monero/ringct/clsag/Cargo.toml @@ -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 "] edition = "2021" rust-version = "1.79" diff --git a/coins/monero/ringct/clsag/LICENSE b/networks/monero/ringct/clsag/LICENSE similarity index 100% rename from coins/monero/ringct/clsag/LICENSE rename to networks/monero/ringct/clsag/LICENSE diff --git a/coins/monero/ringct/clsag/README.md b/networks/monero/ringct/clsag/README.md similarity index 100% rename from coins/monero/ringct/clsag/README.md rename to networks/monero/ringct/clsag/README.md diff --git a/coins/monero/ringct/clsag/src/lib.rs b/networks/monero/ringct/clsag/src/lib.rs similarity index 100% rename from coins/monero/ringct/clsag/src/lib.rs rename to networks/monero/ringct/clsag/src/lib.rs diff --git a/coins/monero/ringct/clsag/src/multisig.rs b/networks/monero/ringct/clsag/src/multisig.rs similarity index 100% rename from coins/monero/ringct/clsag/src/multisig.rs rename to networks/monero/ringct/clsag/src/multisig.rs diff --git a/coins/monero/ringct/clsag/src/tests.rs b/networks/monero/ringct/clsag/src/tests.rs similarity index 100% rename from coins/monero/ringct/clsag/src/tests.rs rename to networks/monero/ringct/clsag/src/tests.rs diff --git a/coins/monero/ringct/mlsag/Cargo.toml b/networks/monero/ringct/mlsag/Cargo.toml similarity index 92% rename from coins/monero/ringct/mlsag/Cargo.toml rename to networks/monero/ringct/mlsag/Cargo.toml index e8a9747f..718b2e7c 100644 --- a/coins/monero/ringct/mlsag/Cargo.toml +++ b/networks/monero/ringct/mlsag/Cargo.toml @@ -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 "] edition = "2021" rust-version = "1.79" diff --git a/coins/monero/ringct/mlsag/LICENSE b/networks/monero/ringct/mlsag/LICENSE similarity index 100% rename from coins/monero/ringct/mlsag/LICENSE rename to networks/monero/ringct/mlsag/LICENSE diff --git a/coins/monero/ringct/mlsag/README.md b/networks/monero/ringct/mlsag/README.md similarity index 100% rename from coins/monero/ringct/mlsag/README.md rename to networks/monero/ringct/mlsag/README.md diff --git a/coins/monero/ringct/mlsag/src/lib.rs b/networks/monero/ringct/mlsag/src/lib.rs similarity index 100% rename from coins/monero/ringct/mlsag/src/lib.rs rename to networks/monero/ringct/mlsag/src/lib.rs diff --git a/coins/monero/rpc/Cargo.toml b/networks/monero/rpc/Cargo.toml similarity index 94% rename from coins/monero/rpc/Cargo.toml rename to networks/monero/rpc/Cargo.toml index ffe50379..e6e65284 100644 --- a/coins/monero/rpc/Cargo.toml +++ b/networks/monero/rpc/Cargo.toml @@ -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 "] edition = "2021" rust-version = "1.79" diff --git a/coins/monero/rpc/LICENSE b/networks/monero/rpc/LICENSE similarity index 100% rename from coins/monero/rpc/LICENSE rename to networks/monero/rpc/LICENSE diff --git a/coins/monero/rpc/README.md b/networks/monero/rpc/README.md similarity index 100% rename from coins/monero/rpc/README.md rename to networks/monero/rpc/README.md diff --git a/coins/monero/rpc/simple-request/Cargo.toml b/networks/monero/rpc/simple-request/Cargo.toml similarity index 91% rename from coins/monero/rpc/simple-request/Cargo.toml rename to networks/monero/rpc/simple-request/Cargo.toml index b0c53fcb..71f7cbfb 100644 --- a/coins/monero/rpc/simple-request/Cargo.toml +++ b/networks/monero/rpc/simple-request/Cargo.toml @@ -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 "] edition = "2021" rust-version = "1.79" diff --git a/coins/monero/rpc/simple-request/LICENSE b/networks/monero/rpc/simple-request/LICENSE similarity index 100% rename from coins/monero/rpc/simple-request/LICENSE rename to networks/monero/rpc/simple-request/LICENSE diff --git a/coins/monero/rpc/simple-request/README.md b/networks/monero/rpc/simple-request/README.md similarity index 100% rename from coins/monero/rpc/simple-request/README.md rename to networks/monero/rpc/simple-request/README.md diff --git a/coins/monero/rpc/simple-request/src/lib.rs b/networks/monero/rpc/simple-request/src/lib.rs similarity index 100% rename from coins/monero/rpc/simple-request/src/lib.rs rename to networks/monero/rpc/simple-request/src/lib.rs diff --git a/coins/monero/rpc/simple-request/tests/tests.rs b/networks/monero/rpc/simple-request/tests/tests.rs similarity index 100% rename from coins/monero/rpc/simple-request/tests/tests.rs rename to networks/monero/rpc/simple-request/tests/tests.rs diff --git a/coins/monero/rpc/src/lib.rs b/networks/monero/rpc/src/lib.rs similarity index 99% rename from coins/monero/rpc/src/lib.rs rename to networks/monero/rpc/src/lib.rs index 9ecb90b2..3bfc76b5 100644 --- a/coins/monero/rpc/src/lib.rs +++ b/networks/monero/rpc/src/lib.rs @@ -237,7 +237,7 @@ fn rpc_point(point: &str) -> Result { /// 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 { diff --git a/coins/monero/src/block.rs b/networks/monero/src/block.rs similarity index 100% rename from coins/monero/src/block.rs rename to networks/monero/src/block.rs diff --git a/coins/monero/src/lib.rs b/networks/monero/src/lib.rs similarity index 100% rename from coins/monero/src/lib.rs rename to networks/monero/src/lib.rs diff --git a/coins/monero/src/merkle.rs b/networks/monero/src/merkle.rs similarity index 100% rename from coins/monero/src/merkle.rs rename to networks/monero/src/merkle.rs diff --git a/coins/monero/src/ring_signatures.rs b/networks/monero/src/ring_signatures.rs similarity index 100% rename from coins/monero/src/ring_signatures.rs rename to networks/monero/src/ring_signatures.rs diff --git a/coins/monero/src/ringct.rs b/networks/monero/src/ringct.rs similarity index 100% rename from coins/monero/src/ringct.rs rename to networks/monero/src/ringct.rs diff --git a/coins/monero/src/tests/mod.rs b/networks/monero/src/tests/mod.rs similarity index 100% rename from coins/monero/src/tests/mod.rs rename to networks/monero/src/tests/mod.rs diff --git a/coins/monero/src/tests/transaction.rs b/networks/monero/src/tests/transaction.rs similarity index 100% rename from coins/monero/src/tests/transaction.rs rename to networks/monero/src/tests/transaction.rs diff --git a/coins/monero/src/tests/vectors/clsag_tx.json b/networks/monero/src/tests/vectors/clsag_tx.json similarity index 100% rename from coins/monero/src/tests/vectors/clsag_tx.json rename to networks/monero/src/tests/vectors/clsag_tx.json diff --git a/coins/monero/src/tests/vectors/ring_data.json b/networks/monero/src/tests/vectors/ring_data.json similarity index 100% rename from coins/monero/src/tests/vectors/ring_data.json rename to networks/monero/src/tests/vectors/ring_data.json diff --git a/coins/monero/src/tests/vectors/transactions.json b/networks/monero/src/tests/vectors/transactions.json similarity index 100% rename from coins/monero/src/tests/vectors/transactions.json rename to networks/monero/src/tests/vectors/transactions.json diff --git a/coins/monero/src/transaction.rs b/networks/monero/src/transaction.rs similarity index 100% rename from coins/monero/src/transaction.rs rename to networks/monero/src/transaction.rs diff --git a/coins/monero/tests/tests.rs b/networks/monero/tests/tests.rs similarity index 100% rename from coins/monero/tests/tests.rs rename to networks/monero/tests/tests.rs diff --git a/coins/monero/verify-chain/Cargo.toml b/networks/monero/verify-chain/Cargo.toml similarity index 92% rename from coins/monero/verify-chain/Cargo.toml rename to networks/monero/verify-chain/Cargo.toml index ce2f2861..82b2182e 100644 --- a/coins/monero/verify-chain/Cargo.toml +++ b/networks/monero/verify-chain/Cargo.toml @@ -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 "] edition = "2021" rust-version = "1.79" diff --git a/coins/monero/verify-chain/LICENSE b/networks/monero/verify-chain/LICENSE similarity index 100% rename from coins/monero/verify-chain/LICENSE rename to networks/monero/verify-chain/LICENSE diff --git a/coins/monero/verify-chain/README.md b/networks/monero/verify-chain/README.md similarity index 100% rename from coins/monero/verify-chain/README.md rename to networks/monero/verify-chain/README.md diff --git a/coins/monero/verify-chain/src/main.rs b/networks/monero/verify-chain/src/main.rs similarity index 100% rename from coins/monero/verify-chain/src/main.rs rename to networks/monero/verify-chain/src/main.rs diff --git a/coins/monero/wallet/Cargo.toml b/networks/monero/wallet/Cargo.toml similarity index 96% rename from coins/monero/wallet/Cargo.toml rename to networks/monero/wallet/Cargo.toml index 8fa282d8..0a2f9c55 100644 --- a/coins/monero/wallet/Cargo.toml +++ b/networks/monero/wallet/Cargo.toml @@ -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 "] edition = "2021" rust-version = "1.79" diff --git a/coins/monero/wallet/LICENSE b/networks/monero/wallet/LICENSE similarity index 100% rename from coins/monero/wallet/LICENSE rename to networks/monero/wallet/LICENSE diff --git a/coins/monero/wallet/README.md b/networks/monero/wallet/README.md similarity index 100% rename from coins/monero/wallet/README.md rename to networks/monero/wallet/README.md diff --git a/coins/monero/wallet/address/Cargo.toml b/networks/monero/wallet/address/Cargo.toml similarity index 93% rename from coins/monero/wallet/address/Cargo.toml rename to networks/monero/wallet/address/Cargo.toml index bb5baee0..f6f90b16 100644 --- a/coins/monero/wallet/address/Cargo.toml +++ b/networks/monero/wallet/address/Cargo.toml @@ -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 "] edition = "2021" rust-version = "1.79" diff --git a/coins/monero/wallet/address/LICENSE b/networks/monero/wallet/address/LICENSE similarity index 100% rename from coins/monero/wallet/address/LICENSE rename to networks/monero/wallet/address/LICENSE diff --git a/coins/monero/wallet/address/README.md b/networks/monero/wallet/address/README.md similarity index 100% rename from coins/monero/wallet/address/README.md rename to networks/monero/wallet/address/README.md diff --git a/coins/monero/wallet/address/src/base58check.rs b/networks/monero/wallet/address/src/base58check.rs similarity index 100% rename from coins/monero/wallet/address/src/base58check.rs rename to networks/monero/wallet/address/src/base58check.rs diff --git a/coins/monero/wallet/address/src/lib.rs b/networks/monero/wallet/address/src/lib.rs similarity index 100% rename from coins/monero/wallet/address/src/lib.rs rename to networks/monero/wallet/address/src/lib.rs diff --git a/coins/monero/wallet/address/src/tests.rs b/networks/monero/wallet/address/src/tests.rs similarity index 100% rename from coins/monero/wallet/address/src/tests.rs rename to networks/monero/wallet/address/src/tests.rs diff --git a/coins/monero/wallet/address/src/vectors/featured_addresses.json b/networks/monero/wallet/address/src/vectors/featured_addresses.json similarity index 100% rename from coins/monero/wallet/address/src/vectors/featured_addresses.json rename to networks/monero/wallet/address/src/vectors/featured_addresses.json diff --git a/coins/monero/wallet/polyseed/Cargo.toml b/networks/monero/wallet/polyseed/Cargo.toml similarity index 91% rename from coins/monero/wallet/polyseed/Cargo.toml rename to networks/monero/wallet/polyseed/Cargo.toml index a4434353..4d17e58b 100644 --- a/coins/monero/wallet/polyseed/Cargo.toml +++ b/networks/monero/wallet/polyseed/Cargo.toml @@ -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 "] edition = "2021" rust-version = "1.79" diff --git a/coins/monero/wallet/polyseed/LICENSE b/networks/monero/wallet/polyseed/LICENSE similarity index 100% rename from coins/monero/wallet/polyseed/LICENSE rename to networks/monero/wallet/polyseed/LICENSE diff --git a/coins/monero/wallet/polyseed/README.md b/networks/monero/wallet/polyseed/README.md similarity index 100% rename from coins/monero/wallet/polyseed/README.md rename to networks/monero/wallet/polyseed/README.md diff --git a/coins/monero/wallet/polyseed/src/lib.rs b/networks/monero/wallet/polyseed/src/lib.rs similarity index 100% rename from coins/monero/wallet/polyseed/src/lib.rs rename to networks/monero/wallet/polyseed/src/lib.rs diff --git a/coins/monero/wallet/polyseed/src/tests.rs b/networks/monero/wallet/polyseed/src/tests.rs similarity index 100% rename from coins/monero/wallet/polyseed/src/tests.rs rename to networks/monero/wallet/polyseed/src/tests.rs diff --git a/coins/monero/wallet/polyseed/src/words/cs.rs b/networks/monero/wallet/polyseed/src/words/cs.rs similarity index 100% rename from coins/monero/wallet/polyseed/src/words/cs.rs rename to networks/monero/wallet/polyseed/src/words/cs.rs diff --git a/coins/monero/wallet/polyseed/src/words/en.rs b/networks/monero/wallet/polyseed/src/words/en.rs similarity index 100% rename from coins/monero/wallet/polyseed/src/words/en.rs rename to networks/monero/wallet/polyseed/src/words/en.rs diff --git a/coins/monero/wallet/polyseed/src/words/es.rs b/networks/monero/wallet/polyseed/src/words/es.rs similarity index 100% rename from coins/monero/wallet/polyseed/src/words/es.rs rename to networks/monero/wallet/polyseed/src/words/es.rs diff --git a/coins/monero/wallet/polyseed/src/words/fr.rs b/networks/monero/wallet/polyseed/src/words/fr.rs similarity index 100% rename from coins/monero/wallet/polyseed/src/words/fr.rs rename to networks/monero/wallet/polyseed/src/words/fr.rs diff --git a/coins/monero/wallet/polyseed/src/words/it.rs b/networks/monero/wallet/polyseed/src/words/it.rs similarity index 100% rename from coins/monero/wallet/polyseed/src/words/it.rs rename to networks/monero/wallet/polyseed/src/words/it.rs diff --git a/coins/monero/wallet/polyseed/src/words/ja.rs b/networks/monero/wallet/polyseed/src/words/ja.rs similarity index 100% rename from coins/monero/wallet/polyseed/src/words/ja.rs rename to networks/monero/wallet/polyseed/src/words/ja.rs diff --git a/coins/monero/wallet/polyseed/src/words/ko.rs b/networks/monero/wallet/polyseed/src/words/ko.rs similarity index 100% rename from coins/monero/wallet/polyseed/src/words/ko.rs rename to networks/monero/wallet/polyseed/src/words/ko.rs diff --git a/coins/monero/wallet/polyseed/src/words/pt.rs b/networks/monero/wallet/polyseed/src/words/pt.rs similarity index 100% rename from coins/monero/wallet/polyseed/src/words/pt.rs rename to networks/monero/wallet/polyseed/src/words/pt.rs diff --git a/coins/monero/wallet/polyseed/src/words/zh_simplified.rs b/networks/monero/wallet/polyseed/src/words/zh_simplified.rs similarity index 100% rename from coins/monero/wallet/polyseed/src/words/zh_simplified.rs rename to networks/monero/wallet/polyseed/src/words/zh_simplified.rs diff --git a/coins/monero/wallet/polyseed/src/words/zh_traditional.rs b/networks/monero/wallet/polyseed/src/words/zh_traditional.rs similarity index 100% rename from coins/monero/wallet/polyseed/src/words/zh_traditional.rs rename to networks/monero/wallet/polyseed/src/words/zh_traditional.rs diff --git a/coins/monero/wallet/seed/Cargo.toml b/networks/monero/wallet/seed/Cargo.toml similarity index 92% rename from coins/monero/wallet/seed/Cargo.toml rename to networks/monero/wallet/seed/Cargo.toml index 32ba8cfd..d66f4334 100644 --- a/coins/monero/wallet/seed/Cargo.toml +++ b/networks/monero/wallet/seed/Cargo.toml @@ -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 "] edition = "2021" rust-version = "1.79" diff --git a/coins/monero/wallet/seed/LICENSE b/networks/monero/wallet/seed/LICENSE similarity index 100% rename from coins/monero/wallet/seed/LICENSE rename to networks/monero/wallet/seed/LICENSE diff --git a/coins/monero/wallet/seed/README.md b/networks/monero/wallet/seed/README.md similarity index 100% rename from coins/monero/wallet/seed/README.md rename to networks/monero/wallet/seed/README.md diff --git a/coins/monero/wallet/seed/src/lib.rs b/networks/monero/wallet/seed/src/lib.rs similarity index 100% rename from coins/monero/wallet/seed/src/lib.rs rename to networks/monero/wallet/seed/src/lib.rs diff --git a/coins/monero/wallet/seed/src/tests.rs b/networks/monero/wallet/seed/src/tests.rs similarity index 100% rename from coins/monero/wallet/seed/src/tests.rs rename to networks/monero/wallet/seed/src/tests.rs diff --git a/coins/monero/wallet/seed/src/words/ang.rs b/networks/monero/wallet/seed/src/words/ang.rs similarity index 100% rename from coins/monero/wallet/seed/src/words/ang.rs rename to networks/monero/wallet/seed/src/words/ang.rs diff --git a/coins/monero/wallet/seed/src/words/de.rs b/networks/monero/wallet/seed/src/words/de.rs similarity index 100% rename from coins/monero/wallet/seed/src/words/de.rs rename to networks/monero/wallet/seed/src/words/de.rs diff --git a/coins/monero/wallet/seed/src/words/en.rs b/networks/monero/wallet/seed/src/words/en.rs similarity index 100% rename from coins/monero/wallet/seed/src/words/en.rs rename to networks/monero/wallet/seed/src/words/en.rs diff --git a/coins/monero/wallet/seed/src/words/eo.rs b/networks/monero/wallet/seed/src/words/eo.rs similarity index 100% rename from coins/monero/wallet/seed/src/words/eo.rs rename to networks/monero/wallet/seed/src/words/eo.rs diff --git a/coins/monero/wallet/seed/src/words/es.rs b/networks/monero/wallet/seed/src/words/es.rs similarity index 100% rename from coins/monero/wallet/seed/src/words/es.rs rename to networks/monero/wallet/seed/src/words/es.rs diff --git a/coins/monero/wallet/seed/src/words/fr.rs b/networks/monero/wallet/seed/src/words/fr.rs similarity index 100% rename from coins/monero/wallet/seed/src/words/fr.rs rename to networks/monero/wallet/seed/src/words/fr.rs diff --git a/coins/monero/wallet/seed/src/words/it.rs b/networks/monero/wallet/seed/src/words/it.rs similarity index 100% rename from coins/monero/wallet/seed/src/words/it.rs rename to networks/monero/wallet/seed/src/words/it.rs diff --git a/coins/monero/wallet/seed/src/words/ja.rs b/networks/monero/wallet/seed/src/words/ja.rs similarity index 100% rename from coins/monero/wallet/seed/src/words/ja.rs rename to networks/monero/wallet/seed/src/words/ja.rs diff --git a/coins/monero/wallet/seed/src/words/jbo.rs b/networks/monero/wallet/seed/src/words/jbo.rs similarity index 100% rename from coins/monero/wallet/seed/src/words/jbo.rs rename to networks/monero/wallet/seed/src/words/jbo.rs diff --git a/coins/monero/wallet/seed/src/words/nl.rs b/networks/monero/wallet/seed/src/words/nl.rs similarity index 100% rename from coins/monero/wallet/seed/src/words/nl.rs rename to networks/monero/wallet/seed/src/words/nl.rs diff --git a/coins/monero/wallet/seed/src/words/pt.rs b/networks/monero/wallet/seed/src/words/pt.rs similarity index 100% rename from coins/monero/wallet/seed/src/words/pt.rs rename to networks/monero/wallet/seed/src/words/pt.rs diff --git a/coins/monero/wallet/seed/src/words/ru.rs b/networks/monero/wallet/seed/src/words/ru.rs similarity index 100% rename from coins/monero/wallet/seed/src/words/ru.rs rename to networks/monero/wallet/seed/src/words/ru.rs diff --git a/coins/monero/wallet/seed/src/words/zh.rs b/networks/monero/wallet/seed/src/words/zh.rs similarity index 100% rename from coins/monero/wallet/seed/src/words/zh.rs rename to networks/monero/wallet/seed/src/words/zh.rs diff --git a/coins/monero/wallet/src/decoys.rs b/networks/monero/wallet/src/decoys.rs similarity index 100% rename from coins/monero/wallet/src/decoys.rs rename to networks/monero/wallet/src/decoys.rs diff --git a/coins/monero/wallet/src/extra.rs b/networks/monero/wallet/src/extra.rs similarity index 100% rename from coins/monero/wallet/src/extra.rs rename to networks/monero/wallet/src/extra.rs diff --git a/coins/monero/wallet/src/lib.rs b/networks/monero/wallet/src/lib.rs similarity index 100% rename from coins/monero/wallet/src/lib.rs rename to networks/monero/wallet/src/lib.rs diff --git a/coins/monero/wallet/src/output.rs b/networks/monero/wallet/src/output.rs similarity index 100% rename from coins/monero/wallet/src/output.rs rename to networks/monero/wallet/src/output.rs diff --git a/coins/monero/wallet/src/scan.rs b/networks/monero/wallet/src/scan.rs similarity index 100% rename from coins/monero/wallet/src/scan.rs rename to networks/monero/wallet/src/scan.rs diff --git a/coins/monero/wallet/src/send/eventuality.rs b/networks/monero/wallet/src/send/eventuality.rs similarity index 100% rename from coins/monero/wallet/src/send/eventuality.rs rename to networks/monero/wallet/src/send/eventuality.rs diff --git a/coins/monero/wallet/src/send/mod.rs b/networks/monero/wallet/src/send/mod.rs similarity index 100% rename from coins/monero/wallet/src/send/mod.rs rename to networks/monero/wallet/src/send/mod.rs diff --git a/coins/monero/wallet/src/send/multisig.rs b/networks/monero/wallet/src/send/multisig.rs similarity index 100% rename from coins/monero/wallet/src/send/multisig.rs rename to networks/monero/wallet/src/send/multisig.rs diff --git a/coins/monero/wallet/src/send/tx.rs b/networks/monero/wallet/src/send/tx.rs similarity index 100% rename from coins/monero/wallet/src/send/tx.rs rename to networks/monero/wallet/src/send/tx.rs diff --git a/coins/monero/wallet/src/send/tx_keys.rs b/networks/monero/wallet/src/send/tx_keys.rs similarity index 100% rename from coins/monero/wallet/src/send/tx_keys.rs rename to networks/monero/wallet/src/send/tx_keys.rs diff --git a/coins/monero/wallet/src/tests/extra.rs b/networks/monero/wallet/src/tests/extra.rs similarity index 100% rename from coins/monero/wallet/src/tests/extra.rs rename to networks/monero/wallet/src/tests/extra.rs diff --git a/coins/monero/wallet/src/tests/mod.rs b/networks/monero/wallet/src/tests/mod.rs similarity index 100% rename from coins/monero/wallet/src/tests/mod.rs rename to networks/monero/wallet/src/tests/mod.rs diff --git a/coins/monero/wallet/src/view_pair.rs b/networks/monero/wallet/src/view_pair.rs similarity index 100% rename from coins/monero/wallet/src/view_pair.rs rename to networks/monero/wallet/src/view_pair.rs diff --git a/coins/monero/wallet/tests/add_data.rs b/networks/monero/wallet/tests/add_data.rs similarity index 100% rename from coins/monero/wallet/tests/add_data.rs rename to networks/monero/wallet/tests/add_data.rs diff --git a/coins/monero/wallet/tests/decoys.rs b/networks/monero/wallet/tests/decoys.rs similarity index 100% rename from coins/monero/wallet/tests/decoys.rs rename to networks/monero/wallet/tests/decoys.rs diff --git a/coins/monero/wallet/tests/eventuality.rs b/networks/monero/wallet/tests/eventuality.rs similarity index 100% rename from coins/monero/wallet/tests/eventuality.rs rename to networks/monero/wallet/tests/eventuality.rs diff --git a/coins/monero/wallet/tests/runner/builder.rs b/networks/monero/wallet/tests/runner/builder.rs similarity index 100% rename from coins/monero/wallet/tests/runner/builder.rs rename to networks/monero/wallet/tests/runner/builder.rs diff --git a/coins/monero/wallet/tests/runner/mod.rs b/networks/monero/wallet/tests/runner/mod.rs similarity index 100% rename from coins/monero/wallet/tests/runner/mod.rs rename to networks/monero/wallet/tests/runner/mod.rs diff --git a/coins/monero/wallet/tests/scan.rs b/networks/monero/wallet/tests/scan.rs similarity index 100% rename from coins/monero/wallet/tests/scan.rs rename to networks/monero/wallet/tests/scan.rs diff --git a/coins/monero/wallet/tests/send.rs b/networks/monero/wallet/tests/send.rs similarity index 100% rename from coins/monero/wallet/tests/send.rs rename to networks/monero/wallet/tests/send.rs diff --git a/coins/monero/wallet/tests/wallet2_compatibility.rs b/networks/monero/wallet/tests/wallet2_compatibility.rs similarity index 100% rename from coins/monero/wallet/tests/wallet2_compatibility.rs rename to networks/monero/wallet/tests/wallet2_compatibility.rs diff --git a/coins/monero/wallet/util/Cargo.toml b/networks/monero/wallet/util/Cargo.toml similarity index 93% rename from coins/monero/wallet/util/Cargo.toml rename to networks/monero/wallet/util/Cargo.toml index bedc8aec..a72f09bf 100644 --- a/coins/monero/wallet/util/Cargo.toml +++ b/networks/monero/wallet/util/Cargo.toml @@ -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 "] edition = "2021" rust-version = "1.79" diff --git a/coins/monero/wallet/util/LICENSE b/networks/monero/wallet/util/LICENSE similarity index 100% rename from coins/monero/wallet/util/LICENSE rename to networks/monero/wallet/util/LICENSE diff --git a/coins/monero/wallet/util/README.md b/networks/monero/wallet/util/README.md similarity index 100% rename from coins/monero/wallet/util/README.md rename to networks/monero/wallet/util/README.md diff --git a/coins/monero/wallet/util/src/lib.rs b/networks/monero/wallet/util/src/lib.rs similarity index 100% rename from coins/monero/wallet/util/src/lib.rs rename to networks/monero/wallet/util/src/lib.rs diff --git a/coins/monero/wallet/util/src/seed.rs b/networks/monero/wallet/util/src/seed.rs similarity index 100% rename from coins/monero/wallet/util/src/seed.rs rename to networks/monero/wallet/util/src/seed.rs diff --git a/coins/monero/wallet/util/tests/tests.rs b/networks/monero/wallet/util/tests/tests.rs similarity index 100% rename from coins/monero/wallet/util/tests/tests.rs rename to networks/monero/wallet/util/tests/tests.rs diff --git a/orchestration/dev/coins/bitcoin/run.sh b/orchestration/dev/networks/bitcoin/run.sh similarity index 100% rename from orchestration/dev/coins/bitcoin/run.sh rename to orchestration/dev/networks/bitcoin/run.sh diff --git a/orchestration/dev/coins/ethereum-relayer/.folder b/orchestration/dev/networks/ethereum-relayer/.folder similarity index 100% rename from orchestration/dev/coins/ethereum-relayer/.folder rename to orchestration/dev/networks/ethereum-relayer/.folder diff --git a/orchestration/dev/coins/ethereum/run.sh b/orchestration/dev/networks/ethereum/run.sh similarity index 100% rename from orchestration/dev/coins/ethereum/run.sh rename to orchestration/dev/networks/ethereum/run.sh diff --git a/orchestration/dev/coins/monero-wallet-rpc/run.sh b/orchestration/dev/networks/monero-wallet-rpc/run.sh similarity index 100% rename from orchestration/dev/coins/monero-wallet-rpc/run.sh rename to orchestration/dev/networks/monero-wallet-rpc/run.sh diff --git a/orchestration/dev/coins/monero/hashes-v0.18.3.1.txt b/orchestration/dev/networks/monero/hashes-v0.18.3.1.txt similarity index 100% rename from orchestration/dev/coins/monero/hashes-v0.18.3.1.txt rename to orchestration/dev/networks/monero/hashes-v0.18.3.1.txt diff --git a/orchestration/dev/coins/monero/run.sh b/orchestration/dev/networks/monero/run.sh similarity index 100% rename from orchestration/dev/coins/monero/run.sh rename to orchestration/dev/networks/monero/run.sh diff --git a/orchestration/runtime/Dockerfile b/orchestration/runtime/Dockerfile index e9a910d5..f3120758 100644 --- a/orchestration/runtime/Dockerfile +++ b/orchestration/runtime/Dockerfile @@ -19,7 +19,7 @@ FROM deterministic 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 diff --git a/orchestration/src/docker.rs b/orchestration/src/docker.rs index 2523bfaa..abe5834f 100644 --- a/orchestration/src/docker.rs +++ b/orchestration/src/docker.rs @@ -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 = diff --git a/orchestration/src/ethereum_relayer.rs b/orchestration/src/ethereum_relayer.rs index 523d3c62..c75f6847 100644 --- a/orchestration/src/ethereum_relayer.rs +++ b/orchestration/src/ethereum_relayer.rs @@ -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"); diff --git a/orchestration/src/main.rs b/orchestration/src/main.rs index 5422fb59..3185c107 100644 --- a/orchestration/src/main.rs +++ b/orchestration/src/main.rs @@ -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 diff --git a/orchestration/src/coins/bitcoin.rs b/orchestration/src/networks/bitcoin.rs similarity index 95% rename from orchestration/src/coins/bitcoin.rs rename to orchestration/src/networks/bitcoin.rs index 6cfd0b2d..128858ac 100644 --- a/orchestration/src/coins/bitcoin.rs +++ b/orchestration/src/networks/bitcoin.rs @@ -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"); diff --git a/orchestration/src/coins/ethereum/consensus/lighthouse.rs b/orchestration/src/networks/ethereum/consensus/lighthouse.rs similarity index 93% rename from orchestration/src/coins/ethereum/consensus/lighthouse.rs rename to orchestration/src/networks/ethereum/consensus/lighthouse.rs index add9728b..3434117d 100644 --- a/orchestration/src/coins/ethereum/consensus/lighthouse.rs +++ b/orchestration/src/networks/ethereum/consensus/lighthouse.rs @@ -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() ); diff --git a/orchestration/src/coins/ethereum/consensus/mod.rs b/orchestration/src/networks/ethereum/consensus/mod.rs similarity index 100% rename from orchestration/src/coins/ethereum/consensus/mod.rs rename to orchestration/src/networks/ethereum/consensus/mod.rs diff --git a/orchestration/src/coins/ethereum/consensus/nimbus.rs b/orchestration/src/networks/ethereum/consensus/nimbus.rs similarity index 95% rename from orchestration/src/coins/ethereum/consensus/nimbus.rs rename to orchestration/src/networks/ethereum/consensus/nimbus.rs index 07006aa9..94649e4f 100644 --- a/orchestration/src/coins/ethereum/consensus/nimbus.rs +++ b/orchestration/src/networks/ethereum/consensus/nimbus.rs @@ -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() ); diff --git a/orchestration/src/coins/ethereum/execution/anvil.rs b/orchestration/src/networks/ethereum/execution/anvil.rs similarity index 100% rename from orchestration/src/coins/ethereum/execution/anvil.rs rename to orchestration/src/networks/ethereum/execution/anvil.rs diff --git a/orchestration/src/coins/ethereum/execution/mod.rs b/orchestration/src/networks/ethereum/execution/mod.rs similarity index 100% rename from orchestration/src/coins/ethereum/execution/mod.rs rename to orchestration/src/networks/ethereum/execution/mod.rs diff --git a/orchestration/src/coins/ethereum/execution/reth.rs b/orchestration/src/networks/ethereum/execution/reth.rs similarity index 92% rename from orchestration/src/coins/ethereum/execution/reth.rs rename to orchestration/src/networks/ethereum/execution/reth.rs index 8c80a9fa..65b096dd 100644 --- a/orchestration/src/coins/ethereum/execution/reth.rs +++ b/orchestration/src/networks/ethereum/execution/reth.rs @@ -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() ); diff --git a/orchestration/src/coins/ethereum/mod.rs b/orchestration/src/networks/ethereum/mod.rs similarity index 92% rename from orchestration/src/coins/ethereum/mod.rs rename to orchestration/src/networks/ethereum/mod.rs index a06318c0..8b5c5a85 100644 --- a/orchestration/src/coins/ethereum/mod.rs +++ b/orchestration/src/networks/ethereum/mod.rs @@ -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"); diff --git a/orchestration/src/coins/mod.rs b/orchestration/src/networks/mod.rs similarity index 100% rename from orchestration/src/coins/mod.rs rename to orchestration/src/networks/mod.rs diff --git a/orchestration/src/coins/monero.rs b/orchestration/src/networks/monero.rs similarity index 93% rename from orchestration/src/coins/monero.rs rename to orchestration/src/networks/monero.rs index 7318e3e3..dfac3013 100644 --- a/orchestration/src/coins/monero.rs +++ b/orchestration/src/networks/monero.rs @@ -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"); diff --git a/orchestration/testnet/coins/bitcoin/run.sh b/orchestration/testnet/networks/bitcoin/run.sh similarity index 100% rename from orchestration/testnet/coins/bitcoin/run.sh rename to orchestration/testnet/networks/bitcoin/run.sh diff --git a/orchestration/testnet/coins/ethereum-relayer/.folder b/orchestration/testnet/networks/ethereum-relayer/.folder similarity index 100% rename from orchestration/testnet/coins/ethereum-relayer/.folder rename to orchestration/testnet/networks/ethereum-relayer/.folder diff --git a/orchestration/testnet/coins/ethereum/consensus/lighthouse/run.sh b/orchestration/testnet/networks/ethereum/consensus/lighthouse/run.sh similarity index 100% rename from orchestration/testnet/coins/ethereum/consensus/lighthouse/run.sh rename to orchestration/testnet/networks/ethereum/consensus/lighthouse/run.sh diff --git a/orchestration/testnet/coins/ethereum/consensus/nimbus/run.sh b/orchestration/testnet/networks/ethereum/consensus/nimbus/run.sh similarity index 100% rename from orchestration/testnet/coins/ethereum/consensus/nimbus/run.sh rename to orchestration/testnet/networks/ethereum/consensus/nimbus/run.sh diff --git a/orchestration/testnet/coins/ethereum/execution/geth/run.sh b/orchestration/testnet/networks/ethereum/execution/geth/run.sh similarity index 100% rename from orchestration/testnet/coins/ethereum/execution/geth/run.sh rename to orchestration/testnet/networks/ethereum/execution/geth/run.sh diff --git a/orchestration/testnet/coins/ethereum/execution/reth/run.sh b/orchestration/testnet/networks/ethereum/execution/reth/run.sh similarity index 100% rename from orchestration/testnet/coins/ethereum/execution/reth/run.sh rename to orchestration/testnet/networks/ethereum/execution/reth/run.sh diff --git a/orchestration/testnet/coins/ethereum/run.sh b/orchestration/testnet/networks/ethereum/run.sh similarity index 100% rename from orchestration/testnet/coins/ethereum/run.sh rename to orchestration/testnet/networks/ethereum/run.sh diff --git a/orchestration/testnet/coins/monero/hashes-v0.18.3.1.txt b/orchestration/testnet/networks/monero/hashes-v0.18.3.1.txt similarity index 100% rename from orchestration/testnet/coins/monero/hashes-v0.18.3.1.txt rename to orchestration/testnet/networks/monero/hashes-v0.18.3.1.txt diff --git a/orchestration/testnet/coins/monero/run.sh b/orchestration/testnet/networks/monero/run.sh similarity index 100% rename from orchestration/testnet/coins/monero/run.sh rename to orchestration/testnet/networks/monero/run.sh diff --git a/processor/Cargo.toml b/processor/Cargo.toml index 5ce87bbc..5ff7e94d 100644 --- a/processor/Cargo.toml +++ b/processor/Cargo.toml @@ -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" } diff --git a/substrate/client/Cargo.toml b/substrate/client/Cargo.toml index c69bf5f5..7bb252ce 100644 --- a/substrate/client/Cargo.toml +++ b/substrate/client/Cargo.toml @@ -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" diff --git a/tests/docker/src/lib.rs b/tests/docker/src/lib.rs index 986a1793..3db069d8 100644 --- a/tests/docker/src/lib.rs +++ b/tests/docker/src/lib.rs @@ -86,7 +86,7 @@ pub fn build(name: String) { let mut dockerfile_path = orchestration_path.clone(); if HashSet::from(["bitcoin", "ethereum", "ethereum-relayer", "monero"]).contains(name.as_str()) { - dockerfile_path = dockerfile_path.join("coins"); + dockerfile_path = dockerfile_path.join("networks"); } if name.contains("-processor") { dockerfile_path = @@ -125,7 +125,9 @@ pub fn build(name: String) { let meta = |path: PathBuf| (path.clone(), fs::metadata(path)); let mut metadatas = match name.as_str() { "bitcoin" | "ethereum" | "monero" => vec![], - "ethereum-relayer" => vec![meta(repo_path.join("common")), meta(repo_path.join("coins"))], + "ethereum-relayer" => { + vec![meta(repo_path.join("common")), meta(repo_path.join("networks"))] + } "message-queue" => vec![ meta(repo_path.join("common")), meta(repo_path.join("crypto")), @@ -135,7 +137,7 @@ pub fn build(name: String) { "bitcoin-processor" | "ethereum-processor" | "monero-processor" => vec![ meta(repo_path.join("common")), meta(repo_path.join("crypto")), - meta(repo_path.join("coins")), + meta(repo_path.join("networks")), meta(repo_path.join("substrate")), meta(repo_path.join("message-queue")), meta(repo_path.join("processor")), @@ -143,7 +145,7 @@ pub fn build(name: String) { "coordinator" => vec![ meta(repo_path.join("common")), meta(repo_path.join("crypto")), - meta(repo_path.join("coins")), + meta(repo_path.join("networks")), meta(repo_path.join("substrate")), meta(repo_path.join("message-queue")), meta(repo_path.join("coordinator")), diff --git a/tests/full-stack/Cargo.toml b/tests/full-stack/Cargo.toml index 6a487a34..4e684752 100644 --- a/tests/full-stack/Cargo.toml +++ b/tests/full-stack/Cargo.toml @@ -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" diff --git a/tests/no-std/Cargo.toml b/tests/no-std/Cargo.toml index 59015d4d..5023a80e 100644 --- a/tests/no-std/Cargo.toml +++ b/tests/no-std/Cargo.toml @@ -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"] } diff --git a/tests/processor/Cargo.toml b/tests/processor/Cargo.toml index a8245fff..ecf97fc1 100644 --- a/tests/processor/Cargo.toml +++ b/tests/processor/Cargo.toml @@ -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" }