Merge back rc2024.10.3 #2300

maqi · 2024-10-23T09:46:58Z

Description

With the last three revert commits, there is no conflices to merge back into main.

And followup work for these three revert commits are:

revert of reverting PR 2224: nothing more. Just need to resolve the high CPU usage issue separately. @joshuef is already on it.
revert of reverting PR 2243: nothing more. Related work already merged into main
revert of download either file or dir work: @RolandSherwin or @grumbach shall already on it to have a better resolvement of how to support the feature in better way

uses node control flow to exit a node if we consistently detect high CPU

We will not release these binaries any more.

The `faucet` and `sn_auditor` binaries do not apply to the EVM-based network, so they will be removed.

These targets were not used for a long time and were just cluttering the file with noise.

These crates were not being correctly referenced in some other crates, which meant some release configurations would not build properly.

This is a requirement of the web app.

The node RPC is changed such that the stop event allows shutting the node down with either a success or failure result. Then, in the case of the excessive CPU usage, the node will be shut down with a success result. This allows us to retain an on-failure restart policy for node-based services: with excess CPU usage, they would shut down with a success and so would not be started again.

…ct approval to infinite

feat(evmlib): add token allowance and approval functions & set contra…

This reverts commit 1d14196, reversing changes made to 567200e.

…refixed_with_network_keys" This reverts commit 147ba8e, reversing changes made to 00ad51d.

feat(launchpad): evm launchpad integration

Using a larger chunk size resulted in the node having a larger memory footprint due to the size of the records cache.

…ds_cache chore: reduce max records cache size

feat: download either a file or dir based based on data

Advice on setting these keys had been removed, but as far as I know, they are still required.

================== Crate Versions ================== autonomi: 0.2.0 autonomi-cli: 0.1.1 evmlib: 0.1.1 evm_testnet: 0.1.1 sn_build_info: 0.1.16 sn_evm: 0.1.1 sn_logging: 0.2.37 sn_metrics: 0.1.17 nat-detection: 0.2.8 sn_networking: 0.19.0 sn_node: 0.112.0 node-launchpad: 0.4.0 sn_node_manager: 0.11.0 sn_node_rpc_client: 0.6.32 sn_peers_acquisition: 0.5.4 sn_protocol: 0.17.12 sn_registers: 0.4.0 sn_service_management: 0.4.0 sn_transfers: 0.20.0 test_utils: 0.4.8 token_supplies: 0.1.55 =================== Binary Versions =================== nat-detection: 0.2.8 node-launchpad: 0.4.0 autonomi: 0.1.1 safenode: 0.112.0 safenode-manager: 0.11.0 safenode_rpc_client: 0.6.32 safenodemand: 0.11.0

node-launchpad/src/components/popup/beta_programme.rs

+                        Action::StoreDiscordUserName(username.clone()),
+                        Action::OptionsActions(OptionsActions::UpdateBetaProgrammeUsername(
+                            username,
+                        )), // FIXME: Change OptionsActions::UpdateBetaProgrammeUsername name


node-launchpad/src/components/popup/beta_programme.rs

