updated beam submodule

BeamMW · Jun 19, 2024 · b5f881a · b5f881a
1 parent 0cb2900
commit b5f881a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/beam b/beam
diff --git a/ui/model/assets_manager.cpp b/ui/model/assets_manager.cpp
@@ -54,7 +54,7 @@ AssetsManager::AssetsManager(WalletModel::Ptr wallet, ExchangeRatesManager::Ptr
         "#ff3b3b", "#73ff7c", "#ffa86c", "#ff3abe", "#00aee1", "#ff5200", "#6464ff", "#ff7a21", "#63afff", "#c81f68"
     };
 
-    std::size_t i{};
+    uint32_t i = 0;
     for (auto it= predefined_color_strings.begin(); it != predefined_color_strings.end(); ++it, ++i)
     {
         _icons[i] = QString::fromStdString(std::format("qrc:/assets/asset-{}.svg", i));

diff --git a/ui/viewmodel/qml_globals.cpp b/ui/viewmodel/qml_globals.cpp
@@ -157,7 +157,7 @@ bool QMLGlobals::needPasswordToSpend()
 bool QMLGlobals::isFork3()
 {
     const auto height = AppModel::getInstance().getWalletModel()->getCurrentHeight();
-    return beam::wallet::isFork3(height);
+    return beam::Rules::get().IsPastFork_<3>(height);
 }
 
 bool QMLGlobals::isPasswordValid(const QString& value)
+4 −4		3rdparty/libbitcoin/examples/electrum_get_balance.cpp
+1 −1		3rdparty/libbitcoin/src/chain/transaction.cpp
+14 −3		CMakeLists.txt
+33 −33		android/jni.cpp
+2 −2		android/node_model.cpp
+29 −29		android/wallet_model.cpp
+1 −1		beam/cli.cpp
+5 −0		bvm/ManagerStd.cpp
+1 −1		bvm/ManagerStd.h
+80 −33		bvm/bvm2.cpp
+12 −13		bvm/bvm2.h
+3 −3		bvm/bvm2_opcodes.h
+2 −21		bvm/ethash_service/shaders_ethash.h
+1 −1		bvm/wasm_interpreter.h
+24 −24		core/block_crypt.cpp
+25 −3		core/block_crypt.h
+4 −4		core/block_rw.cpp
+2 −2		core/serialization_adapters.h
+226 −119		explorer/adapter.cpp
+28 −1		explorer/adapter.h
+739 −283		explorer/htm/BeamExplorer.htm
+91 −56		explorer/server.cpp
+1 −1		hw_crypto/unittest/hw_crypto_test.cpp
+5 −1		keykeeper/CMakeLists.txt
+2 −2		keykeeper/local_private_key_keeper.cpp
+2 −2		keykeeper/remote_key_keeper.cpp
+1 −1		keykeeper/trezor_key_keeper.cpp
+6 −6		node/node.cpp
+12 −12		node/processor.cpp
+5 −5		node/unittests/node_test.cpp
+1 −1		node/utils/node_net_sim.cpp
+8 −6		pow/beamHash.cpp
+1 −3		pow/stratum_server.cpp
+1 −1		utility/CMakeLists.txt
+5 −2		utility/cli/options.cpp
+3 −1		utility/cli/options.h
+2 −10		wallet/api/v6_0/v6_api_handle.cpp
+68 −46		wallet/cli/cli.cpp
+2 −2		wallet/client/CMakeLists.txt
+1 −1		wallet/client/extensions/broadcast_gateway/CMakeLists.txt
+1 −1		wallet/client/extensions/dex_board/CMakeLists.txt
+1 −1		wallet/client/extensions/export/CMakeLists.txt
+1 −1		wallet/client/extensions/news_channels/CMakeLists.txt
+1 −1		wallet/client/extensions/news_channels/exchange_rate_provider.cpp
+1 −1		wallet/client/extensions/notifications/CMakeLists.txt
+1 −1		wallet/client/extensions/offers_board/CMakeLists.txt
+33 −6		wallet/client/wallet_client.cpp
+1 −1		wallet/client/wallet_client.h
+1 −1		wallet/core/CMakeLists.txt
+1 −1		wallet/core/base_tx_builder.cpp
+3 −13		wallet/core/common.cpp
+2 −3		wallet/core/common.h
+25 −0		wallet/core/contracts/shaders_manager.cpp
+8 −1		wallet/core/contracts/shaders_manager.h
+363 −14		wallet/core/wallet.cpp
+40 −1		wallet/core/wallet.h
+71 −2		wallet/core/wallet_db.cpp
+9 −0		wallet/core/wallet_db.h
+1 −1		wallet/transactions/assets/aunregister_transaction.cpp
+1 −1		wallet/transactions/dex/dex_tx.cpp
+2 −2		wallet/transactions/swaps/bridges/ethereum/ethereum_side.cpp
+1 −1		wallet/transactions/swaps/bridges/qtum/common.cpp
+3 −3		wallet/unittests/electrum_test.cpp
+34 −34		wallet/unittests/ethereum_test.cpp
+1 −1		wallet/unittests/offline.cpp
+2 −2		wallet/unittests/wallet_test.cpp
+5 −1		wasmclient/CMakeLists.txt
+4 −4		wasmclient/wasmclient.cpp
+2 −2		websocket/sessions.h