From b6ada328e538f1cd23872a82d2e42a1ff0c7aa44 Mon Sep 17 00:00:00 2001 From: gskapka Date: Wed, 31 Jan 2024 17:33:55 +0000 Subject: [PATCH] chore(workspace): <- deprecate all v1 crates --- Cargo.lock | 226 ----------------------------------------- Cargo.toml | 24 +++-- run-all-shell-tests.sh | 4 +- 3 files changed, 16 insertions(+), 238 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4ceddf7b5..3c2443b6b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -539,63 +539,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" -[[package]] -name = "btc_on_eos" -version = "1.0.3" -dependencies = [ - "bitcoin 0.29.0", - "bitcoin 0.29.2", - "bitcoin 6.14.1", - "chain_ids", - "common", - "database_utils", - "debug_signers", - "derive_more", - "enclave_info", - "eos", - "eos-chain", - "ethereum-types 0.12.1", - "fees", - "function_name", - "hex", - "log", - "metadata", - "paste", - "safe_addresses", - "serde", - "serde_json", - "tiny-keccak 2.0.2", -] - -[[package]] -name = "btc_on_eth" -version = "1.0.2" -dependencies = [ - "bitcoin 0.29.0", - "bitcoin 0.29.2", - "bitcoin 6.14.1", - "chain_ids", - "common", - "database_utils", - "debug_signers", - "derive_more", - "enclave_info", - "ethereum", - "ethereum-types 0.12.1", - "ethereum_debug", - "fees", - "function_name", - "hex", - "log", - "metadata", - "paste", - "safe_addresses", - "serde", - "serde_json", - "simple_logger", - "tiny-keccak 2.0.2", -] - [[package]] name = "btc_on_int" version = "1.1.0" @@ -1322,33 +1265,6 @@ dependencies = [ "rand 0.7.3", ] -[[package]] -name = "eos_on_eth" -version = "1.0.2" -dependencies = [ - "chain_ids", - "common", - "database_utils", - "debug_signers", - "derive_more", - "enclave_info", - "eos", - "eos-chain", - "ethereum", - "ethereum-types 0.12.1", - "ethereum_debug", - "fees", - "function_name", - "hex", - "log", - "metadata", - "paste", - "safe_addresses", - "serde", - "serde_json", - "tiny-keccak 2.0.2", -] - [[package]] name = "eos_on_int" version = "2.0.0" @@ -1386,58 +1302,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "erc20_on_eos" -version = "1.0.2" -dependencies = [ - "chain_ids", - "common", - "database_utils", - "debug_signers", - "derive_more", - "enclave_info", - "eos", - "eos-chain", - "ethereum", - "ethereum-types 0.12.1", - "ethereum_debug", - "fees", - "function_name", - "hex", - "log", - "metadata", - "paste", - "safe_addresses", - "serde", - "serde_json", - "tiny-keccak 2.0.2", -] - -[[package]] -name = "erc20_on_evm" -version = "1.0.2" -dependencies = [ - "chain_ids", - "common", - "database_utils", - "debug_signers", - "derive_more", - "enclave_info", - "ethereum", - "ethereum-types 0.12.1", - "ethereum_debug", - "fees", - "function_name", - "hex", - "log", - "metadata", - "paste", - "safe_addresses", - "serde", - "serde_json", - "tiny-keccak 2.0.2", -] - [[package]] name = "erc20_on_int" version = "1.1.0" @@ -3266,42 +3130,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" -[[package]] -name = "pbtc-on-eos" -version = "2.1.3" -dependencies = [ - "anyhow", - "btc_on_eos", - "common", - "docopt", - "docopt_macros", - "file_logger", - "jsonrpc_database", - "log", - "paste", - "rocksdb_database", - "serde", - "stderr_logger", -] - -[[package]] -name = "pbtc-on-eth" -version = "2.1.2" -dependencies = [ - "anyhow", - "btc_on_eth", - "common", - "docopt", - "docopt_macros", - "file_logger", - "jsonrpc_database", - "log", - "paste", - "rocksdb_database", - "serde", - "stderr_logger", -] - [[package]] name = "pbtc-on-int" version = "2.1.1" @@ -3325,24 +3153,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" -[[package]] -name = "peos-on-eth" -version = "2.0.2" -dependencies = [ - "anyhow", - "common", - "docopt", - "docopt_macros", - "eos_on_eth", - "file_logger", - "jsonrpc_database", - "log", - "paste", - "rocksdb_database", - "serde", - "stderr_logger", -] - [[package]] name = "peos-on-int" version = "2.0.3" @@ -3361,42 +3171,6 @@ dependencies = [ "stderr_logger", ] -[[package]] -name = "perc20-on-eos" -version = "2.1.2" -dependencies = [ - "anyhow", - "common", - "docopt", - "docopt_macros", - "erc20_on_eos", - "file_logger", - "jsonrpc_database", - "log", - "paste", - "rocksdb_database", - "serde", - "stderr_logger", -] - -[[package]] -name = "perc20-on-evm" -version = "2.1.2" -dependencies = [ - "anyhow", - "common", - "docopt", - "docopt_macros", - "erc20_on_evm", - "file_logger", - "jsonrpc_database", - "log", - "paste", - "rocksdb_database", - "serde", - "stderr_logger", -] - [[package]] name = "perc20-on-int" version = "2.0.2" diff --git a/Cargo.toml b/Cargo.toml index 537c31036..43d33fb47 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,33 +19,37 @@ members = [ "common/safe_addresses", "common/ethereum_debug", "v2_bridges/btc_on_int", - "v1_bridges/btc_on_eos", - "v1_bridges/btc_on_eth", - "v1_bridges/eos_on_eth", "v2_bridges/int_on_eos", "v2_bridges/int_on_evm", "v2_bridges/eos_on_int", "v2_bridges/int_on_algo", "common/jsonrpc_database", "common/rocksdb_database", - "v1_bridges/erc20_on_evm", - "v1_bridges/erc20_on_eos", "v2_bridges/erc20_on_int", "v3_bridges/sentinel-app", "v3_bridges/sentinel-strongbox", "v2_bridges/vanilla_apps/pint-on-evm", - "v1_bridges/vanilla_apps/pbtc-on-eos", - "v1_bridges/vanilla_apps/pbtc-on-eth", - "v1_bridges/vanilla_apps/peos-on-eth", "v2_bridges/vanilla_apps/pbtc-on-int", "v2_bridges/vanilla_apps/peos-on-int", "v2_bridges/vanilla_apps/pint-on-eos", "v2_bridges/vanilla_apps/pint-on-algo", "v2_bridges/vanilla_apps/perc20-on-int", - "v1_bridges/vanilla_apps/perc20-on-eos", - "v1_bridges/vanilla_apps/perc20-on-evm", ] +# NOTE: These crates are all now deprecated, an no longer build. The latest release with which they still compile is: +# https://github.com/pnetwork-association/ptokens-core/releases/tag/v2024.01.24 +# Their code remains herein (for now) for posterity. +# "v1_bridges/btc_on_eos", +# "v1_bridges/btc_on_eth", +# "v1_bridges/eos_on_eth", +# "v1_bridges/erc20_on_evm", +# "v1_bridges/erc20_on_eos", +# "v1_bridges/vanilla_apps/pbtc-on-eos", +# "v1_bridges/vanilla_apps/pbtc-on-eth", +# "v1_bridges/vanilla_apps/peos-on-eth", +# "v1_bridges/vanilla_apps/perc20-on-eos", +# "v1_bridges/vanilla_apps/perc20-on-evm", + [profile.dev] split-debuginfo = "unpacked" diff --git a/run-all-shell-tests.sh b/run-all-shell-tests.sh index c61fb0a25..ab47b1cce 100755 --- a/run-all-shell-tests.sh +++ b/run-all-shell-tests.sh @@ -6,11 +6,11 @@ cd "$(dirname -- $0)" # NOTE: This script just gives an easy hook for CI to easily run any shell tests defined in this repo. -array=( $(find ./ -name "test-*.sh" -o -name "*-test.sh -print0") ) +array=( $(find ./ -name "test-*.sh" -o -name "*-test.sh -print0" | grep -v v1_bridges) ) for t in "${array[@]}" do - echo [+] Running test script: \'$t\'... + echo [+] running test script: \'$t\'... $t done