@@ -200,7 +221,8 @@

        match self.state {
            BetaProgrammeState::DiscordIdAlreadySet => {
-                // split into 4 parts, for the prompt, input, text, dash , and buttons
+                self.validate(); // FIXME: maybe this should be somewhere else


node-launchpad/src/components/status.rs

-                    },
-            ),
+            Constraint::Length(if self.discord_username.is_empty() {
+                41 //TODO: make it dynamic with wallet_not_set


node-launchpad/src/node_mgmt.rs

@@ -288,6 +291,7 @@
        config.data_dir_path.clone(),
        true,
        None,
+        Some(EvmNetwork::ArbitrumSepolia), //FIXME: should come from an UI element.


node-launchpad/src/node_mgmt.rs

@@ -362,6 +366,7 @@
            config.data_dir_path.clone(),
            true,
            None,
+            Some(EvmNetwork::ArbitrumSepolia), //FIXME: Should come from an UI element


…sedGets"" This reverts commit 09c36c8.

…data" This reverts commit 04ec14e.

…re_dir_prefixed_with_network_keys"" This reverts commit 27362f3.

evmlib/src/wallet.rs

-    approve_to_spend_tokens(
-        wallet.clone(),
+    // Check allowance
+    let allowance = token_allowance(


joshuef and others added 30 commits October 16, 2024 10:17

feat(node): kill nodes running on host with little spare CPU

26c5eee

uses node control flow to exit a node if we consistently detect high CPU

chore: remove the auditor and faucet from bumping

758dfa6

We will not release these binaries any more.

chore(release): release candidate 2024.10.3.1

44ca443

chore: remove binaries from release process

ebf708c

The `faucet` and `sn_auditor` binaries do not apply to the EVM-based network, so they will be removed.

chore: package autonomi binary rather than safe

845cac8

chore: remove redundant targets

1d4d319

These targets were not used for a long time and were just cluttering the file with noise.

chore: fix up evmlib and sn_evm references

c96ceee

These crates were not being correctly referenced in some other crates, which meant some release configurations would not build properly.

chore: build safenode with websockets feature

bc9593a

This is a requirement of the web app.

feat(evmlib): add token allowance and approval functions & set contra…

6bfa924

…ct approval to infinite

Merge pull request maidsafe#2277 from mickvandijke/rc-approval-bandaid

d5097d0

feat(evmlib): add token allowance and approval functions & set contra…

fix(node-manager): hardcoding network params for demo

d4ab7b9

feat(launchpad): evm network integration

3f537af

fix(service-management): default values for evm network

62e1fbc

chore(launchpad): remove env variables for build artifacts

66cbf21

Revert "Merge pull request maidsafe#2224 from joshuef/RangeBasedGets"

09c36c8

This reverts commit 1d14196, reversing changes made to 567200e.

Revert "Merge pull request maidsafe#2243 from maqi/record_store_dir_p…

27362f3

…refixed_with_network_keys" This reverts commit 147ba8e, reversing changes made to 00ad51d.

fix(launchpad): use arbitrum sepolia

c4796c1

chore(launchpad): evm network as parameter to maintain_n_running_nodes

033903d

Merge pull request maidsafe#2278 from mazzi/evm_launchpad_on_rc

a53dad4

feat(launchpad): evm launchpad integration

Merge branch 'KillConsistentlyBadNode' into rc-2024.10.3

08f091b

chore: reduce max records cache size

4dec0b2

Using a larger chunk size resulted in the node having a larger memory footprint due to the size of the records cache.

Merge pull request maidsafe#2280 from maidsafe/chore-reduce_max_recor…

99e06f0

…ds_cache chore: reduce max records cache size

feat(autonomi): download either a file or directory based on data

04ec14e

chore(autonomi): add more logging by default

c529ec8

Merge pull request maidsafe#2281 from RolandSherwin/cli_file_up

2a7c924

feat: download either a file or dir based based on data

chore(release): release candidate 2024.10.3.2

af19ff0

docs: changelog for 2024.10.3.2

4ad14d3

docs: update the readme with the latest keys

07953e7

Advice on setting these keys had been removed, but as far as I know, they are still required.

github-advanced-security bot found potential problems Oct 23, 2024

View reviewed changes

maqi force-pushed the merge_back_RC2024-10-3 branch from 344699f to 876beed Compare October 23, 2024 10:09

maqi added the DoNotMerge label Oct 23, 2024

maqi force-pushed the merge_back_RC2024-10-3 branch from 876beed to b47fd84 Compare October 23, 2024 10:31

maqi changed the title ~~Merge back rc2024 10 3~~ Merge back rc2024.10.3 Oct 23, 2024

maqi added 3 commits October 23, 2024 19:51

Revert "Revert "Merge pull request maidsafe#2224 from joshuef/RangeBa…

49115fd

…sedGets"" This reverts commit 09c36c8.

Revert "feat(autonomi): download either a file or directory based on …

9d55e30

…data" This reverts commit 04ec14e.

Revert "Revert "Merge pull request maidsafe#2243 from maqi/record_sto…

7341105

…re_dir_prefixed_with_network_keys"" This reverts commit 27362f3.

maqi force-pushed the merge_back_RC2024-10-3 branch from b47fd84 to 7341105 Compare October 23, 2024 11:55

github-advanced-security bot found potential problems Oct 23, 2024

View reviewed changes

evmlib/src/wallet.rs

approve_to_spend_tokens(

wallet.clone(),

// Check allowance

let allowance = token_allowance(

Check notice

Code scanning / devskim

A "TODO" or similar was left in source code, possibly indicating incomplete functionality Note

Suspicious comment

jacderida approved these changes Oct 23, 2024

View reviewed changes

maqi removed the DoNotMerge label Oct 23, 2024

maqi added this pull request to the merge queue Oct 23, 2024

jacderida removed this pull request from the merge queue due to a manual request Oct 23, 2024

jacderida merged commit bb54425 into maidsafe:main Oct 23, 2024
26 of 27 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge back rc2024.10.3 #2300

Merge back rc2024.10.3 #2300

maqi commented Oct 23, 2024 •

edited

Loading

Merge back rc2024.10.3 #2300

Merge back rc2024.10.3 #2300

Conversation

maqi commented Oct 23, 2024 • edited Loading

Description

maqi commented Oct 23, 2024 •

edited

Loading