Merge branch 'master' into feat/fip-0084

filecoin-project · May 29, 2024 · 4663904 · 4663904
2 parents 9c12a07 + 84d40fc
commit 4663904
Show file tree

Hide file tree

Showing 5 changed files with 126 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -95,6 +95,7 @@ pretty_env_logger = "0.4.0"
 serde_repr = "0.1.8"
 unsigned-varint = "0.7.1"
 rand_chacha = "0.3.1"
+const-hex = "1.11.3"
 
 # Crypto
 libsecp256k1 = { version = "0.7.1", default-features = false }

diff --git a/actors/miner/tests/prove_commit2_failures_test.rs b/actors/miner/tests/prove_commit2_failures_test.rs
@@ -90,6 +90,20 @@ fn reject_mismatched_proof_len() {
     h.check_state(&rt);
 }
 
+#[test]
+fn reject_too_soon() {
+    let (h, rt, activations) = setup_precommits(&[(0, 0, 0)]);
+    let epoch = *rt.epoch.borrow();
+    rt.set_epoch(epoch - 2);
+    let cfg = ProveCommitSectors2Config::default();
+    expect_abort_contains_message(
+        ExitCode::USR_FORBIDDEN,
+        "too early to prove sector",
+        h.prove_commit_sectors2(&rt, &activations, false, false, false, cfg),
+    );
+    h.check_state(&rt);
+}
+
 #[test]
 fn reject_expired_precommit() {
     let (h, rt, activations) = setup_precommits(&[(0, 0, 0)]);

diff --git a/actors/verifreg/Cargo.toml b/actors/verifreg/Cargo.toml
@@ -30,6 +30,7 @@ log = { workspace = true }
 num-derive = { workspace = true }
 num-traits = { workspace = true }
 serde = { workspace = true }
+const-hex = { workspace = true }
 
 [dev-dependencies]
 fil_actors_runtime = { workspace = true, features = ["test_utils", "sector-default"] }

diff --git a/actors/verifreg/tests/verifreg_actor_test.rs b/actors/verifreg/tests/verifreg_actor_test.rs
@@ -1567,3 +1567,71 @@ mod datacap {
         }
     }
 }
+
+// Tests to match with Go github.com/filecoin-project/go-state-types/builtin/*/verifreg
+mod serialization {
+    use std::str::FromStr;
+
+    use cid::Cid;
+    use fil_actor_verifreg::{AllocationClaim, ClaimAllocationsParams, SectorAllocationClaims};
+    use fvm_ipld_encoding::ipld_block::IpldBlock;
+    use fvm_shared::piece::PaddedPieceSize;
+
+    #[test]
+    fn claim_allocations_params() {
+        let test_cases = vec![
+            (
+                ClaimAllocationsParams { sectors: vec![], all_or_nothing: false },
+                // [[],false]
+                "8280f4",
+            ),
+            (
+                ClaimAllocationsParams {
+                    sectors: vec![SectorAllocationClaims {
+                        sector: 101,
+                        expiry: 202,
+                        claims: vec![],
+                    }],
+                    all_or_nothing: true,
+                },
+                // [[[101,202,[]]],true]
+                "828183186518ca80f5",
+            ),
+            (
+                ClaimAllocationsParams {
+                    sectors: vec![
+                        SectorAllocationClaims {
+                            sector: 101,
+                            expiry: 202,
+                            claims: vec![
+                                AllocationClaim {
+                                    client: 303,
+                                    allocation_id: 404,
+                                    data: Cid::from_str("baga6ea4seaaqa").unwrap(),
+                                    size: PaddedPieceSize(505),
+                                },
+                                AllocationClaim {
+                                    client: 606,
+                                    allocation_id: 707,
+                                    data: Cid::from_str("baga6ea4seaaqc").unwrap(),
+                                    size: PaddedPieceSize(808),
+                                },
+                            ],
+                        },
+                        SectorAllocationClaims { sector: 303, expiry: 404, claims: vec![] },
+                    ],
+                    all_or_nothing: true,
+                },
+                // [[[101,202,[[303,404,baga6ea4seaaqa,505],[606,707,baga6ea4seaaqc,808]]],[303,404,[]]],true]
+                "828283186518ca828419012f190194d82a49000181e203922001001901f98419025e1902c3d82a49000181e203922001011903288319012f19019480f5",
+            ),
+        ];
+
+        for (params, expected_hex) in test_cases {
+            let encoded = IpldBlock::serialize_cbor(&params).unwrap().unwrap();
+            assert_eq!(const_hex::encode(&encoded.data), expected_hex);
+            let decoded: ClaimAllocationsParams = IpldBlock::deserialize(&encoded).unwrap();
+            assert_eq!(params, decoded);
+        }
+    }
+}