From d34ce4a25f38dbe4d2e34c2babcacb989205aaf6 Mon Sep 17 00:00:00 2001 From: 0o-de-lally <1364012+0o-de-lally@users.noreply.github.com> Date: Fri, 15 Oct 2021 22:31:23 +0000 Subject: [PATCH] force new stdlib hash with text --- .../diem-framework/modules/0L/Globals.move | 1 - .../diem-framework/modules/0L/Wallet.move | 38 ------------------ .../diem-framework/modules/DiemAccount.move | 2 +- .../diem-framework/modules/doc/DiemAccount.md | 2 +- .../current/docs/modules/DiemAccount.md | 2 +- .../current/modules/043_DiemAccount.mv | Bin 13454 -> 13459 bytes language/diem-framework/staged/stdlib.mv | Bin 109105 -> 109110 bytes 7 files changed, 3 insertions(+), 42 deletions(-) diff --git a/language/diem-framework/modules/0L/Globals.move b/language/diem-framework/modules/0L/Globals.move index 4d7744dc90..7b5683df01 100644 --- a/language/diem-framework/modules/0L/Globals.move +++ b/language/diem-framework/modules/0L/Globals.move @@ -6,7 +6,6 @@ address 0x1 { - /// # Summary /// This module provides global variables and constants that have no specific owner module Globals { diff --git a/language/diem-framework/modules/0L/Wallet.move b/language/diem-framework/modules/0L/Wallet.move index 80f241a6e9..6d5d75f2eb 100644 --- a/language/diem-framework/modules/0L/Wallet.move +++ b/language/diem-framework/modules/0L/Wallet.move @@ -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(wallet); - // let val_addr = Signer::address_of(val); - // Vector::push_back
(&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(wallet); - // let len = Vector::length
(&f.unfreeze_votes); - - // while (k < len) { - // let addr = *Vector::borrow
(&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) { (t.payer, t.payee, t.value, *&t.description) diff --git a/language/diem-framework/modules/DiemAccount.move b/language/diem-framework/modules/DiemAccount.move index 2b2fdd5da5..45852c2dcd 100644 --- a/language/diem-framework/modules/DiemAccount.move +++ b/language/diem-framework/modules/DiemAccount.move @@ -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( payer_addr, diff --git a/language/diem-framework/modules/doc/DiemAccount.md b/language/diem-framework/modules/doc/DiemAccount.md index 475d063a77..5941d3c35c 100644 --- a/language/diem-framework/modules/doc/DiemAccount.md +++ b/language/diem-framework/modules/doc/DiemAccount.md @@ -3115,7 +3115,7 @@ subject to the dual attestation protocol 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, diff --git a/language/diem-framework/releases/artifacts/current/docs/modules/DiemAccount.md b/language/diem-framework/releases/artifacts/current/docs/modules/DiemAccount.md index 475d063a77..5941d3c35c 100644 --- a/language/diem-framework/releases/artifacts/current/docs/modules/DiemAccount.md +++ b/language/diem-framework/releases/artifacts/current/docs/modules/DiemAccount.md @@ -3115,7 +3115,7 @@ subject to the dual attestation protocol 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, diff --git a/language/diem-framework/releases/artifacts/current/modules/043_DiemAccount.mv b/language/diem-framework/releases/artifacts/current/modules/043_DiemAccount.mv index 86f66599031bbda7d72d16c41206d9546bf1286b..3f6b77c36c00c1924166c8bfa445e93fbe6cd4b3 100644 GIT binary patch delta 56 zcmeCnoSZp9OKb)+*BXmsjNG3rxp@9qF45y%kfFtQYNLaQjG&}MeqK_3Vo^$FUb;eZ MerDe01Q|UE05Y}{LI3~& delta 51 zcmbQ7*_Sy%OKdVT*K&(vjNET6xp=-?F45ziouS2dbfbfa43CI#eqK_3Vo^$FUi#)# H89fOA&=nC; diff --git a/language/diem-framework/staged/stdlib.mv b/language/diem-framework/staged/stdlib.mv index 31862b325eaf04420ac8092156472b4e6e725c98..18d8f20f0066df89f588a2d99f2d72b1ffa186f8 100644 GIT binary patch delta 66 zcmV-I0KNaQ)CRWH2CzNQ0h5zH&?^?00}8A-#sLfRISLH?IixNPplB)%%Cmpa6dVy5 Y7;kQ3Z((v|X>MmAV{d70v!Cpey?Qko_5c6? delta 61 zcmV-D0K)&a)CRHC2CzNQ0gjVC&?^>`0}7`&#sLfMISLH-IixNPn`kNy#j}6V6dVi` T6K`%}Z((v|X>Mn;r0kNt`fwQl