Skip to content

Commit

Permalink
Merge branch 'main' into testnet
Browse files Browse the repository at this point in the history
  • Loading branch information
AurelienFT committed Mar 1, 2023
2 parents 668ba54 + 42ce9ef commit 8e53f3a
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion massa-models/src/config/constants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ lazy_static::lazy_static! {
.saturating_add(MassaTime::from_millis(1000 * 10))
)
} else {
1677675600000.into() // Wednesday, March 1, 2023 01:00:00 PM UTC
1677682800000.into() // Wednesday, March 1, 2023 03:00:00 PM UTC
};

/// TESTNET: time when the blockclique is ended.
Expand Down
18 changes: 9 additions & 9 deletions massa-node/base_config/initial_ledger.json
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
{
"AU1qDAxGJ387ETi9JRQzZWSPKYq4YPXrFvdiE4VoXUaiAt38JFEC": {
"AU12dhs6CsQk8AXFTYyUpc1P9e8GDf65ozU6RcigW68qfJV7vdbNf": {
"balance": "1000000000",
"datastore": {},
"bytecode": []
},
"AU12M3AQqs7JH7mSe1UZyEA5NQ7nGQHXaqqxe1TGEpkimcRhsQ4eF": {
"AU12WQRoxQJKMjNG8hVjkyh4YgBwaYeUH4BsqJEEdTUJda37GhSx9": {
"balance": "1000000000",
"datastore": {},
"bytecode": []
},
"AU1nsqw9mCcYLyyMJx5f4in4NXDoe4B1LzV9pQdvX5Wrxq9ehf6h": {
"AU1226KGgzq425xzpNmrUCggKcru4yMkFSUXGxYnTwCt6vso5PVbn": {
"balance": "1000000000",
"datastore": {},
"bytecode": []
},
"AU1pdnk7gME8DSA6ueNZdCHqfSt9YfTwAJSgRCcB8g3z3kkapWtU": {
"AU12p3neq9Caq8idS33jrWuRZgfoBL3wAAfG2NdZEBxNdfujVtCLq": {
"balance": "1000000000",
"datastore": {},
"bytecode": []
},
"AU1H1Ze77ctAFi4FBc3nVe9AtWdtg7246V9pVXSeXqWaJFLPKfB1": {
"AU122tXU6uhDfGP1BxCtvLQTvyascwsjX5NVo3vv1fssmdeKSeytM": {
"balance": "1000000000",
"datastore": {},
"bytecode": []
},
"AU12Dvay7jT1maaKpV9CHX6yMt3cS5ZEWy6Q67HV8twVGS3ihoq5x": {
"AU1xfaL8CTrZWTBY79JDMEokwYjc2U4gUFJqqgtbahj7gwYn2s6Y": {
"balance": "1000000000",
"datastore": {},
"bytecode": []
},
"AU13evhD7c9AXFc6CxWWjWWRT6bQnejYhq3MsNofJWJDe4UQStJE": {
"AU1xgxVCw4Vnr2s8JSnFYzz8UGuqZdMH7wHBDUapndgRCdDteWS": {
"balance": "1000000000",
"datastore": {},
"bytecode": []
},
"AU1UpZLobUAWqj3M9DpBZNhh4GD4ZLvixKXQu2kt7ZDUiEepD89E": {
"AU12DPHgthL9JJGrASquAmsdef9oYpLCXzZRvyiXzY3TG87Hgcs4o": {
"balance": "1000000000",
"datastore": {},
"bytecode": []
},
"AU12p8v9V68SiehQb2Syzy6smfv9NTCJh2p6JPbsacy7PaGRw39uH": {
"AU124Lusm3gJFwkCkY13FKXae2z2cV4pvhepJfxPHM2LJz8fEjU3C": {
"balance": "1000000000",
"datastore": {},
"bytecode": []
Expand Down
18 changes: 9 additions & 9 deletions massa-node/base_config/initial_rolls.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"AU1qDAxGJ387ETi9JRQzZWSPKYq4YPXrFvdiE4VoXUaiAt38JFEC": 10,
"AU12M3AQqs7JH7mSe1UZyEA5NQ7nGQHXaqqxe1TGEpkimcRhsQ4eF": 10,
"AU1nsqw9mCcYLyyMJx5f4in4NXDoe4B1LzV9pQdvX5Wrxq9ehf6h": 10,
"AU1pdnk7gME8DSA6ueNZdCHqfSt9YfTwAJSgRCcB8g3z3kkapWtU": 10,
"AU1H1Ze77ctAFi4FBc3nVe9AtWdtg7246V9pVXSeXqWaJFLPKfB1": 10,
"AU12Dvay7jT1maaKpV9CHX6yMt3cS5ZEWy6Q67HV8twVGS3ihoq5x": 10,
"AU13evhD7c9AXFc6CxWWjWWRT6bQnejYhq3MsNofJWJDe4UQStJE": 10,
"AU1UpZLobUAWqj3M9DpBZNhh4GD4ZLvixKXQu2kt7ZDUiEepD89E": 10,
"AU12p8v9V68SiehQb2Syzy6smfv9NTCJh2p6JPbsacy7PaGRw39uH": 10
"AU12dhs6CsQk8AXFTYyUpc1P9e8GDf65ozU6RcigW68qfJV7vdbNf": 10,
"AU12WQRoxQJKMjNG8hVjkyh4YgBwaYeUH4BsqJEEdTUJda37GhSx9": 10,
"AU1226KGgzq425xzpNmrUCggKcru4yMkFSUXGxYnTwCt6vso5PVbn": 10,
"AU12p3neq9Caq8idS33jrWuRZgfoBL3wAAfG2NdZEBxNdfujVtCLq": 10,
"AU122tXU6uhDfGP1BxCtvLQTvyascwsjX5NVo3vv1fssmdeKSeytM": 10,
"AU1xfaL8CTrZWTBY79JDMEokwYjc2U4gUFJqqgtbahj7gwYn2s6Y": 10,
"AU1xgxVCw4Vnr2s8JSnFYzz8UGuqZdMH7wHBDUapndgRCdDteWS": 10,
"AU12DPHgthL9JJGrASquAmsdef9oYpLCXzZRvyiXzY3TG87Hgcs4o": 10,
"AU124Lusm3gJFwkCkY13FKXae2z2cV4pvhepJfxPHM2LJz8fEjU3C": 10
}

0 comments on commit 8e53f3a

Please sign in to comment.