[move] commit-reveal of PoF bids

framework/cached-packages/src/libra_framework_sdk_builder.rs

@@ -474,6 +474,12 @@ pub enum EntryFunctionCall {
         epoch_expiry: u64,
     },
 
+    /// update the bid using estimated net reward instead of the internal bid variables
+    ProofOfFeePofUpdateBidNetReward {
+        net_reward: u64,
+        epoch_expiry: u64,
+    },
+
     /// This function initiates governance for the multisig. It is called by the sponsor address, and is only callable once.
     /// init_gov fails gracefully if the governance is already initialized.
     /// init_type will throw errors if the type is already initialized.
@@ -808,6 +814,10 @@ impl EntryFunctionCall {
             ProofOfFeePofUpdateBid { bid, epoch_expiry } => {
                 proof_of_fee_pof_update_bid(bid, epoch_expiry)
             }
+            ProofOfFeePofUpdateBidNetReward {
+                net_reward,
+                epoch_expiry,
+            } => proof_of_fee_pof_update_bid_net_reward(net_reward, epoch_expiry),
             SafeInitPaymentMultisig { authorities } => safe_init_payment_multisig(authorities),
             SlowWalletSmokeTestVmUnlock {
                 user_addr,
@@ -2147,6 +2157,28 @@ pub fn proof_of_fee_pof_update_bid(bid: u64, epoch_expiry: u64) -> TransactionPa
     ))
 }
 
+/// update the bid using estimated net reward instead of the internal bid variables
+pub fn proof_of_fee_pof_update_bid_net_reward(
+    net_reward: u64,
+    epoch_expiry: u64,
+) -> TransactionPayload {
+    TransactionPayload::EntryFunction(EntryFunction::new(
+        ModuleId::new(
+            AccountAddress::new([
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 1,
+            ]),
+            ident_str!("proof_of_fee").to_owned(),
+        ),
+        ident_str!("pof_update_bid_net_reward").to_owned(),
+        vec![],
+        vec![
+            bcs::to_bytes(&net_reward).unwrap(),
+            bcs::to_bytes(&epoch_expiry).unwrap(),
+        ],
+    ))
+}
+
 /// This function initiates governance for the multisig. It is called by the sponsor address, and is only callable once.
 /// init_gov fails gracefully if the governance is already initialized.
 /// init_type will throw errors if the type is already initialized.
@@ -3105,6 +3137,19 @@ mod decoder {
         }
     }
 
