From 5e03b9affe3901e240a4a9df8d68dc2522811fe8 Mon Sep 17 00:00:00 2001
From: 0o-de-lally <1364012+0o-de-lally@users.noreply.github.com>
Date: Thu, 26 Oct 2023 03:03:02 +0000
Subject: [PATCH] fixed supply casting issue in smoke tests

---
 .../sources/ol_sources/libra_coin.move        |  14 +++++++--
 .../sources/ol_sources/mock.move              |  13 ++++----
 .../sources/ol_sources/ol_account.move        |   1 +
 framework/releases/head.mrb                   | Bin 589763 -> 590168 bytes
 smoke-tests/src/libra_smoke.rs                |   8 +++--
 tools/genesis/src/vm.rs                       |   2 +-
 tools/query/tests/query.rs                    |   4 +--
 tools/query/tests/view.rs                     |  28 ++++++++++++++++++
 tools/tower/tests/tower_newbie.rs             |   4 ++-
 tools/txs/tests/sender_primitives.rs          |   2 +-
 tools/txs/tests/transfer.rs                   |   2 +-
 11 files changed, 60 insertions(+), 18 deletions(-)
 create mode 100644 tools/query/tests/view.rs

diff --git a/framework/libra-framework/sources/ol_sources/libra_coin.move b/framework/libra-framework/sources/ol_sources/libra_coin.move
index 493b8bbac..683acb57f 100644
--- a/framework/libra-framework/sources/ol_sources/libra_coin.move
+++ b/framework/libra-framework/sources/ol_sources/libra_coin.move
@@ -120,6 +120,7 @@ module ol_framework::gas_coin {
     use std::signer;
     use std::vector;
     use std::option::{Self, Option};
+    // use diem_std::debug::print;
 
     use diem_framework::coin::{Self, MintCapability, BurnCapability};
     use diem_framework::system_addresses;
@@ -129,12 +130,16 @@ module ol_framework::gas_coin {
     friend diem_framework::genesis;
     friend ol_framework::genesis_migration;
 
+    const MAX_U64: u128 = 18446744073709551615;
+
     /// Account does not have mint capability
     const ENO_CAPABILITIES: u64 = 1;
     /// Mint capability has already been delegated to this specified address
     const EALREADY_DELEGATED: u64 = 2;
     /// Cannot find delegation of mint capability to this account
     const EDELEGATION_NOT_FOUND: u64 = 3;
+    /// Supply somehow above MAX_U64
+    const ESUPPLY_OVERFLOW: u64 = 4;
 
     struct LibraCoin has key {}
 
@@ -258,12 +263,13 @@ module ol_framework::gas_coin {
       let supply_opt = coin::supply<LibraCoin>();
       if (option::is_some(&supply_opt)) {
         let value = *option::borrow(&supply_opt);
-        if (value == 0) return 0u64;
+        assert!(value <= MAX_U64, ESUPPLY_OVERFLOW);
         return (value as u64)
       };
       0
     }
-
+    #[view]
+    /// debugging view
     public fun supply_128(): u128 {
       let supply_opt = coin::supply<LibraCoin>();
       if (option::is_some(&supply_opt)) {
@@ -302,7 +308,8 @@ module ol_framework::gas_coin {
         coin::register<LibraCoin>(core_resources);
 
         let coins = coin::mint<LibraCoin>(
-            18446744073709551615,
+            1000000 * 1000000, // core resources can have 1M coins, MAX_U64 was
+            // causing arthmetic errors calling supply() on downcast
             &mint_cap,
         );
         coin::deposit<LibraCoin>(signer::address_of(core_resources), coins);
@@ -332,6 +339,7 @@ module ol_framework::gas_coin {
         dst_addr: address,
         amount: u64,
     ) acquires MintCapStore {
+        let _s = supply(); // check we didn't overflow supply
 
         let account_addr = signer::address_of(root);
 
diff --git a/framework/libra-framework/sources/ol_sources/mock.move b/framework/libra-framework/sources/ol_sources/mock.move
index ef8957dc6..d6c91905b 100644
--- a/framework/libra-framework/sources/ol_sources/mock.move
+++ b/framework/libra-framework/sources/ol_sources/mock.move
@@ -24,11 +24,13 @@ module ol_framework::mock {
   use ol_framework::musical_chairs;
   use ol_framework::globals;
   use diem_framework::block;
-  // use diem_framework::chain_status;
-  use diem_std::debug::print;
+
+  // use diem_std::debug::print;
 
   const ENO_GENESIS_END_MARKER: u64 = 1;
-  const EDID_NOT_ADVANCE_EPOCH: u64 = 1;
+  const EDID_NOT_ADVANCE_EPOCH: u64 = 2;
+  /// coin supply does not match expected
+  const ESUPPLY_MISMATCH: u64 = 3;
 
   #[test_only]
   public fun reset_val_perf_one(vm: &signer, addr: address) {
@@ -203,14 +205,13 @@ module ol_framework::mock {
       let (burn_cap, mint_cap) = gas_coin::initialize_for_test_without_aggregator_factory(root);
       coin::destroy_burn_cap(burn_cap);
 
-
       transaction_fee::initialize_fee_collection_and_distribution(root, 0);
 
       let initial_fees = 1000000 * 100; // coin scaling * 100 coins
       let tx_fees = coin::test_mint(initial_fees, &mint_cap);
       transaction_fee::vm_pay_fee(root, @ol_framework, tx_fees);
       let supply_pre = gas_coin::supply();
-      assert!(supply_pre == initial_fees, 666);
+      assert!(supply_pre == initial_fees, ESUPPLY_MISMATCH);
       gas_coin::test_set_final_supply(root, initial_fees);
 
       mint_cap
@@ -311,7 +312,6 @@ module ol_framework::mock {
     // genesis();
 
     let set = genesis_n_vals(&root, 4);
-    print(&set);
     assert!(vector::length(&set) == 4, 7357001);
 
     let addr = vector::borrow(&set, 0);
@@ -362,5 +362,4 @@ module ol_framework::mock {
     assert!(entry_fee == 999, 73570003);
     assert!(median_bid == 3, 73570004);
   }
-
 }
diff --git a/framework/libra-framework/sources/ol_sources/ol_account.move b/framework/libra-framework/sources/ol_sources/ol_account.move
index 511671a00..7703e9451 100644
--- a/framework/libra-framework/sources/ol_sources/ol_account.move
+++ b/framework/libra-framework/sources/ol_sources/ol_account.move
@@ -324,6 +324,7 @@ module ol_framework::ol_account {
       if (exists<BurnTracker>(addr)) return;
 
       let (_, total_balance) = balance(addr);
+
       move_to(sig, BurnTracker {
         prev_supply: gas_coin::supply(),
         prev_balance: total_balance,
diff --git a/framework/releases/head.mrb b/framework/releases/head.mrb
index 67f6abf62f96367178939a255f70c16dc36be162..304d46ee3d3a19b4a420992c2f90ac804d7037cd 100644
GIT binary patch
delta 11426
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

delta 11073
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
NiPCbshU!B9e*lHd7t#O#

diff --git a/smoke-tests/src/libra_smoke.rs b/smoke-tests/src/libra_smoke.rs
index 9c20b87a2..5fd15491b 100644
--- a/smoke-tests/src/libra_smoke.rs
+++ b/smoke-tests/src/libra_smoke.rs
@@ -73,9 +73,13 @@ impl LibraSmoke {
         // the genesis does NOT mint by default to genesis validators
         // 10,000 coins with 6 decimals precision
         let mut pub_info = swarm.diem_public_info();
-        helpers::mint_libra(&mut pub_info, addr, 100_000_000_000).await.context("could not mint to account")?;
+        helpers::mint_libra(&mut pub_info, addr, 1000 * 1000_000)
+            .await
+            .context("could not mint to account")?;
 
-        helpers::unlock_libra(&mut pub_info, addr, 100_000_000_000).await.context("could not unlock coins")?;
+        helpers::unlock_libra(&mut pub_info, addr, 1000 * 1000_000)
+            .await
+            .context("could not unlock coins")?;
 
         Ok(Self {
             swarm,
diff --git a/tools/genesis/src/vm.rs b/tools/genesis/src/vm.rs
index fea1ede36..0792fe3d0 100644
--- a/tools/genesis/src/vm.rs
+++ b/tools/genesis/src/vm.rs
@@ -26,7 +26,7 @@ use diem_vm_genesis::{
 use libra_types::{legacy_types::legacy_recovery::LegacyRecovery, ol_progress::OLProgress};
 
 use crate::{
-    genesis_functions::{rounding_mint, set_validator_baseline_reward, set_final_supply},
+    genesis_functions::{rounding_mint, set_final_supply, set_validator_baseline_reward},
     supply::{populate_supply_stats_from_legacy, SupplySettings},
 };
 
diff --git a/tools/query/tests/query.rs b/tools/query/tests/query.rs
index ae5f669d7..95be6f9a8 100644
--- a/tools/query/tests/query.rs
+++ b/tools/query/tests/query.rs
@@ -15,8 +15,8 @@ async fn libra_query_test() {
         Ok(v) => {
             println!("v: {:?}", v);
             let b: LibraBalanceDisplay = serde_json::from_value(v).unwrap();
-            assert!(b.unlocked == 100000.0);
-            assert!(b.total == 100000.0);
+            assert!(b.unlocked == 1000.0);
+            assert!(b.total == 1000.0);
         }
         Err(e) => {
             println!("e: {:?}", e);
diff --git a/tools/query/tests/view.rs b/tools/query/tests/view.rs
new file mode 100644
index 000000000..ee1600461
--- /dev/null
+++ b/tools/query/tests/view.rs
@@ -0,0 +1,28 @@
+use libra_query::query_type::QueryType;
+use libra_smoke_tests::libra_smoke::LibraSmoke;
+
+/// Testing the query library
+#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+async fn libra_view_test() {
+    let mut s = LibraSmoke::new(None).await.expect("could not start swarm");
+
+    let c = s.client();
+
+    let q = QueryType::View {
+        function_id: "0x1::gas_coin::supply".to_string(),
+        type_args: None,
+        args: None,
+    };
+    match q.query_to_json(Some(c.to_owned())).await {
+        Ok(v) => {
+            println!("v: {:?}", v);
+            // let b: LibraBalanceDisplay = serde_json::from_value(v).unwrap();
+            // assert!(b.unlocked == 10.0);
+            // assert!(b.total == 10.0);
+        }
+        Err(e) => {
+            println!("e: {:?}", e);
+            panic!("nothing returned from query");
+        }
+    }
+}
diff --git a/tools/tower/tests/tower_newbie.rs b/tools/tower/tests/tower_newbie.rs
index 384b9fcb9..b7f1d9beb 100644
--- a/tools/tower/tests/tower_newbie.rs
+++ b/tools/tower/tests/tower_newbie.rs
@@ -1,3 +1,4 @@
+use anyhow::Context;
 use libra_smoke_tests::libra_smoke::LibraSmoke;
 
 use libra_txs::submit_transaction::Sender;
@@ -25,7 +26,8 @@ async fn tower_newbie() -> anyhow::Result<()> {
     let mut s = Sender::from_app_cfg(&val_app_cfg, None).await?;
     let res = s
         .transfer(alice.child_0_owner.account, 10_000.0, false)
-        .await?
+        .await
+        .context("could not create account")?
         .unwrap();
     assert!(res.info.status().is_success());
 
diff --git a/tools/txs/tests/sender_primitives.rs b/tools/txs/tests/sender_primitives.rs
index 71f6cc6fa..249ce696b 100644
--- a/tools/txs/tests/sender_primitives.rs
+++ b/tools/txs/tests/sender_primitives.rs
@@ -26,7 +26,7 @@ async fn sender_back_and_forth() -> anyhow::Result<()> {
     // create an account for alice by transferring funds
     let mut s = Sender::from_app_cfg(&val_app_cfg, None).await?;
     let res = s
-        .transfer(alice.child_0_owner.account, 10_000.0, false)
+        .transfer(alice.child_0_owner.account, 100.0, false)
         .await?
         .unwrap();
     assert!(res.info.status().is_success());
diff --git a/tools/txs/tests/transfer.rs b/tools/txs/tests/transfer.rs
index 2c7999ac7..1130d269a 100644
--- a/tools/txs/tests/transfer.rs
+++ b/tools/txs/tests/transfer.rs
@@ -108,7 +108,7 @@ async fn smoke_transfer_estimate() {
         config_path: Some(d.path().to_owned().join("libra.yaml")),
         url: Some(s.api_endpoint.clone()),
         tx_profile: None,
-        tx_cost: Some(TxCost::default_baseline_cost()),
+        tx_cost: Some(TxCost::default_cheap_txs_cost()),
         estimate_only: true,
     };