Skip to content

Commit 78eaa6f

Browse files
ImplOfAnImplImplOfAnImpl
authored
Merge pull request #1962 from mintlayer/prepare-release-v1.1.0
Prepare release v1.1.0
2 parents 2b4582b + a2ba7d3 commit 78eaa6f

12 files changed

Lines changed: 442 additions & 152 deletions

File tree

‎Cargo.lock‎

Lines changed: 82 additions & 82 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ homepage = "https://mintlayer.org"
55
repository = "https://github.com/mintlayer/mintlayer-core"
66
readme = "README.md"
77
license = "MIT"
8-
version = "1.0.2"
8+
version = "1.1.0"
99
authors = ["Samer Afach <samer.afach@mintlayer.org>", "Ben Marsh <benjamin.marsh@mintlayer.org>", "Enrico Rubboli <enrico.rubboli@mintlayer.org>"]
1010
edition = "2021"
1111

@@ -127,7 +127,7 @@ utxo = { path = "utxo" }
127127
[workspace.package]
128128
edition = "2021"
129129
rust-version = "1.88"
130-
version = "1.0.2"
130+
version = "1.1.0"
131131
license = "MIT"
132132

133133
[workspace.dependencies]

‎README.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,13 @@ Normally, the logging of mintlayer-core is configured via the `RUST_LOG` environ
5656

5757
If the `RUST_LOG` environment variable is not specified, the log level `info` will be used by default.
5858

59-
Additionally, independent of what is printed to the console, node's logs may also be automatically written to the data directory (on Linux, they will be inside `~/.mintlayer/mainnet/logs/` and `~/.mintlayer/testnet/logs/` for mainnet and testnet respectively); this is controlled by the `--log-to-file` option (e.g. `--log-to-file true`), which is accepted by both node-daemon and node-gui. By default, its value is false for node-daemon and true for node-gui. The log files are rotated based on size, so older logs will be automatically deleted eventually. Also note that the log level used in this case is always `info`, regardless of the value of `RUST_LOG`.
59+
Additionally, independent of what is printed to the console, node's logs may also be automatically written to the data directory -
60+
by default, on Linux they will appear inside `~/.mintlayer/mainnet/logs/` and `~/.mintlayer/testnet/logs/`
61+
and on Windows in `C:\Users\Username\AppData\Roaming\Mintlayer\mainnet\logs` and `C:\Users\Username\AppData\Roaming\Mintlayer\testnet\logs`
62+
(for mainnet and testnet respectively).
63+
This is controlled by the `--log-to-file` option (e.g. `--log-to-file true`), which is accepted by both node-daemon and node-gui.
64+
By default, its value is false for node-daemon and true for node-gui. The log files are rotated based on size, so older logs
65+
will be automatically deleted eventually. Also note that the log level used in this case is always `info`, regardless of the value of `RUST_LOG`.
6066

6167
Here are the commands as recommended for different scenarios:
6268

‎build-tools/docker/example-mainnet-dns-server/.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ COMPOSE_PROJECT_NAME=mintlayer-mainnet-dns-server
44

55
# Dockerhub username, from which the docker images will be pulled.
66
ML_DOCKERHUB_USERNAME=mintlayer
7-
# The image tag to use, e.g. "v1.0.2" or "latest".
7+
# The image tag to use, e.g. "v1.1.0" or "latest".
88
ML_DOCKER_IMAGE_TAG=latest
99

1010
# The user and group ids that will be used to run the software.

‎build-tools/docker/example-mainnet/.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ COMPOSE_PROJECT_NAME=mintlayer-mainnet
44

55
# Dockerhub username, from which the docker images will be pulled.
66
ML_DOCKERHUB_USERNAME=mintlayer
7-
# The image tag to use, e.g. "v1.0.2" or "latest".
7+
# The image tag to use, e.g. "v1.1.0" or "latest".
88
ML_DOCKER_IMAGE_TAG=latest
99

1010
# The user and group ids that will be used to run the software.

‎common/src/chain/config/builder.rs‎

Lines changed: 5 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,10 @@ const TESTNET_FORK_HEIGHT_4_ORDERS: BlockHeight = BlockHeight::new(325_180);
7979

8080
// The fork at which we:
8181
// * enable orders v1;
82+
// * switch to sighash input commitments v1;
8283
// * enable token id generation v1;
8384
// * prohibit updating the staker destination in ProduceBlockFromStake.
84-
const TESTNET_FORK_HEIGHT_5_ORDERS_V1: BlockHeight = BlockHeight::new(999_999_999);
85-
86-
// The fork at which we switch to sighash input commitments v1.
87-
const TESTNET_FORK_HEIGHT_6_SIGHASH_INPUT_COMMITMENTS_V1: BlockHeight =
88-
BlockHeight::new(1_999_999_999);
85+
const TESTNET_FORK_HEIGHT_5_ORDERS_V1: BlockHeight = BlockHeight::new(566060);
8986

