diff --git a/Cargo.lock b/Cargo.lock index f1626285d21c..f91fe0c0700d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2738,11 +2738,11 @@ checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" [[package]] name = "fil_actor_account_state" -version = "10.0.0-dev.2" +version = "10.0.0-dev.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b8d8a278388a502cbe22c7359eaa393eac4451f5accbd977eaee52a28275aaf" +checksum = "c94732b4360fa5796fe0f0524b62d4b7f9081c0001e45e44e1969511ad237a68" dependencies = [ - "frc42_macros 3.0.0", + "frc42_macros", "fvm_ipld_encoding", "fvm_shared 2.6.0", "fvm_shared 3.6.0", @@ -2754,9 +2754,9 @@ dependencies = [ [[package]] name = "fil_actor_cron_state" -version = "10.0.0-dev.2" +version = "10.0.0-dev.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0601edd6fe61bbcf574371c5502768d7716a55d233234b5e4c1e5693b3c055" +checksum = "29941aeb04a17810b8d2104e0f0e4fa10001393e7a1d3523631196d7922fbc2f" dependencies = [ "fvm_ipld_encoding", "fvm_shared 2.6.0", @@ -2769,12 +2769,12 @@ dependencies = [ [[package]] name = "fil_actor_datacap_state" -version = "10.0.0-dev.2" +version = "10.0.0-dev.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cf2aa6bc17e28a599555d216c2e095aad55cdf0a2e0f66dbd705bf913db5f4" +checksum = "091aa98dfbb933274389c5be9348590e168548b15b886bd2eafbff7c13ecef23" dependencies = [ "fil_actors_shared", - "frc42_macros 3.0.0", + "frc42_macros", "frc46_token", "fvm_ipld_blockstore", "fvm_ipld_encoding", @@ -2789,13 +2789,13 @@ dependencies = [ [[package]] name = "fil_actor_evm_state" -version = "10.0.0-dev.2" +version = "10.0.0-dev.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58b746a3dad083daf72be0f2757efa82849b3a45601b8e70362d81b5e73fa235" +checksum = "539689549dd7c11fa9139a8adce2568fcbcab1383edf152e5cba45061df6d3d2" dependencies = [ "cid", "fil_actors_shared", - "frc42_macros 3.0.0", + "frc42_macros", "fvm_ipld_encoding", "fvm_shared 3.6.0", "fvm_shared 4.1.2", @@ -2809,14 +2809,14 @@ dependencies = [ [[package]] name = "fil_actor_init_state" -version = "10.0.0-dev.2" +version = "10.0.0-dev.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f37e7340dc021d20ef5ea36dfb52f173262d10184b1c924106c328427c5197" +checksum = "ed980044e180910897862014dc237448f44c7f7600470a9357458b8c7d1ea0bc" dependencies = [ "anyhow", "cid", "fil_actors_shared", - "frc42_macros 3.0.0", + "frc42_macros", "fvm_ipld_blockstore", "fvm_ipld_encoding", "fvm_ipld_hamt 0.9.0", @@ -2830,9 +2830,9 @@ dependencies = [ [[package]] name = "fil_actor_interface" -version = "10.0.0-dev.2" +version = "10.0.0-dev.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f5867b4ba96b9c5ff93ed10cfd6b313a5e59862d32599680c6d93daf325049" +checksum = "ab089bd0e43f98c8bdccdec814e14c74c631b73ee832f16d313bbb8ba9cecc1e" dependencies = [ "anyhow", "cid", @@ -2868,15 +2868,15 @@ dependencies = [ [[package]] name = "fil_actor_market_state" -version = "10.0.0-dev.2" +version = "10.0.0-dev.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0bc8c9746c93f9b6ac90240ca74f0b060bc78751b16c36f07618913854c0270" +checksum = "f0c76cad842778e6aa42e9defdcdea0553072ff6f0c0aa41242fd00f265b8d9d" dependencies = [ "anyhow", "cid", "fil_actor_verifreg_state", "fil_actors_shared", - "frc42_macros 3.0.0", + "frc42_macros", "fvm_ipld_bitfield", "fvm_ipld_blockstore", "fvm_ipld_encoding", @@ -2893,16 +2893,16 @@ dependencies = [ [[package]] name = "fil_actor_miner_state" -version = "10.0.0-dev.2" +version = "10.0.0-dev.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "722f6e09d9114e4b10c5c22299200f34b0b2a82693735b64cb98b13bab9ebca4" +checksum = "7022542811937e9b5d722586f0b17037561ef7cd3f0c35ce4c849a20da7c744d" dependencies = [ "anyhow", "bitflags 2.4.2", "cid", "fil_actor_verifreg_state", "fil_actors_shared", - "frc42_macros 3.0.0", + "frc42_macros", "fvm_ipld_amt", "fvm_ipld_bitfield", "fvm_ipld_blockstore", @@ -2923,14 +2923,14 @@ dependencies = [ [[package]] name = "fil_actor_multisig_state" -version = "10.0.0-dev.2" +version = "10.0.0-dev.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34878068dd52157eb581aa7533cf9a9bfe6f771eeed7b2299a97220b96880701" +checksum = "b8738df800e7cb4d350717ebc20d74fffaf26c9298108e03e5458a4690760797" dependencies = [ "anyhow", "cid", "fil_actors_shared", - "frc42_macros 3.0.0", + "frc42_macros", "fvm_ipld_blockstore", "fvm_ipld_encoding", "fvm_ipld_hamt 0.9.0", @@ -2946,14 +2946,14 @@ dependencies = [ [[package]] name = "fil_actor_power_state" -version = "10.0.0-dev.2" +version = "10.0.0-dev.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc4e0b040fea3f81cb0ae1c829ce50024045d75021b582dcb1965f85bc59926" +checksum = "7a1996681dae26388ae9a30fb9fcefebda66e56b470b78a887b9b995cbb9a8f7" dependencies = [ "anyhow", "cid", "fil_actors_shared", - "frc42_macros 3.0.0", + "frc42_macros", "fvm_ipld_blockstore", "fvm_ipld_encoding", "fvm_ipld_hamt 0.9.0", @@ -2969,9 +2969,9 @@ dependencies = [ [[package]] name = "fil_actor_reward_state" -version = "10.0.0-dev.2" +version = "10.0.0-dev.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdd400b1ef2e5ac539dec5b94d7861747009fdf34fcdfc8e92666d2d5adb852f" +checksum = "8dc9c0958524a3413cf72974b715fbae5bf57407f914ef1ca129624b4fcd7a58" dependencies = [ "fvm_ipld_encoding", "fvm_shared 2.6.0", @@ -2985,9 +2985,9 @@ dependencies = [ [[package]] name = "fil_actor_system_state" -version = "10.0.0-dev.2" +version = "10.0.0-dev.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70369b47e9e11da6f7cc09edc7b3ec773e706113b83286af0cc2ca5377d6369c" +checksum = "1b6cdcc5a6a21fb639853cb828fe2625aa1e792439db1161681f866ecbbc594e" dependencies = [ "cid", "fil_actors_shared", @@ -3002,14 +3002,14 @@ dependencies = [ [[package]] name = "fil_actor_verifreg_state" -version = "10.0.0-dev.2" +version = "10.0.0-dev.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32259ec6139952b11abbb0a558128cccee44c58a460e1bcb9449e62ac6e9f25f" +checksum = "62e9394839dd721f7cdbbafd82747ec9daa4b6229e1bc1c7f014366216fc3a60" dependencies = [ "anyhow", "cid", "fil_actors_shared", - "frc42_macros 3.0.0", + "frc42_macros", "fvm_ipld_blockstore", "fvm_ipld_encoding", "fvm_shared 2.6.0", @@ -3022,13 +3022,14 @@ dependencies = [ [[package]] name = "fil_actors_shared" -version = "10.0.0-dev.2" +version = "10.0.0-dev.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e8194ff60ad006523bd2b4799c90ff69c2e3e5c719124e310568ac93437bfce" +checksum = "fa8b5e64f9b025625f7f667dc90e729d350fddae0f464c119b2d7436a79800f2" dependencies = [ "anyhow", "cid", "filecoin-proofs-api", + "frc46_token", "fvm_ipld_amt", "fvm_ipld_bitfield", "fvm_ipld_blockstore", @@ -3267,6 +3268,7 @@ dependencies = [ "fil_actors_shared", "filecoin-proofs-api", "flume 0.11.0", + "frc46_token", "fs_extra", "futures", "fvm 2.7.0", @@ -3430,22 +3432,13 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a1704e27193af21e58435974ff20f2be25cc59338afb89920abdb540ad3182b" dependencies = [ - "frc42_hasher 4.0.0", - "frc42_macros 4.0.0", + "frc42_hasher", + "frc42_macros", "fvm_ipld_encoding", "fvm_shared 4.1.2", "thiserror", ] -[[package]] -name = "frc42_hasher" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a35e7214108f81cefc17b0466be01279f384faf913918a12dbc8528bb758a4" -dependencies = [ - "thiserror", -] - [[package]] name = "frc42_hasher" version = "4.0.0" @@ -3457,19 +3450,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "frc42_macros" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f50cd62b077775194bde67eef8076b31f915b9c099f3a7fd1a760363d65f145" -dependencies = [ - "blake2b_simd", - "frc42_hasher 3.0.0", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "frc42_macros" version = "4.0.0" @@ -3477,7 +3457,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a9ce38a981bab5e0d3c0835baa86f83066afe9afaf0aec23cee421f6d8c628e" dependencies = [ "blake2b_simd", - "frc42_hasher 4.0.0", + "frc42_hasher", "proc-macro2", "quote", "syn 1.0.109", diff --git a/Cargo.toml b/Cargo.toml index 4c7655879e03..436ea298b622 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,18 +52,19 @@ dialoguer = "0.11" digest = "0.10.5" directories = "5" ethereum-types = "0.14.1" -fil_actor_account_state = { version = "10.0.0-dev.2" } -fil_actor_cron_state = { version = "10.0.0-dev.2" } -fil_actor_datacap_state = { version = "10.0.0-dev.2" } -fil_actor_init_state = { version = "10.0.0-dev.2" } -fil_actor_interface = { version = "10.0.0-dev.2" } -fil_actor_market_state = { version = "10.0.0-dev.2" } -fil_actor_miner_state = { version = "10.0.0-dev.2" } -fil_actor_power_state = { version = "10.0.0-dev.2" } -fil_actor_reward_state = { version = "10.0.0-dev.2" } -fil_actor_system_state = { version = "10.0.0-dev.2" } -fil_actor_verifreg_state = { version = "10.0.0-dev.2" } -fil_actors_shared = { version = "10.0.0-dev.2", features = ["json"] } +frc46_token = "10.0.0" +fil_actor_account_state = { version = "10.0.0-dev.4" } +fil_actor_cron_state = { version = "10.0.0-dev.4" } +fil_actor_datacap_state = { version = "10.0.0-dev.4" } +fil_actor_init_state = { version = "10.0.0-dev.4" } +fil_actor_interface = { version = "10.0.0-dev.4" } +fil_actor_market_state = { version = "10.0.0-dev.4" } +fil_actor_miner_state = { version = "10.0.0-dev.4" } +fil_actor_power_state = { version = "10.0.0-dev.4" } +fil_actor_reward_state = { version = "10.0.0-dev.4" } +fil_actor_system_state = { version = "10.0.0-dev.4" } +fil_actor_verifreg_state = { version = "10.0.0-dev.4" } +fil_actors_shared = { version = "10.0.0-dev.4", features = ["json"] } filecoin-proofs-api = { version = "16.0", default-features = false } flume = "0.11" fs_extra = "1.2" diff --git a/scripts/devnet/lotus.dockerfile b/scripts/devnet/lotus.dockerfile index 26f4112b4b71..33d6b393c717 100644 --- a/scripts/devnet/lotus.dockerfile +++ b/scripts/devnet/lotus.dockerfile @@ -5,7 +5,7 @@ RUN apt-get update && apt-get install -y ca-certificates build-essential clang o WORKDIR /lotus -RUN git clone --depth 1 --branch asr/migration-nv22 https://github.com/filecoin-project/lotus.git . +RUN git clone --depth 1 --branch release/v1.26.0 https://github.com/filecoin-project/lotus.git . RUN CGO_CFLAGS_ALLOW="-D__BLST_PORTABLE__" \ CGO_CFLAGS="-D__BLST_PORTABLE__" \ diff --git a/src/networks/actors_bundle.rs b/src/networks/actors_bundle.rs index 38aa39784f25..678ebd5f652a 100644 --- a/src/networks/actors_bundle.rs +++ b/src/networks/actors_bundle.rs @@ -76,7 +76,7 @@ pub static ACTOR_BUNDLES: Lazy> = Lazy::new(|| { "bafy2bzacebzz376j5kizfck56366kdz5aut6ktqrvqbi3efa2d4l2o2m653ts" @ "v10.0.0" for "devnet", "bafy2bzaceay35go4xbjb45km6o46e5bib3bi46panhovcbedrynzwmm3drr4i" @ "v11.0.0" for "devnet", "bafy2bzaceasjdukhhyjbegpli247vbf5h64f7uvxhhebdihuqsj2mwisdwa6o" @ "v12.0.0" for "devnet", - "bafy2bzacedok4fxofxdwkv42whkkukf3g4jwevui4kk5bw7b5unx4t3tjlrya" @ "v13.0.0-rc.2" for "devnet", + "bafy2bzaceap34qfq4emg4fp3xd7bxtzt7pvkaj37kunqm2ccvttchtlljw7d4" @ "v13.0.0-rc.3" for "devnet", "bafy2bzaceb6j6666h36xnhksu3ww4kxb6e25niayfgkdnifaqi6m6ooc66i6i" @ "v9.0.3" for "mainnet", "bafy2bzacecsuyf7mmvrhkx2evng5gnz5canlnz2fdlzu2lvcgptiq2pzuovos" @ "v10.0.0" for "mainnet", "bafy2bzacecnhaiwcrpyjvzl4uv4q3jzoif26okl3m66q3cijp3dfwlcxwztwo" @ "v11.0.0" for "mainnet", diff --git a/src/networks/devnet/mod.rs b/src/networks/devnet/mod.rs index 59dc0665e4b1..107833f57bf5 100644 --- a/src/networks/devnet/mod.rs +++ b/src/networks/devnet/mod.rs @@ -70,7 +70,7 @@ pub static HEIGHT_INFOS: Lazy> = Lazy::new(|| { HeightInfo { epoch: get_upgrade_height_from_env("FOREST_DRAGON_HEIGHT").unwrap_or(20), bundle: Some( - Cid::try_from("bafy2bzacedok4fxofxdwkv42whkkukf3g4jwevui4kk5bw7b5unx4t3tjlrya") + Cid::try_from("bafy2bzaceap34qfq4emg4fp3xd7bxtzt7pvkaj37kunqm2ccvttchtlljw7d4") .unwrap(), ), }, diff --git a/src/state_migration/nv17/datacap.rs b/src/state_migration/nv17/datacap.rs index 01f4ecf1dd92..fc56e316ca25 100644 --- a/src/state_migration/nv17/datacap.rs +++ b/src/state_migration/nv17/datacap.rs @@ -14,6 +14,7 @@ use crate::state_migration::common::PostMigrator; use crate::utils::db::CborStoreExt; use cid::Cid; use fil_actors_shared::fvm_ipld_hamt::BytesKey; +use frc46_token::token::state::TokenState; use fvm_ipld_blockstore::Blockstore; use num_traits::Zero; use once_cell::sync::Lazy; @@ -73,8 +74,7 @@ impl PostMigrator for DataCapPostMigrator { verifreg_balance.into(), )?; - let mut token = - fil_actors_shared::frc46_token::TokenState::new_with_bit_width(&store, HAMT_BIT_WIDTH)?; + let mut token = TokenState::new(store)?; token.supply = TokenAmount::from_atto(token_supply).into(); token.balances = balances_map.flush()?; token.allowances = allowances_map.flush()?; diff --git a/src/state_migration/nv22/migration.rs b/src/state_migration/nv22/migration.rs index f42f348b814d..7a6591336814 100644 --- a/src/state_migration/nv22/migration.rs +++ b/src/state_migration/nv22/migration.rs @@ -29,15 +29,13 @@ impl StateMigration { store: &Arc, state: &Cid, new_manifest: &BuiltinActorManifest, - _chain_config: &ChainConfig, + chain_config: &ChainConfig, ) -> anyhow::Result<()> { - // TODO: Use the correct epoch for the upgrade once it's fixed in Lotus - //let upgrade_epoch = chain_config - // .height_infos - // .get(&Height::Dragon) - // .context("no height info for network version NV22")? - // .epoch; - let upgrade_epoch = 3654004; + let upgrade_epoch = chain_config + .height_infos + .get(&Height::Dragon) + .context("no height info for network version NV22")? + .epoch; let state_tree = StateTree::new_from_root(store.clone(), state)?; let system_actor = state_tree