Skip to content

Commit a58b848

Browse files
authored
chore: butterflynet reset (#7003)
1 parent 6979e17 commit a58b848

3 files changed

Lines changed: 25 additions & 24 deletions

File tree

build/manifest.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,69 +1430,69 @@
14301430
"network": {
14311431
"type": "butterflynet"
14321432
},
1433-
"version": "v18.0.0-rc1",
1434-
"bundle_cid": "bafy2bzacec3ikcjko4zok3qoe7nxnqilx2mj65tp25kkkbf7bwkejflfrdpwo",
1433+
"version": "v18.0.0",
1434+
"bundle_cid": "bafy2bzacedg3y3ylp3w4bqmfgyiasrikg3bgfibblc7o4gri3b7j7ftgjhyuu",
14351435
"manifest": {
14361436
"actors": [
14371437
[
14381438
"system",
14391439
1,
1440-
"bafk2bzacea66s5cn4oyxmejwjoccs63zlabqkzkdffeevfds7bkaxno5gsmra"
1440+
"bafk2bzacea6vrssdwp3gc536tvxibmosllnpktewy2r733xi5nodlnnauvihq"
14411441
],
14421442
[
14431443
"init",
14441444
2,
1445-
"bafk2bzacedabofdxxiien5hbyfkye7vjk3nj2jut25a6ci3dkgw75fiokooh6"
1445+
"bafk2bzaceazbtzz2wwgokov6jtpnabipd2tpdiwyle36ld5qjuhqzsnxn6iwq"
14461446
],
14471447
[
14481448
"cron",
14491449
3,
1450-
"bafk2bzaceate4yymxapf3blbcvqufp4pwe3hrflf25xvzsbgxb74xasw4poxs"
1450+
"bafk2bzacedzo2d6aqftibnos3oueax7pr7eo2bfaehx3rezjcvpyvk7jsbzvw"
14511451
],
14521452
[
14531453
"account",
14541454
4,
1455-
"bafk2bzacedyssi2sxrsemgbqkets5zljhinr4n74hkegcmmmaeelmg6yjk7tg"
1455+
"bafk2bzacebci6wtuc2jggcaktwgqamzbktnxfzychqzcuadzb3skg3u7k3e2c"
14561456
],
14571457
[
14581458
"storagepower",
14591459
5,
1460-
"bafk2bzaced5hxvjvdwprscvbmrgfv6ynuzp3dlcgoaqw5bwy55u4t3kkm4sq2"
1460+
"bafk2bzaceald47xr65bvsxltqohps3h35stzxmwmunjz7t5veeae5zszkct3w"
14611461
],
14621462
[
14631463
"storageminer",
14641464
6,
1465-
"bafk2bzacedck7to4lqrdaiaca7abanb5ya5rlmgyof52pusss46n2xjjrp5t2"
1465+
"bafk2bzaceamzmhgsasj2mjdff4qp3tv2yxy3no5szjhudlxwhy62s3ikyc7sq"
14661466
],
14671467
[
14681468
"storagemarket",
14691469
7,
1470-
"bafk2bzacebdm75sdm44sg76c46dk25567kdbcsgaf37s6xjsqbvjqbp6wv6ga"
1470+
"bafk2bzacearomf5dpagrjvucps24xbrg3qiakoll7ek3dni55agzk54o763as"
14711471
],
14721472
[
14731473
"paymentchannel",
14741474
8,
1475-
"bafk2bzaced34rbwfwydxhp7cc2urtn5osz7x5cpklqwj5qbin2mrnw4a55w2e"
1475+
"bafk2bzacecd46rxivlrxmbgnbs63amzglwpsniwu2sjchk4na3wcajjgewz32"
14761476
],
14771477
[
14781478
"multisig",
14791479
9,
1480-
"bafk2bzacecg6i7epskoa372veotujg2cnxth4dufhcbeyxbmg6tbohbd473mq"
1480+
"bafk2bzaceb4cqewjdq666lacwfs4xq4hbzs6nuei5evbbilpm47lgxs42jczw"
14811481
],
14821482
[
14831483
"reward",
14841484
10,
1485-
"bafk2bzacecc3lpet56znl6n5ffhy72fd6xm5gok5ojibfjj3ma5lnbsxal7oq"
1485+
"bafk2bzacec4wnsoghsr6pdc6ka3umlmyiu2epijcefn3o6i3assvl2cto62e4"
14861486
],
14871487
[
14881488
"verifiedregistry",
14891489
11,
1490-
"bafk2bzacec2lcoui6qza5y7ufbr67zkdn6wg3awxzvywjgrocam35mgggzxgw"
1490+
"bafk2bzaceb7sq2jmq5ihkdj7r25hwjff2vymoclxmolytw75n2iz3d67cbw2y"
14911491
],
14921492
[
14931493
"datacap",
14941494
12,
1495-
"bafk2bzaceb7vxzbmybd3o3xvsyd22nfp4ym6siau5r6xaao3l73c4plksfgsw"
1495+
"bafk2bzacedwzf3egvd43ae6gkt6ivbqtd353b23kfcqwoxhjaitrflmzf4zci"
14961496
],
14971497
[
14981498
"placeholder",
@@ -1502,20 +1502,20 @@
15021502
[
15031503
"evm",
15041504
14,
1505-
"bafk2bzacedmvztlcgisrsjyt7bjzmxna5cnnnywib3zat66j2ui2u5edsgrb4"
1505+
"bafk2bzaceappagxwpuhux3bfjjzizcxbbxjmccpunmg6j7eb5z5jkcd2yyc46"
15061506
],
15071507
[
15081508
"eam",
15091509
15,
1510-
"bafk2bzaceajqrtd5hm4x2ojsphhqpdx2pegtzx2xy6hoymzm6dbtbkaqovcsc"
1510+
"bafk2bzacedouiswydbrzhf22vchcskvl2fbwcsl6p3o2a76jdue5frv7nfco4"
15111511
],
15121512
[
15131513
"ethaccount",
15141514
16,
1515-
"bafk2bzacebirdvqpv55vs7zyvnaebxbhguwvt7apjeelavxhjd65qljh3tyn2"
1515+
"bafk2bzaceaukqla2ayv7k4caeyi6jlqhuxjoaxeojrrso2toexrjnrmyilq4w"
15161516
]
15171517
],
1518-
"actor_list_cid": "bafy2bzaceb2nnaeyepfylvs733l3x3jat5mxzni3x43siiqzu22faluvsddem"
1518+
"actor_list_cid": "bafy2bzacebwkpadz4v3ihr7h4o5ixloe76ohj7etmlxxlg3oj4yuw2tjadnho"
15191519
}
15201520
},
15211521
{

src/networks/actors_bundle.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ pub static ACTOR_BUNDLES: LazyLock<Box<[ActorBundleInfo]>> = LazyLock::new(|| {
8787
"bafy2bzacecn64rlb52rjsvgopnidz6w42z3zobmjxqek5s4xqjh3ly47rcurg" @ "v17.0.0" for "calibrationnet",
8888
"bafy2bzacebkfatnbe6w4rj7lf6gkjh7mywlrpdh2dj6hu2dl4rmtwksszm2hs" @ "v18.0.0" for "calibrationnet",
8989
"bafy2bzacedzjwguwuihh4tptzfkkwaj3naamrnklbaixn2wfzqh67twwp56pi" @ "v17.0.0" for "butterflynet",
90-
"bafy2bzacec3ikcjko4zok3qoe7nxnqilx2mj65tp25kkkbf7bwkejflfrdpwo" @ "v18.0.0-rc1" for "butterflynet",
90+
"bafy2bzacedg3y3ylp3w4bqmfgyiasrikg3bgfibblc7o4gri3b7j7ftgjhyuu" @ "v18.0.0" for "butterflynet",
9191
"bafy2bzacedozk3jh2j4nobqotkbofodq4chbrabioxbfrygpldgoxs3zwgggk" @ "v9.0.3" for "devnet",
9292
"bafy2bzacebzz376j5kizfck56366kdz5aut6ktqrvqbi3efa2d4l2o2m653ts" @ "v10.0.0" for "devnet",
9393
"bafy2bzaceay35go4xbjb45km6o46e5bib3bi46panhovcbedrynzwmm3drr4i" @ "v11.0.0" for "devnet",

src/networks/butterflynet/mod.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,21 @@ pub async fn fetch_genesis<DB: SettingsStore>(db: &DB) -> anyhow::Result<Vec<u8>
4343

4444
/// Genesis CID
4545
pub static GENESIS_CID: LazyLock<Cid> = LazyLock::new(|| {
46-
Cid::from_str("bafy2bzaceakkgnqbuam2qoyds57f4h6ennt3o5or5ek3i3a4qpetirt7et5jw").unwrap()
46+
Cid::from_str("bafy2bzacebt5wxzyrgizu2uunetxtkc6aom3ult236vviv2nseiwnquu6anha")
47+
.expect("hard-coded CID must parse")
4748
});
4849

4950
/// Compressed genesis file. It is compressed with zstd and cuts the download size by 80% (from 10 MB to 2 MB).
5051
static GENESIS_URL: LazyLock<Url> = LazyLock::new(|| {
51-
"https://forest-snapshots.fra1.cdn.digitaloceanspaces.com/genesis/butterflynet-bafy2bzaceakkgnqbuam2qoyds57f4h6ennt3o5or5ek3i3a4qpetirt7et5jw.car.zst"
52+
"https://forest-snapshots.fra1.cdn.digitaloceanspaces.com/genesis/butterflynet-bafy2bzacebt5wxzyrgizu2uunetxtkc6aom3ult236vviv2nseiwnquu6anha.car.zst"
5253
.parse()
5354
.expect("hard-coded URL must parse")
5455
});
5556

5657
/// Alternative URL for the genesis file. This is hosted on the `lotus` repository.
57-
/// `<https://github.com/filecoin-project/lotus/commit/76d4ca672262105bf406ef2f0b54ed69ea39636f>`
58+
/// `<https://github.com/filecoin-project/lotus/commit/a0ecb8687f1c60d5e66040b6de364dbc9cc4d253>`
5859
static GENESIS_URL_ALT: LazyLock<Url> = LazyLock::new(|| {
59-
"https://github.com/filecoin-project/lotus/raw/76d4ca672262105bf406ef2f0b54ed69ea39636f/build/genesis/butterflynet.car.zst".parse().expect("hard-coded URL must parse")
60+
"https://github.com/filecoin-project/lotus/raw/a0ecb8687f1c60d5e66040b6de364dbc9cc4d253/build/genesis/butterflynet.car.zst".parse().expect("hard-coded URL must parse")
6061
});
6162

6263
pub(crate) const MINIMUM_CONSENSUS_POWER: i64 = 2 << 30;
@@ -106,7 +107,7 @@ pub static HEIGHT_INFOS: LazyLock<HashMap<Height, HeightInfo>> = LazyLock::new(|
106107
make_height!(Teep, -28),
107108
make_height!(Tock, -29),
108109
make_height!(GoldenWeek, -30),
109-
make_height!(FireHorse, 960, get_bundle_cid("v18.0.0-rc1")),
110+
make_height!(FireHorse, 1440, get_bundle_cid("v18.0.0")),
110111
])
111112
});
112113

0 commit comments

Comments
 (0)