From b60fc1e225158f22cc0bf79d5dedb591f2b0c023 Mon Sep 17 00:00:00 2001 From: Heorhii Azarov Date: Thu, 14 Nov 2024 14:53:34 +0200 Subject: [PATCH 1/3] Set fork height --- common/src/chain/config/builder.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/chain/config/builder.rs b/common/src/chain/config/builder.rs index 227079291..54c9bc5f8 100644 --- a/common/src/chain/config/builder.rs +++ b/common/src/chain/config/builder.rs @@ -56,9 +56,9 @@ const TESTNET_HTLC_AND_DATA_DEPOSIT_FEE_FORK_HEIGHT: BlockHeight = BlockHeight:: // The fork, at which order outputs become valid const TESTNET_ORDERS_FORK_HEIGHT: BlockHeight = BlockHeight::new(325_180); // The fork, at which rules for validating frozen tokens changed -const MAINNET_FROZEN_TOKENS_VALIDATION_FORK_HEIGHT: BlockHeight = BlockHeight::new(99_999_999); +const MAINNET_FROZEN_TOKENS_VALIDATION_FORK_HEIGHT: BlockHeight = BlockHeight::new(254_740); // The fork, at which txs with htlc and orders outputs become valid -const MAINNET_HTLC_AND_ORDERS_FORK_HEIGHT: BlockHeight = BlockHeight::new(99_999_999); +const MAINNET_HTLC_AND_ORDERS_FORK_HEIGHT: BlockHeight = BlockHeight::new(254_740); impl ChainType { fn default_genesis_init(&self) -> GenesisBlockInit { From 7d171f2149960ef9b954f00951d6978626b15f5b Mon Sep 17 00:00:00 2001 From: Heorhii Azarov Date: Thu, 14 Nov 2024 14:55:20 +0200 Subject: [PATCH 2/3] Bump version to 1.0.0 --- Cargo.lock | 160 +++++++++++++-------------- Cargo.toml | 4 +- node-daemon/docs/RPC.md | 2 +- node-daemon/docs/RPC_DEV.md | 2 +- wallet/wallet-rpc-daemon/docs/RPC.md | 2 +- 5 files changed, 85 insertions(+), 85 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8911609d6..ad0b32cfb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,7 +20,7 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "accounting" -version = "0.7.0" +version = "1.0.0" dependencies = [ "common", "parity-scale-codec", @@ -247,7 +247,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "api-blockchain-scanner-daemon" -version = "0.7.0" +version = "1.0.0" dependencies = [ "api-blockchain-scanner-lib", "api-server-common", @@ -265,7 +265,7 @@ dependencies = [ [[package]] name = "api-blockchain-scanner-lib" -version = "0.7.0" +version = "1.0.0" dependencies = [ "api-server-common", "async-trait", @@ -294,7 +294,7 @@ dependencies = [ [[package]] name = "api-server-backend-test-suite" -version = "0.7.0" +version = "1.0.0" dependencies = [ "api-server-common", "async-trait", @@ -317,7 +317,7 @@ dependencies = [ [[package]] name = "api-server-common" -version = "0.7.0" +version = "1.0.0" dependencies = [ "async-trait", "bb8-postgres", @@ -342,7 +342,7 @@ dependencies = [ [[package]] name = "api-server-stack-test-suite" -version = "0.7.0" +version = "1.0.0" dependencies = [ "api-blockchain-scanner-lib", "api-server-common", @@ -371,7 +371,7 @@ dependencies = [ [[package]] name = "api-web-server" -version = "0.7.0" +version = "1.0.0" dependencies = [ "api-server-common", "async-trait", @@ -907,7 +907,7 @@ dependencies = [ [[package]] name = "blockprod" -version = "0.7.0" +version = "1.0.0" dependencies = [ "async-trait", "chainstate", @@ -1181,7 +1181,7 @@ dependencies = [ [[package]] name = "chainstate" -version = "0.7.0" +version = "1.0.0" dependencies = [ "accounting", "async-trait", @@ -1226,7 +1226,7 @@ dependencies = [ [[package]] name = "chainstate-launcher" -version = "0.7.0" +version = "1.0.0" dependencies = [ "chainstate", "chainstate-storage", @@ -1241,7 +1241,7 @@ dependencies = [ [[package]] name = "chainstate-storage" -version = "0.7.0" +version = "1.0.0" dependencies = [ "accounting", "chainstate-types", @@ -1267,7 +1267,7 @@ dependencies = [ [[package]] name = "chainstate-test-framework" -version = "0.7.0" +version = "1.0.0" dependencies = [ "chainstate", "chainstate-storage", @@ -1296,7 +1296,7 @@ dependencies = [ [[package]] name = "chainstate-test-suite" -version = "0.7.0" +version = "1.0.0" dependencies = [ "accounting", "chainstate", @@ -1328,7 +1328,7 @@ dependencies = [ [[package]] name = "chainstate-types" -version = "0.7.0" +version = "1.0.0" dependencies = [ "common", "crypto", @@ -1537,7 +1537,7 @@ dependencies = [ [[package]] name = "common" -version = "0.7.0" +version = "1.0.0" dependencies = [ "anyhow", "bech32 0.11.0", @@ -1591,7 +1591,7 @@ dependencies = [ [[package]] name = "consensus" -version = "0.7.0" +version = "1.0.0" dependencies = [ "chainstate-types", "common", @@ -1612,7 +1612,7 @@ dependencies = [ [[package]] name = "constraints-value-accumulator" -version = "0.7.0" +version = "1.0.0" dependencies = [ "accounting", "common", @@ -1839,7 +1839,7 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto" -version = "0.7.0" +version = "1.0.0" dependencies = [ "argon2", "bip39", @@ -2127,7 +2127,7 @@ dependencies = [ [[package]] name = "dns-server" -version = "0.7.0" +version = "1.0.0" dependencies = [ "anyhow", "async-trait", @@ -3936,7 +3936,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "log_error" -version = "0.7.0" +version = "1.0.0" dependencies = [ "derive_more", "logging", @@ -3949,7 +3949,7 @@ dependencies = [ [[package]] name = "logging" -version = "0.7.0" +version = "1.0.0" dependencies = [ "log", "thiserror", @@ -4101,7 +4101,7 @@ dependencies = [ [[package]] name = "mempool" -version = "0.7.0" +version = "1.0.0" dependencies = [ "accounting", "anyhow", @@ -4144,7 +4144,7 @@ dependencies = [ [[package]] name = "mempool-types" -version = "0.7.0" +version = "1.0.0" dependencies = [ "p2p-types", "rpc-description", @@ -4216,7 +4216,7 @@ dependencies = [ [[package]] name = "mintlayer-core" -version = "0.7.0" +version = "1.0.0" dependencies = [ "chainstate", "chainstate-storage", @@ -4235,7 +4235,7 @@ dependencies = [ [[package]] name = "mintlayer-test" -version = "0.7.0" +version = "1.0.0" dependencies = [ "clap", "libtest-mimic", @@ -4251,7 +4251,7 @@ dependencies = [ [[package]] name = "mintscript" -version = "0.7.0" +version = "1.0.0" dependencies = [ "common", "crypto", @@ -4322,7 +4322,7 @@ dependencies = [ [[package]] name = "mocks" -version = "0.7.0" +version = "1.0.0" dependencies = [ "async-trait", "chainstate", @@ -4409,7 +4409,7 @@ dependencies = [ [[package]] name = "networking" -version = "0.7.0" +version = "1.0.0" dependencies = [ "async-trait", "bytes", @@ -4456,7 +4456,7 @@ dependencies = [ [[package]] name = "node-comm" -version = "0.7.0" +version = "1.0.0" dependencies = [ "async-trait", "base64 0.22.1", @@ -4483,7 +4483,7 @@ dependencies = [ [[package]] name = "node-daemon" -version = "0.7.0" +version = "1.0.0" dependencies = [ "anyhow", "assert_cmd", @@ -4497,7 +4497,7 @@ dependencies = [ [[package]] name = "node-gui" -version = "0.7.0" +version = "1.0.0" dependencies = [ "anyhow", "chainstate", @@ -4530,7 +4530,7 @@ dependencies = [ [[package]] name = "node-lib" -version = "0.7.0" +version = "1.0.0" dependencies = [ "anyhow", "blockprod", @@ -4968,7 +4968,7 @@ dependencies = [ [[package]] name = "orders-accounting" -version = "0.7.0" +version = "1.0.0" dependencies = [ "accounting", "chainstate-types", @@ -5027,7 +5027,7 @@ dependencies = [ [[package]] name = "p2p" -version = "0.7.0" +version = "1.0.0" dependencies = [ "async-trait", "chainstate", @@ -5078,7 +5078,7 @@ dependencies = [ [[package]] name = "p2p-backend-test-suite" -version = "0.7.0" +version = "1.0.0" dependencies = [ "chainstate", "common", @@ -5098,7 +5098,7 @@ dependencies = [ [[package]] name = "p2p-test-utils" -version = "0.7.0" +version = "1.0.0" dependencies = [ "chainstate", "chainstate-storage", @@ -5118,7 +5118,7 @@ dependencies = [ [[package]] name = "p2p-types" -version = "0.7.0" +version = "1.0.0" dependencies = [ "common", "parity-scale-codec", @@ -5432,7 +5432,7 @@ dependencies = [ [[package]] name = "pos-accounting" -version = "0.7.0" +version = "1.0.0" dependencies = [ "accounting", "common", @@ -5804,7 +5804,7 @@ dependencies = [ [[package]] name = "randomness" -version = "0.7.0" +version = "1.0.0" dependencies = [ "rand 0.8.5", ] @@ -6155,7 +6155,7 @@ checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "rpc" -version = "0.7.0" +version = "1.0.0" dependencies = [ "anyhow", "async-trait", @@ -6185,7 +6185,7 @@ dependencies = [ [[package]] name = "rpc-description" -version = "0.7.0" +version = "1.0.0" dependencies = [ "rpc-description-macro", "serde_json", @@ -6193,7 +6193,7 @@ dependencies = [ [[package]] name = "rpc-description-macro" -version = "0.7.0" +version = "1.0.0" dependencies = [ "proc-macro2", "quote", @@ -6202,7 +6202,7 @@ dependencies = [ [[package]] name = "rpc-types" -version = "0.7.0" +version = "1.0.0" dependencies = [ "hex", "rpc-description", @@ -6511,7 +6511,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "script" -version = "0.7.0" +version = "1.0.0" dependencies = [ "crypto", "flate2", @@ -6766,7 +6766,7 @@ dependencies = [ [[package]] name = "serialization" -version = "0.7.0" +version = "1.0.0" dependencies = [ "hex", "rpc-description", @@ -6779,7 +6779,7 @@ dependencies = [ [[package]] name = "serialization-core" -version = "0.7.0" +version = "1.0.0" dependencies = [ "arraytools", "hex-literal", @@ -6789,7 +6789,7 @@ dependencies = [ [[package]] name = "serialization-tagged" -version = "0.7.0" +version = "1.0.0" dependencies = [ "parity-scale-codec", "proptest", @@ -6801,7 +6801,7 @@ dependencies = [ [[package]] name = "serialization-tagged-derive" -version = "0.7.0" +version = "1.0.0" dependencies = [ "itertools 0.13.0", "proc-macro2", @@ -7161,7 +7161,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "storage" -version = "0.7.0" +version = "1.0.0" dependencies = [ "common", "rstest", @@ -7174,7 +7174,7 @@ dependencies = [ [[package]] name = "storage-backend-test-suite" -version = "0.7.0" +version = "1.0.0" dependencies = [ "libtest-mimic", "logging", @@ -7189,7 +7189,7 @@ dependencies = [ [[package]] name = "storage-core" -version = "0.7.0" +version = "1.0.0" dependencies = [ "common", "itertools 0.13.0", @@ -7202,7 +7202,7 @@ dependencies = [ [[package]] name = "storage-failing" -version = "0.7.0" +version = "1.0.0" dependencies = [ "enumflags2", "storage", @@ -7214,7 +7214,7 @@ dependencies = [ [[package]] name = "storage-inmemory" -version = "0.7.0" +version = "1.0.0" dependencies = [ "storage-backend-test-suite", "storage-core", @@ -7223,7 +7223,7 @@ dependencies = [ [[package]] name = "storage-lmdb" -version = "0.7.0" +version = "1.0.0" dependencies = [ "lmdb-mintlayer", "logging", @@ -7237,7 +7237,7 @@ dependencies = [ [[package]] name = "storage-sqlite" -version = "0.7.0" +version = "1.0.0" dependencies = [ "hex", "logging", @@ -7301,7 +7301,7 @@ dependencies = [ [[package]] name = "subsystem" -version = "0.7.0" +version = "1.0.0" dependencies = [ "async-trait", "cfg-if", @@ -7462,7 +7462,7 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "test-rpc-functions" -version = "0.7.0" +version = "1.0.0" dependencies = [ "async-trait", "chainstate", @@ -7484,7 +7484,7 @@ dependencies = [ [[package]] name = "test-utils" -version = "0.7.0" +version = "1.0.0" dependencies = [ "common", "crypto", @@ -7646,7 +7646,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokens-accounting" -version = "0.7.0" +version = "1.0.0" dependencies = [ "accounting", "chainstate-types", @@ -8098,7 +8098,7 @@ checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" [[package]] name = "tx-verifier" -version = "0.7.0" +version = "1.0.0" dependencies = [ "accounting", "chainstate-storage", @@ -8128,14 +8128,14 @@ dependencies = [ [[package]] name = "typename" -version = "0.7.0" +version = "1.0.0" dependencies = [ "typename-derive", ] [[package]] name = "typename-derive" -version = "0.7.0" +version = "1.0.0" dependencies = [ "itertools 0.13.0", "quote", @@ -8282,7 +8282,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "utils" -version = "0.7.0" +version = "1.0.0" dependencies = [ "anyhow", "clap", @@ -8313,7 +8313,7 @@ dependencies = [ [[package]] name = "utils-networking" -version = "0.7.0" +version = "1.0.0" dependencies = [ "addr", "itertools 0.13.0", @@ -8327,7 +8327,7 @@ dependencies = [ [[package]] name = "utxo" -version = "0.7.0" +version = "1.0.0" dependencies = [ "chainstate-types", "common", @@ -8417,7 +8417,7 @@ dependencies = [ [[package]] name = "wallet" -version = "0.7.0" +version = "1.0.0" dependencies = [ "bip39", "chainstate", @@ -8451,7 +8451,7 @@ dependencies = [ [[package]] name = "wallet-address-generator" -version = "0.7.0" +version = "1.0.0" dependencies = [ "clap", "common", @@ -8466,7 +8466,7 @@ dependencies = [ [[package]] name = "wallet-address-generator-lib" -version = "0.7.0" +version = "1.0.0" dependencies = [ "clap", "common", @@ -8480,7 +8480,7 @@ dependencies = [ [[package]] name = "wallet-cli" -version = "0.7.0" +version = "1.0.0" dependencies = [ "clap", "tokio", @@ -8490,7 +8490,7 @@ dependencies = [ [[package]] name = "wallet-cli-commands" -version = "0.7.0" +version = "1.0.0" dependencies = [ "async-trait", "blockprod", @@ -8537,7 +8537,7 @@ dependencies = [ [[package]] name = "wallet-cli-lib" -version = "0.7.0" +version = "1.0.0" dependencies = [ "async-trait", "blockprod", @@ -8584,7 +8584,7 @@ dependencies = [ [[package]] name = "wallet-controller" -version = "0.7.0" +version = "1.0.0" dependencies = [ "anyhow", "async-trait", @@ -8620,7 +8620,7 @@ dependencies = [ [[package]] name = "wallet-rpc-client" -version = "0.7.0" +version = "1.0.0" dependencies = [ "async-trait", "base64 0.22.1", @@ -8649,7 +8649,7 @@ dependencies = [ [[package]] name = "wallet-rpc-daemon" -version = "0.7.0" +version = "1.0.0" dependencies = [ "clap", "common", @@ -8665,7 +8665,7 @@ dependencies = [ [[package]] name = "wallet-rpc-lib" -version = "0.7.0" +version = "1.0.0" dependencies = [ "anyhow", "async-trait", @@ -8704,7 +8704,7 @@ dependencies = [ [[package]] name = "wallet-storage" -version = "0.7.0" +version = "1.0.0" dependencies = [ "bip39", "common", @@ -8723,7 +8723,7 @@ dependencies = [ [[package]] name = "wallet-test-node" -version = "0.7.0" +version = "1.0.0" dependencies = [ "blockprod", "chainstate", @@ -8744,7 +8744,7 @@ dependencies = [ [[package]] name = "wallet-types" -version = "0.7.0" +version = "1.0.0" dependencies = [ "bip39", "common", @@ -8860,7 +8860,7 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-doc-gen" -version = "0.7.0" +version = "1.0.0" dependencies = [ "anyhow", "clap", @@ -8884,7 +8884,7 @@ dependencies = [ [[package]] name = "wasm-wrappers" -version = "0.7.0" +version = "1.0.0" dependencies = [ "bip39", "common", diff --git a/Cargo.toml b/Cargo.toml index 57864b184..978ec0002 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ homepage = "https://mintlayer.org" repository = "https://github.com/mintlayer/mintlayer-core" readme = "README.md" license = "MIT" -version = "0.7.0" +version = "1.0.0" authors = ["Samer Afach ", "Ben Marsh ", "Enrico Rubboli "] edition = "2021" @@ -125,7 +125,7 @@ utxo = { path = "utxo" } [workspace.package] edition = "2021" rust-version = "1.80" -version = "0.7.0" +version = "1.0.0" license = "MIT" [workspace.dependencies] diff --git a/node-daemon/docs/RPC.md b/node-daemon/docs/RPC.md index daf2ccaf1..adddc5e6a 100644 --- a/node-daemon/docs/RPC.md +++ b/node-daemon/docs/RPC.md @@ -1,6 +1,6 @@ # RPC documentation for Mintlayer node -Version `0.7.0`. +Version `1.0.0`. ## Module `node` diff --git a/node-daemon/docs/RPC_DEV.md b/node-daemon/docs/RPC_DEV.md index 6f2ef6939..487598d86 100644 --- a/node-daemon/docs/RPC_DEV.md +++ b/node-daemon/docs/RPC_DEV.md @@ -1,6 +1,6 @@ # RPC documentation for Mintlayer node developer functions -Version `0.7.0`. +Version `1.0.0`. These functions are used for testing and only enabled in regtest. diff --git a/wallet/wallet-rpc-daemon/docs/RPC.md b/wallet/wallet-rpc-daemon/docs/RPC.md index b4a368966..dcd1f24aa 100644 --- a/wallet/wallet-rpc-daemon/docs/RPC.md +++ b/wallet/wallet-rpc-daemon/docs/RPC.md @@ -1,6 +1,6 @@ # RPC documentation for Mintlayer node wallet -Version `0.7.0`. +Version `1.0.0`. ## Module `WalletRpc` From d25fc4c205e8719b0d53607ba5740f1e226ece57 Mon Sep 17 00:00:00 2001 From: Heorhii Azarov Date: Thu, 14 Nov 2024 15:23:26 +0200 Subject: [PATCH 3/3] Remove redundant fork --- common/src/chain/config/builder.rs | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/common/src/chain/config/builder.rs b/common/src/chain/config/builder.rs index 54c9bc5f8..b331ab510 100644 --- a/common/src/chain/config/builder.rs +++ b/common/src/chain/config/builder.rs @@ -55,8 +55,6 @@ const TESTNET_STAKER_REWARD_AND_TOKENS_FEE_FORK_HEIGHT: BlockHeight = BlockHeigh const TESTNET_HTLC_AND_DATA_DEPOSIT_FEE_FORK_HEIGHT: BlockHeight = BlockHeight::new(297_550); // The fork, at which order outputs become valid const TESTNET_ORDERS_FORK_HEIGHT: BlockHeight = BlockHeight::new(325_180); -// The fork, at which rules for validating frozen tokens changed -const MAINNET_FROZEN_TOKENS_VALIDATION_FORK_HEIGHT: BlockHeight = BlockHeight::new(254_740); // The fork, at which txs with htlc and orders outputs become valid const MAINNET_HTLC_AND_ORDERS_FORK_HEIGHT: BlockHeight = BlockHeight::new(254_740); @@ -179,19 +177,6 @@ impl ChainType { OrdersActivated::No, ), ), - ( - MAINNET_FROZEN_TOKENS_VALIDATION_FORK_HEIGHT, - ChainstateUpgrade::new( - TokenIssuanceVersion::V1, - RewardDistributionVersion::V1, - TokensFeeVersion::V1, - DataDepositFeeVersion::V1, - ChangeTokenMetadataUriActivated::Yes, - FrozenTokensValidationVersion::V1, - HtlcActivated::Yes, - OrdersActivated::Yes, - ), - ), ( MAINNET_HTLC_AND_ORDERS_FORK_HEIGHT, ChainstateUpgrade::new(