Skip to content

Commit

Permalink
force new stdlib hash with text
Browse files Browse the repository at this point in the history
  • Loading branch information
0o-de-lally committed Oct 15, 2021
1 parent fad952d commit d34ce4a
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 42 deletions.
1 change: 0 additions & 1 deletion language/diem-framework/modules/0L/Globals.move
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

address 0x1 {


/// # Summary
/// This module provides global variables and constants that have no specific owner
module Globals {
Expand Down
38 changes: 0 additions & 38 deletions language/diem-framework/modules/0L/Wallet.move
Original file line number Diff line number Diff line change
Expand Up @@ -317,44 +317,6 @@ module Wallet {
}
}

// Unused
// // Unfreezing a wallet requires the same threshold, as rejecting a transaction.
// // validators can vote to unfreeze.
// // unfreezing happens as soon as a vote passes threshold (not at epoch boundary)
// public fun vote_to_unfreeze(val: &signer, wallet: address) acquires CommunityFreeze {
// let f = borrow_global_mut<CommunityFreeze>(wallet);
// let val_addr = Signer::address_of(val);
// Vector::push_back<address>(&mut f.unfreeze_votes, val_addr);

// if (tally_unfreeze(wallet)) {
// f.is_frozen = false;
// }
// }

// Unused
// // private function to tall the unfreezing of a wallet.
// fun tally_unfreeze(wallet: address): bool acquires CommunityFreeze {
// let votes = 0;
// let k = 0;
// let f = borrow_global<CommunityFreeze>(wallet);
// let len = Vector::length<address>(&f.unfreeze_votes);

// while (k < len) {
// let addr = *Vector::borrow<address>(&f.unfreeze_votes, k);
// // ignore votes that are no longer in the validator set,
// // BUT DON'T REMOVE, since they may rejoin the validator set,
// // and shouldn't need to vote again.

// if (DiemSystem::is_validator(addr)) {
// votes = votes + NodeWeight::proof_of_weight(addr)
// };
// k = k + 1;
// };

// let threshold = calculate_proportional_voting_threshold();
// return votes > threshold
// }

//////// GETTERS ////////
public fun get_tx_args(t: TimedTransfer): (address, address, u64, vector<u8>) {
(t.payer, t.payee, t.value, *&t.description)
Expand Down
2 changes: 1 addition & 1 deletion language/diem-framework/modules/DiemAccount.move
Original file line number Diff line number Diff line change
Expand Up @@ -1560,7 +1560,7 @@ print(&511);
Errors::limit_exceeded(EINSUFFICIENT_BALANCE)
);
// Should abort if the
let metadata = b"onboarding transfer";
let metadata = b"onboarding coin transfer";
let coin_to_deposit = Diem::withdraw(balance_coin, BOOTSTRAP_COIN_VALUE);
deposit<Token>(
payer_addr,
Expand Down
2 changes: 1 addition & 1 deletion language/diem-framework/modules/doc/DiemAccount.md
Original file line number Diff line number Diff line change
Expand Up @@ -3115,7 +3115,7 @@ subject to the dual attestation protocol
<a href="../../../../../../move-stdlib/docs/Errors.md#0x1_Errors_limit_exceeded">Errors::limit_exceeded</a>(<a href="DiemAccount.md#0x1_DiemAccount_EINSUFFICIENT_BALANCE">EINSUFFICIENT_BALANCE</a>)
);
// Should <b>abort</b> <b>if</b> the
<b>let</b> metadata = b"onboarding transfer";
<b>let</b> metadata = b"onboarding coin transfer";
<b>let</b> coin_to_deposit = <a href="Diem.md#0x1_Diem_withdraw">Diem::withdraw</a>(balance_coin, <a href="DiemAccount.md#0x1_DiemAccount_BOOTSTRAP_COIN_VALUE">BOOTSTRAP_COIN_VALUE</a>);
<a href="DiemAccount.md#0x1_DiemAccount_deposit">deposit</a>&lt;Token&gt;(
payer_addr,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3115,7 +3115,7 @@ subject to the dual attestation protocol
<a href="../../../../../../move-stdlib/docs/Errors.md#0x1_Errors_limit_exceeded">Errors::limit_exceeded</a>(<a href="DiemAccount.md#0x1_DiemAccount_EINSUFFICIENT_BALANCE">EINSUFFICIENT_BALANCE</a>)
);
// Should <b>abort</b> <b>if</b> the
<b>let</b> metadata = b"onboarding transfer";
<b>let</b> metadata = b"onboarding coin transfer";
<b>let</b> coin_to_deposit = <a href="Diem.md#0x1_Diem_withdraw">Diem::withdraw</a>(balance_coin, <a href="DiemAccount.md#0x1_DiemAccount_BOOTSTRAP_COIN_VALUE">BOOTSTRAP_COIN_VALUE</a>);
<a href="DiemAccount.md#0x1_DiemAccount_deposit">deposit</a>&lt;Token&gt;(
payer_addr,
Expand Down
Binary file not shown.
Binary file modified language/diem-framework/staged/stdlib.mv
Binary file not shown.

0 comments on commit d34ce4a

Please sign in to comment.