+    pub fn proof_of_fee_pof_update_bid_net_reward(
+        payload: &TransactionPayload,
+    ) -> Option<EntryFunctionCall> {
+        if let TransactionPayload::EntryFunction(script) = payload {
+            Some(EntryFunctionCall::ProofOfFeePofUpdateBidNetReward {
+                net_reward: bcs::from_bytes(script.args().first()?).ok()?,
+                epoch_expiry: bcs::from_bytes(script.args().get(1)?).ok()?,
+            })
+        } else {
+            None
+        }
+    }
+
     pub fn safe_init_payment_multisig(payload: &TransactionPayload) -> Option<EntryFunctionCall> {
         if let TransactionPayload::EntryFunction(script) = payload {
             Some(EntryFunctionCall::SafeInitPaymentMultisig {
@@ -3480,6 +3525,10 @@ static SCRIPT_FUNCTION_DECODER_MAP: once_cell::sync::Lazy<EntryFunctionDecoderMa
             "proof_of_fee_pof_update_bid".to_string(),
             Box::new(decoder::proof_of_fee_pof_update_bid),
         );
+        map.insert(
+            "proof_of_fee_pof_update_bid_net_reward".to_string(),
+            Box::new(decoder::proof_of_fee_pof_update_bid_net_reward),
+        );
         map.insert(
             "safe_init_payment_multisig".to_string(),
             Box::new(decoder::safe_init_payment_multisig),

framework/drop-user-tools/last_goodbye.move

@@ -95,26 +95,15 @@ module ol_framework::last_goodbye {
       return
     };
 
-    // print(&2000);
-
     // dangling state in receipts could allow user to participate in community
     // wallets
-        // print(&2002);
-
     receipts::hard_fork_sanitize(vm, user);
-            // print(&2003);
-
     jail::garbage_collection(user);
-            // print(&2004);
-
     vouch::hard_fork_sanitize(vm, user);
-            // print(&2005);
 
-    let locked = slow_wallet::hard_fork_sanitize(vm, user);
-    if (locked > 0) {
-      print(&user_addr);
-      print(&locked);
-    };
+
+    let _locked = slow_wallet::hard_fork_sanitize(vm, user);
+
 
     // remove a pledge account if there is one, so that coins there are
     // not dangling
@@ -138,20 +127,11 @@ module ol_framework::last_goodbye {
       let good_capital = option::extract(&mut all_coins_opt);
       burn::burn_and_track(good_capital);
     };
-    // print(&2001);
 
     option::destroy_none(all_coins_opt);
 
-
-    // if (coin_val > 0) {
-    //   print(&user_addr);
-    //   print(&coin_val);
-    // };
-
-
     let auth_key = b"Oh, is it too late now to say sorry?";
     vector::trim(&mut auth_key, 32);
-        // print(&2008);
 
     // Oh, is it too late now to say sorry?
     // Yeah, I know that I let you down
@@ -161,22 +141,17 @@ module ol_framework::last_goodbye {
     // another function can be called to drop the account::Account completely
     // and then the offline db tools can safely remove the key from db.
     account::rotate_authentication_key_internal(user, auth_key);
-            // print(&2009);
 
   }
 
   fun last_goodbye(vm: &signer, user: &signer) {
-    // print(&10000);
     let addr = signer::address_of(user);
     if (!account::exists_at(addr)) {
-      // print(&addr);
       return
     };
 
     let auth_orig = account::get_authentication_key(addr);
-    // print(&10001);
     dont_think_twice_its_alright(vm, user);
-    // print(&10002);
 
     let new_auth = account::get_authentication_key(addr);
     // if the account is a validator they stay on ark a
@@ -189,12 +164,8 @@ module ol_framework::last_goodbye {
       // Just hear this and then I'll go
       // You gave me more to live for
       // More than you'll ever know
-          // print(&10003);
-      account::hard_fork_drop(vm, user);
-          // print(&10004);
-
 
-      // print(&@0xDEAD);
+      account::hard_fork_drop(vm, user);
   }
 
   #[test_only]

framework/drop-user-tools/last_goodbye.test.move

@@ -14,7 +14,7 @@ module ol_framework::test_last_goodbye {
 
     let _vals = mock::genesis_n_vals(framework, 1);
     // we are at epoch 0
-    let epoch = reconfiguration::get_current_epoch();
+    let epoch = reconfiguration::current_epoch();
     assert!(epoch == 0, 7357001);
 
     last_goodbye::danger_test_last_goodby(vm, bob);
@@ -23,7 +23,7 @@ module ol_framework::test_last_goodbye {
     last_goodbye::danger_user_gc(vm, bob);
 
     mock::trigger_epoch(framework); // epoch 1
-    let epoch = reconfiguration::get_current_epoch();
+    let epoch = reconfiguration::current_epoch();
     assert!(epoch == 1, 7357002);
 
     let vals = stake::get_current_validators();

framework/drop-user-tools/pledge_accounts_with_gc.move

@@ -336,11 +336,7 @@
 
         fun garbage_collection(pledge_account: &address): u64 acquires MyPledges,
         BeneficiaryPolicy {
-          // print(&5000);
           let pledge_list = get_user_pledges(pledge_account);
-          // print(&pledge_list);
-          // print(&5001);
-          // print(pledge_account);
           let coins = 0;
           let i = 0;
           while (i < vector::length(&pledge_list)) {
@@ -349,14 +345,10 @@
             let hundred_pct = fixed_point64::create_from_rational(1,1);
             let c = withdraw_pct_from_one_pledge_account(bene,
             pledge_account, &hundred_pct);
-            // print(&c);
 
             if (option::is_some(&c)) {
-              // print(&5002);
-
               let coin = option::extract(&mut c);
               coins = coins + coin::value(&coin);
-              // print(&coin);
               burn::burn_and_track(coin);
             };
             option::destroy_none(c);
@@ -367,7 +359,6 @@
             pledge_account);
 
             if (is_found) {
-              // print(&5006);
               vector::remove(&mut bene_state.pledgers, idx);
             };
             i = i + 1;

framework/libra-framework/sources/block.move

@@ -67,6 +67,8 @@ module diem_framework::block {
         system_addresses::assert_diem_framework(diem_framework);
         assert!(epoch_interval_microsecs > 0, error::invalid_argument(EZERO_EPOCH_INTERVAL));
 
+        reconfiguration::set_epoch_interval(diem_framework, epoch_interval_microsecs);
+
         move_to<BlockResource>(
             diem_framework,
             BlockResource {
@@ -81,28 +83,24 @@ module diem_framework::block {
     /// Update the epoch interval.
     /// Can only be called as part of the Diem governance proposal process established by the DiemGovernance module.
     public(friend) fun update_epoch_interval_microsecs(
-        _diem_framework: &signer,
+        diem_framework: &signer,
         new_epoch_interval: u64,
     ) acquires BlockResource {
-        //system_addresses::assert_vm(diem_framework); //TODO: remove after testing fork
+        system_addresses::assert_diem_framework(diem_framework); //TODO: remove after testing fork
         assert!(new_epoch_interval > 0, error::invalid_argument(EZERO_EPOCH_INTERVAL));
 
         let block_resource = borrow_global_mut<BlockResource>(@diem_framework);
         let old_epoch_interval = block_resource.epoch_interval;
         block_resource.epoch_interval = new_epoch_interval;
 
+        reconfiguration::set_epoch_interval(diem_framework, new_epoch_interval);
+
         event::emit_event<UpdateEpochIntervalEvent>(
             &mut block_resource.update_epoch_interval_events,
             UpdateEpochIntervalEvent { old_epoch_interval, new_epoch_interval },
         );
     }
 
-    #[view]
-    /// Return epoch interval in seconds.
-    public fun get_epoch_interval_secs(): u64 acquires BlockResource {
-        borrow_global<BlockResource>(@diem_framework).epoch_interval / 1000000
-    }
-
     /// Set the metadata for the current block.
     /// The runtime always runs this before executing the transactions in a block.
     fun block_prologue(
@@ -244,16 +242,14 @@ module diem_framework::block {
             };
 
             if (timestamp - reconfiguration::last_reconfiguration_time() >= block_metadata_ref.epoch_interval) {
-                // if (!features::epoch_trigger_enabled() ||
-                // testnet::is_testnet()) {
                 if (testnet::is_testnet()) {
                     epoch_boundary::epoch_boundary(
                         vm,
-                        reconfiguration::get_current_epoch(),
+                        reconfiguration::current_epoch(),
                         round
                     );
                 } else {
-                    epoch_boundary::enable_epoch_trigger(vm, reconfiguration::get_current_epoch());
+                    epoch_boundary::enable_epoch_trigger(vm, reconfiguration::current_epoch());
                 }
             }
     }
@@ -284,8 +280,7 @@ module diem_framework::block {
     }
 
     #[test(diem_framework = @diem_framework, account = @0x123)]
-    //#[expected_failure(abort_code = 0x50003, location = diem_framework::system_addresses)] //TODO: remove after testing fork
-    #[ignore] //TODO: remove after testing fork
+    #[expected_failure(abort_code = 0x50003, location = diem_framework::system_addresses)]
     public entry fun test_update_epoch_interval_unauthorized_should_fail(
         diem_framework: signer,
         account: signer,

framework/libra-framework/sources/block.spec.move

@@ -115,10 +115,6 @@ spec diem_framework::block {
         ensures block_resource.epoch_interval == new_epoch_interval;
     }
 
-    spec get_epoch_interval_secs(): u64 {
-        aborts_if !exists<BlockResource>(@diem_framework);
-    }
-
     spec get_current_block_height(): u64 {
         aborts_if !exists<BlockResource>(@diem_framework);
     }

framework/libra-framework/sources/genesis.move

@@ -31,6 +31,7 @@ module diem_framework::genesis {
     use ol_framework::ol_account;
     use ol_framework::musical_chairs;
     use ol_framework::proof_of_fee;
+    use ol_framework::secret_bid;
     use ol_framework::slow_wallet;
     use ol_framework::libra_coin;
     use ol_framework::infra_escrow;
@@ -256,7 +257,9 @@ module diem_framework::genesis {
             // default 90% to align with thermostatic rule in the PoF paper.
             // otherwise the thermostatic rule starts kicking-in immediately
             let sig = create_signer(validator.validator_config.owner_address);
-            proof_of_fee::pof_update_bid(&sig, 0900, 1000); // make the genesis
+
+            // genesis validators need a bid struct
+            secret_bid::genesis_helper(diem_framework, &sig, 100);
 
             if (testnet::is_not_mainnet()) {
               // TODO: this is for testnet purposes only

framework/libra-framework/sources/ol_sources/burn.move

@@ -29,6 +29,8 @@ module ol_framework::burn {
   friend ol_framework::pledge_accounts;
   friend ol_framework::make_whole;
 
+  #[test_only]
+  friend ol_framework::mock;
   #[test_only]
   friend ol_framework::test_burn;
   #[test_only]