chore: backport #1511 and #1516 (#1518)

* Make Prove{CommitSectors, ReplicaUpdates}3Params aggregate proof type optional (#1511) * Make Prove{CommitSectors, ReplicaUpdates}3Params aggregate proof type optional. * Enforce no agg proof type when not used * Serialise bigint as idiomatic Filecoin form (#1516) Without this it naively serialises using the underlying Rust BigInt representation: [sign,[data,data,...]] --------- Co-authored-by: Alex North <445306+anorth@users.noreply.github.com> Co-authored-by: Rod Vagg <rod@vagg.org>
filecoin-project · Feb 8, 2024 · 8ca9c6c · 8ca9c6c
1 parent a96db01
commit 8ca9c6c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/actors/verifreg/src/emit.rs b/actors/verifreg/src/emit.rs
@@ -4,6 +4,7 @@ use crate::{ActorError, AllocationID};
 use crate::{ClaimID, DataCap};
 use fil_actors_runtime::runtime::Runtime;
 use fil_actors_runtime::EventBuilder;
+use fvm_shared::bigint::bigint_ser::BigIntSer;
 use fvm_shared::ActorID;
 
 /// Indicates a new value for a verifier's datacap balance.
@@ -18,7 +19,7 @@ pub fn verifier_balance(
         &EventBuilder::new()
             .typ("verifier-balance")
             .field_indexed("verifier", &verifier)
-            .field("balance", new_balance)
+            .field("balance", &BigIntSer(new_balance))
             .build()?,
     )
 }

diff --git a/actors/verifreg/tests/harness/mod.rs b/actors/verifreg/tests/harness/mod.rs
@@ -143,7 +143,7 @@ impl Harness {
             EventBuilder::new()
                 .typ("verifier-balance")
                 .field_indexed("verifier", &verifier_resolved.id().unwrap())
-                .field("balance", &allowance)
+                .field("balance", &BigIntSer(allowance))
                 .build()?,
         );
 
@@ -166,7 +166,7 @@ impl Harness {
             EventBuilder::new()
                 .typ("verifier-balance")
                 .field_indexed("verifier", &verifier.id().unwrap())
-                .field("balance", &DataCap::zero())
+                .field("balance", &BigIntSer(&DataCap::zero()))
                 .build()?,
         );
         rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, self.root);
@@ -234,7 +234,7 @@ impl Harness {
             EventBuilder::new()
                 .typ("verifier-balance")
                 .field_indexed("verifier", &verifier.id().unwrap())
-                .field("balance", &(verifier_balance - allowance))
+                .field("balance", &BigIntSer(&(verifier_balance - allowance)))
                 .build()?,
         );
         let ret = rt.call::<VerifregActor>(

diff --git a/actors/verifreg/tests/verifreg_actor_test.rs b/actors/verifreg/tests/verifreg_actor_test.rs
@@ -1,4 +1,5 @@
 use fvm_shared::address::Address;
+use fvm_shared::bigint::bigint_ser::BigIntSer;
 use lazy_static::lazy_static;
 
 mod harness;
@@ -447,7 +448,7 @@ mod clients {
             EventBuilder::new()
                 .typ("verifier-balance")
                 .field_indexed("verifier", &VERIFIER.id().unwrap())
-                .field("balance", &(allowance_verifier - allowance_client))
+                .field("balance", &BigIntSer(&(allowance_verifier - allowance_client)))
                 .build()
                 .unwrap(),
         );

diff --git a/integration_tests/src/util/workflows.rs b/integration_tests/src/util/workflows.rs
@@ -14,6 +14,7 @@ use fvm_ipld_encoding::ipld_block::IpldBlock;
 use fvm_ipld_encoding::BytesDe;
 use fvm_ipld_encoding::RawBytes;
 use fvm_shared::address::Address;
+use fvm_shared::bigint::bigint_ser::BigIntSer;
 use fvm_shared::clock::ChainEpoch;
 use fvm_shared::crypto::signature::Signature;
 use fvm_shared::crypto::signature::SignatureType;
@@ -764,7 +765,7 @@ pub fn verifier_balance_event(verifier: ActorID, data_cap: DataCap) -> EmittedEv
         event: EventBuilder::new()
             .typ("verifier-balance")
             .field_indexed("verifier", &verifier)
-            .field("balance", &data_cap)
+            .field("balance", &BigIntSer(&data_cap))
             .build()
             .unwrap(),
     }