Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
164 changes: 82 additions & 82 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ homepage = "https://mintlayer.org"
repository = "https://github.com/mintlayer/mintlayer-core"
readme = "README.md"
license = "MIT"
version = "1.0.2"
version = "1.1.0"
authors = ["Samer Afach <samer.afach@mintlayer.org>", "Ben Marsh <benjamin.marsh@mintlayer.org>", "Enrico Rubboli <enrico.rubboli@mintlayer.org>"]
edition = "2021"

Expand Down Expand Up @@ -127,7 +127,7 @@ utxo = { path = "utxo" }
[workspace.package]
edition = "2021"
rust-version = "1.88"
version = "1.0.2"
version = "1.1.0"
license = "MIT"

[workspace.dependencies]
Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,13 @@ Normally, the logging of mintlayer-core is configured via the `RUST_LOG` environ

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

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`.
Additionally, independent of what is printed to the console, node's logs may also be automatically written to the data directory -
by default, on Linux they will appear inside `~/.mintlayer/mainnet/logs/` and `~/.mintlayer/testnet/logs/`
and on Windows in `C:\Users\Username\AppData\Roaming\Mintlayer\mainnet\logs` and `C:\Users\Username\AppData\Roaming\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`.

Here are the commands as recommended for different scenarios:

Expand Down
2 changes: 1 addition & 1 deletion build-tools/docker/example-mainnet-dns-server/.env
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ COMPOSE_PROJECT_NAME=mintlayer-mainnet-dns-server

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

# The user and group ids that will be used to run the software.
Expand Down
2 changes: 1 addition & 1 deletion build-tools/docker/example-mainnet/.env
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ COMPOSE_PROJECT_NAME=mintlayer-mainnet

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

# The user and group ids that will be used to run the software.
Expand Down
60 changes: 5 additions & 55 deletions common/src/chain/config/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,10 @@ const TESTNET_FORK_HEIGHT_4_ORDERS: BlockHeight = BlockHeight::new(325_180);

// The fork at which we:
// * enable orders v1;
// * switch to sighash input commitments v1;
// * enable token id generation v1;
// * prohibit updating the staker destination in ProduceBlockFromStake.
const TESTNET_FORK_HEIGHT_5_ORDERS_V1: BlockHeight = BlockHeight::new(999_999_999);

// The fork at which we switch to sighash input commitments v1.
const TESTNET_FORK_HEIGHT_6_SIGHASH_INPUT_COMMITMENTS_V1: BlockHeight =
BlockHeight::new(1_999_999_999);
const TESTNET_FORK_HEIGHT_5_ORDERS_V1: BlockHeight = BlockHeight::new(566060);

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

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

// The fork at which we switch to sighash input commitments v1.
const MAINNET_FORK_HEIGHT_3_SIGHASH_INPUT_COMMITMENTS_V1: BlockHeight =
BlockHeight::new(1_999_999_999);

impl ChainType {
fn default_genesis_init(&self) -> GenesisBlockInit {
match self {
Expand Down Expand Up @@ -235,13 +229,8 @@ impl ChainType {
.orders_version(OrdersVersion::V1)
.staker_destination_update_forbidden(StakerDestinationUpdateForbidden::Yes)
.token_id_generation_version(TokenIdGenerationVersion::V1)
.sighash_input_commitment_version(SighashInputCommitmentVersion::V1)
})
.then(
MAINNET_FORK_HEIGHT_3_SIGHASH_INPUT_COMMITMENTS_V1,
|builder| {
builder.sighash_input_commitment_version(SighashInputCommitmentVersion::V1)
},
)
.build(),
ChainType::Regtest | ChainType::Signet => {
let upgrades = vec![(
Expand Down Expand Up @@ -291,13 +280,8 @@ impl ChainType {
.orders_version(OrdersVersion::V1)
.staker_destination_update_forbidden(StakerDestinationUpdateForbidden::Yes)
.token_id_generation_version(TokenIdGenerationVersion::V1)
.sighash_input_commitment_version(SighashInputCommitmentVersion::V1)
})
.then(
TESTNET_FORK_HEIGHT_6_SIGHASH_INPUT_COMMITMENTS_V1,
|builder| {
builder.sighash_input_commitment_version(SighashInputCommitmentVersion::V1)
},
)
.build(),
}
}
Expand Down Expand Up @@ -797,23 +781,6 @@ mod tests {
),
(
MAINNET_FORK_HEIGHT_2_ORDERS_V1,
ChainstateUpgrade::new(
TokenIssuanceVersion::V1,
RewardDistributionVersion::V1,
TokensFeeVersion::V1,
DataDepositFeeVersion::V1,
ChangeTokenMetadataUriActivated::Yes,
FrozenTokensValidationVersion::V1,
HtlcActivated::Yes,
OrdersActivated::Yes,
OrdersVersion::V1,
StakerDestinationUpdateForbidden::Yes,
TokenIdGenerationVersion::V1,
SighashInputCommitmentVersion::V0
),
),
(
MAINNET_FORK_HEIGHT_3_SIGHASH_INPUT_COMMITMENTS_V1,
ChainstateUpgrade::new(
TokenIssuanceVersion::V1,
RewardDistributionVersion::V1,
Expand Down Expand Up @@ -928,23 +895,6 @@ mod tests {
),
(
TESTNET_FORK_HEIGHT_5_ORDERS_V1,
ChainstateUpgrade::new(
TokenIssuanceVersion::V1,
RewardDistributionVersion::V1,
TokensFeeVersion::V1,
DataDepositFeeVersion::V1,
ChangeTokenMetadataUriActivated::Yes,
FrozenTokensValidationVersion::V1,
HtlcActivated::Yes,
OrdersActivated::Yes,
OrdersVersion::V1,
StakerDestinationUpdateForbidden::Yes,
TokenIdGenerationVersion::V1,
SighashInputCommitmentVersion::V0
),
),
(
TESTNET_FORK_HEIGHT_6_SIGHASH_INPUT_COMMITMENTS_V1,
ChainstateUpgrade::new(
TokenIssuanceVersion::V1,
RewardDistributionVersion::V1,
Expand Down
Loading
Loading