9087
// The fork at which:
9188
// * txs with htlc and order outputs become valid;
@@ -96,14 +93,11 @@ const MAINNET_FORK_HEIGHT_1_HTLC_AND_ORDERS: BlockHeight = BlockHeight::new(254_
9693

9794
// The fork at which we:
9895
// * enable orders v1;
96+
// * switch to sighash input commitments v1;
9997
// * enable token id generation v1;
10098
// * prohibit updating the staker destination in ProduceBlockFromStake.
10199
const MAINNET_FORK_HEIGHT_2_ORDERS_V1: BlockHeight = BlockHeight::new(999_999_999);
102100

103-
// The fork at which we switch to sighash input commitments v1.
104-
const MAINNET_FORK_HEIGHT_3_SIGHASH_INPUT_COMMITMENTS_V1: BlockHeight =
105-
BlockHeight::new(1_999_999_999);
106-
107101
impl ChainType {
108102
fn default_genesis_init(&self) -> GenesisBlockInit {
109103
match self {
@@ -235,13 +229,8 @@ impl ChainType {
235229
.orders_version(OrdersVersion::V1)
236230
.staker_destination_update_forbidden(StakerDestinationUpdateForbidden::Yes)
237231
.token_id_generation_version(TokenIdGenerationVersion::V1)
232+
.sighash_input_commitment_version(SighashInputCommitmentVersion::V1)
238233
})
239-
.then(
240-
MAINNET_FORK_HEIGHT_3_SIGHASH_INPUT_COMMITMENTS_V1,
241-
|builder| {
242-
builder.sighash_input_commitment_version(SighashInputCommitmentVersion::V1)
243-
},
244-
)
245234
.build(),
246235
ChainType::Regtest | ChainType::Signet => {
247236
let upgrades = vec![(
@@ -291,13 +280,8 @@ impl ChainType {
291280
.orders_version(OrdersVersion::V1)
292281
.staker_destination_update_forbidden(StakerDestinationUpdateForbidden::Yes)
293282
.token_id_generation_version(TokenIdGenerationVersion::V1)
283+
.sighash_input_commitment_version(SighashInputCommitmentVersion::V1)
294284
})
295-
.then(
296-
TESTNET_FORK_HEIGHT_6_SIGHASH_INPUT_COMMITMENTS_V1,
297-
|builder| {
298-
builder.sighash_input_commitment_version(SighashInputCommitmentVersion::V1)
299-
},
300-
)
301285
.build(),
302286
}
303287
}
@@ -797,23 +781,6 @@ mod tests {
797781
),
798782
(
799783
MAINNET_FORK_HEIGHT_2_ORDERS_V1,
800-
ChainstateUpgrade::new(
801-
TokenIssuanceVersion::V1,
802-
RewardDistributionVersion::V1,
803-
TokensFeeVersion::V1,
804-
DataDepositFeeVersion::V1,
805-
ChangeTokenMetadataUriActivated::Yes,
806-
FrozenTokensValidationVersion::V1,
807-
HtlcActivated::Yes,
808-
OrdersActivated::Yes,
809-
OrdersVersion::V1,
810-
StakerDestinationUpdateForbidden::Yes,
811-
TokenIdGenerationVersion::V1,
812-
SighashInputCommitmentVersion::V0
813-
),
814-
),
815-
(
816-
MAINNET_FORK_HEIGHT_3_SIGHASH_INPUT_COMMITMENTS_V1,
817784
ChainstateUpgrade::new(
818785
TokenIssuanceVersion::V1,
819786
RewardDistributionVersion::V1,
@@ -928,23 +895,6 @@ mod tests {
928895
),
929896
(
930897
TESTNET_FORK_HEIGHT_5_ORDERS_V1,
931-
ChainstateUpgrade::new(
932-
TokenIssuanceVersion::V1,
933-
RewardDistributionVersion::V1,
934-
TokensFeeVersion::V1,
935-
DataDepositFeeVersion::V1,
936-
ChangeTokenMetadataUriActivated::Yes,
937-
FrozenTokensValidationVersion::V1,
938-
HtlcActivated::Yes,
939-
OrdersActivated::Yes,
940-
OrdersVersion::V1,
941-
StakerDestinationUpdateForbidden::Yes,
942-
TokenIdGenerationVersion::V1,
943-
SighashInputCommitmentVersion::V0
944-
),
945-
),
946-
(
947-
TESTNET_FORK_HEIGHT_6_SIGHASH_INPUT_COMMITMENTS_V1,
948898
ChainstateUpgrade::new(
949899
TokenIssuanceVersion::V1,
950900
RewardDistributionVersion::V1,

0 commit comments

Comments
 (0)