Skip to content

Commit 4db52a5

Browse files
LesnyRumcajsLesnyRumcajs
authored
feat: NV27 butterflynet (#6047)
1 parent 8176e82 commit 4db52a5

File tree

5 files changed

+106
-15
lines changed

5 files changed

+106
-15
lines changed

‎build/bootstrap/butterflynet‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
/dnsaddr/bootstrap.butterfly.fildev.network
1+
/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWKxHctsqQ41MZ64GYqz5r4DUF3Hkj9SMVEcHXdRqvWCAx
2+
/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWN69aMyMuf9VrsRir5gd3xkT5q5p9NGYLFSXBTn1xkVSN

‎build/manifest.json‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,6 +1334,98 @@
13341334
"actor_list_cid": "bafy2bzacedai5hnued57xpz434xl6afmlycejoj7ac7c36u3tcegp6buc6nj6"
13351335
}
13361336
},
1337+
{
1338+
"network": {
1339+
"type": "butterflynet"
1340+
},
1341+
"version": "v17.0.0-rc1",
1342+
"bundle_cid": "bafy2bzacedzjwguwuihh4tptzfkkwaj3naamrnklbaixn2wfzqh67twwp56pi",
1343+
"manifest": {
1344+
"actors": [
1345+
[
1346+
"system",
1347+
1,
1348+
"bafk2bzacebiwv5xckqaesetmfyvvptoscnzy3mh3vdbwvmhz5mf5cn3idi3wc"
1349+
],
1350+
[
1351+
"init",
1352+
2,
1353+
"bafk2bzacebd5bwoxsktpxvmlbi4kzwkiqtte7axyxt2kew4fgrglyvy7sodrc"
1354+
],
1355+
[
1356+
"cron",
1357+
3,
1358+
"bafk2bzacea4mconfwssrytrhiwngqhraay3hn2f2mmnzs3f6x7t6st6jjskg4"
1359+
],
1360+
[
1361+
"account",
1362+
4,
1363+
"bafk2bzacecsyxlh7dvr5zkwnrqm72mgwnserkt7moaut737tig3pbkgtnw62o"
1364+
],
1365+
[
1366+
"storagepower",
1367+
5,
1368+
"bafk2bzacebye45hai3qedkqyr4r26ywupslx6hu5a2q6ewdg2tlxbf5fzes5y"
1369+
],
1370+
[
1371+
"storageminer",
1372+
6,
1373+
"bafk2bzacech2msfuf6mnbde5r5mrggftzsyg4k7g7cegltqooyuo4pp7kusp4"
1374+
],
1375+
[
1376+
"storagemarket",
1377+
7,
1378+
"bafk2bzaceblxfbbumzr2f5ehirtx2rgvgawebdxwra3okfpradd5os2kye5su"
1379+
],
1380+
[
1381+
"paymentchannel",
1382+
8,
1383+
"bafk2bzacedrrz47xktsdmpysm42rptqzdt7lqtbsbvtatac2axead4bmlncvk"
1384+
],
1385+
[
1386+
"multisig",
1387+
9,
1388+
"bafk2bzacea6lwslarfsjcwptiaca42cyccrehbowgstwkgnxh77qp5zda5jza"
1389+
],
1390+
[
1391+
"reward",
1392+
10,
1393+
"bafk2bzacearim4ftupnzlfz7h6feozr3yymtyacs4ahdwfjqjceilhdhzr2bm"
1394+
],
1395+
[
1396+
"verifiedregistry",
1397+
11,
1398+
"bafk2bzacechruhdcrrx2ixvfu6daewg2s2iq2rrowv54fah53qjarmco7c3xa"
1399+
],
1400+
[
1401+
"datacap",
1402+
12,
1403+
"bafk2bzaceccqejcvj6ip5xpcqr3fosc5sgue4ro6gi63j55itd2hczzawotxg"
1404+
],
1405+
[
1406+
"placeholder",
1407+
13,
1408+
"bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"
1409+
],
1410+
[
1411+
"evm",
1412+
14,
1413+
"bafk2bzacedpxvlqericktqetgjkgsjsfaijwcbdcxqn2nmenxnlfrxirwgd7y"
1414+
],
1415+
[
1416+
"eam",
1417+
15,
1418+
"bafk2bzaceabxund5zkqtgdwzjkcqnl25mjuzr3icodj7kgsvpt6oakcscb264"
1419+
],
1420+
[
1421+
"ethaccount",
1422+
16,
1423+
"bafk2bzacebmtjmyzm6f6w33vmoq6iwrffqh6jgtgexj4mpm74j6dqvwnq3576"
1424+
]
1425+
],
1426+
"actor_list_cid": "bafy2bzaceaijhx4azr3htpg4dlx67ryv7j24mxrwwqhovj4psr2djvpiyiktq"
1427+
}
1428+
},
13371429
{
13381430
"network": {
13391431
"type": "devnet",

‎src/networks/actors_bundle.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ pub static ACTOR_BUNDLES: LazyLock<Box<[ActorBundleInfo]>> = LazyLock::new(|| {
8686
"bafy2bzacecqtwq6hjhj2zy5gwjp76a4tpcg2lt7dps5ycenvynk2ijqqyo65e" @ "v16.0.1" for "calibrationnet",
8787
"bafy2bzacearjal5rsmzloz3ny7aoju2rgw66wgxdrydgg27thcsazbmf5qihq" @ "v15.0.0-rc1" for "butterflynet",
8888
"bafy2bzaceda5lc7qrwp2hdm6s6erppwuydsfqrhbgld7juixalk342inqimbo" @ "v16.0.1" for "butterflynet",
89+
"bafy2bzacedzjwguwuihh4tptzfkkwaj3naamrnklbaixn2wfzqh67twwp56pi" @ "v17.0.0-rc1" for "butterflynet",
8990
"bafy2bzacedozk3jh2j4nobqotkbofodq4chbrabioxbfrygpldgoxs3zwgggk" @ "v9.0.3" for "devnet",
9091
"bafy2bzacebzz376j5kizfck56366kdz5aut6ktqrvqbi3efa2d4l2o2m653ts" @ "v10.0.0" for "devnet",
9192
"bafy2bzaceay35go4xbjb45km6o46e5bib3bi46panhovcbedrynzwmm3drr4i" @ "v11.0.0" for "devnet",

‎src/networks/butterflynet/mod.rs‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ use std::sync::LazyLock;
99
use url::Url;
1010

1111
use crate::{
12-
db::SettingsStore,
13-
eth::EthChainId,
14-
make_height,
15-
shim::{clock::EPOCHS_IN_DAY, version::NetworkVersion},
12+
db::SettingsStore, eth::EthChainId, make_height, shim::version::NetworkVersion,
1613
utils::net::http_get,
1714
};
1815

@@ -46,20 +43,20 @@ pub async fn fetch_genesis<DB: SettingsStore>(db: &DB) -> anyhow::Result<Vec<u8>
4643

4744
/// Genesis CID
4845
pub static GENESIS_CID: LazyLock<Cid> = LazyLock::new(|| {
49-
Cid::from_str("bafy2bzacec4thmmboc5ye5lionzlyuvd4rfncggwdzrbbvqcepdrexny5qrx2").unwrap()
46+
Cid::from_str("bafy2bzacedmrdladdvj6ghy2ty4gqgu35vcta3brag3h7qo63sgybg4iwu6ou").unwrap()
5047
});
5148

5249
/// Compressed genesis file. It is compressed with zstd and cuts the download size by 80% (from 10 MB to 2 MB).
5350
static GENESIS_URL: LazyLock<Url> = LazyLock::new(|| {
54-
"https://forest-snapshots.fra1.cdn.digitaloceanspaces.com/genesis/butterflynet-bafy2bzacec4thmmboc5ye5lionzlyuvd4rfncggwdzrbbvqcepdrexny5qrx2.car.zst"
51+
"https://forest-snapshots.fra1.cdn.digitaloceanspaces.com/genesis/butterflynet-bafy2bzacedmrdladdvj6ghy2ty4gqgu35vcta3brag3h7qo63sgybg4iwu6ou.car.zst"
5552
.parse()
5653
.expect("hard-coded URL must parse")
5754
});
5855

5956
/// Alternative URL for the genesis file. This is hosted on the `lotus` repository.
6057
/// `<https://github.com/filecoin-project/lotus/commit/c6068b60c526d44270bfc5d612045f0b27322dfb>`
6158
static GENESIS_URL_ALT: LazyLock<Url> = LazyLock::new(|| {
62-
"https://github.com/filecoin-project/lotus/raw/c6068b60c526d44270bfc5d612045f0b27322dfb/build/genesis/butterflynet.car.zst".parse().expect("hard-coded URL must parse")
59+
"https://github.com/filecoin-project/lotus/raw/8d769c51dcaa165d90c3a0b2d36b93c644db8a13/build/genesis/butterflynet.car.zst".parse().expect("hard-coded URL must parse")
6360
});
6461

6562
pub(crate) const MINIMUM_CONSENSUS_POWER: i64 = 2 << 30;
@@ -106,10 +103,9 @@ pub static HEIGHT_INFOS: LazyLock<HashMap<Height, HeightInfo>> = LazyLock::new(|
106103
make_height!(Phoenix, i64::MIN),
107104
make_height!(Waffle, -26),
108105
make_height!(TukTuk, -27, get_bundle_cid("v15.0.0-rc1")),
109-
make_height!(Teep, 100, get_bundle_cid("v16.0.1")),
110-
make_height!(Tock, 100 + 2 * EPOCHS_IN_DAY),
111-
// TODO(forest): https://github.com/ChainSafe/forest/issues/6022
112-
make_height!(GoldenWeek, i64::MAX, get_bundle_cid("v16.0.1")),
106+
make_height!(Teep, 50, get_bundle_cid("v16.0.1")),
107+
make_height!(Tock, 100),
108+
make_height!(GoldenWeek, 200, get_bundle_cid("v17.0.0-rc1")),
113109
])
114110
});
115111

‎src/state_migration/mod.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,10 @@ where
7070
]
7171
}
7272
NetworkChain::Butterflynet => {
73-
vec![(Height::Teep, nv25::run_migration::<DB>)]
74-
// TODO(forest): https://github.com/ChainSafe/forest/issues/6022
75-
// (Height::GoldenWeek, nv27::run_migration::<DB>),
73+
vec![
74+
(Height::Teep, nv25::run_migration::<DB>),
75+
(Height::GoldenWeek, nv27::run_migration::<DB>),
76+
]
7677
}
7778
NetworkChain::Devnet(_) => {
7879
vec![

0 commit comments

Comments
 (0)