[framework] Fix session key active bug (#1691)

* [framework] Fix session key active bug

* fix genesis check

* fixup

crates/rooch-genesis/Cargo.toml

@@ -45,10 +45,12 @@ move-prover = { workspace = true }
 moveos-types = { workspace = true }
 moveos-verifier = { workspace = true }
 moveos-stdlib = { workspace = true }
-framework-builder = { workspace = true }
 moveos = { workspace = true }
 moveos-store = { workspace = true }
 
 rooch-framework = { workspace = true }
 rooch-types = { workspace = true }
-bitcoin-move = { workspace = true }
+bitcoin-move = { workspace = true }
+
+framework-builder = { workspace = true }
+framework-release = { workspace = true }

crates/rooch-genesis/src/lib.rs

@@ -284,7 +284,7 @@ impl RoochGenesis {
     }
 
     pub fn load_stdlib(stdlib_version: StdlibVersion) -> Result<Stdlib> {
-        stdlib_version.load()
+        framework_release::load_stdlib(stdlib_version)
     }
 
     pub fn load_from<P: AsRef<Path>>(genesis_file: P) -> Result<Self> {

crates/rooch-rpc-server/src/lib.rs

@@ -206,7 +206,6 @@ pub async fn run_start_server(opt: &RoochOpt, server_opt: ServerOpt) -> Result<S
 
     let data_import_flag = opt.data_import_flag;
 
-    let genesis_file = arc_base_config.base_data_dir().path().join("genesis");
     if root.is_genesis() {
         let mut network: RoochNetwork = match chain_id {
             RoochChainID::Builtin(chain_id) => chain_id.into(),
@@ -216,9 +215,11 @@ pub async fn run_start_server(opt: &RoochOpt, server_opt: ServerOpt) -> Result<S
         network.set_sequencer_account(sequencer_account.into());
         let genesis: RoochGenesis = RoochGenesis::build(network)?;
         root = genesis.init_genesis(&mut moveos_store)?;
-        genesis.save_to(genesis_file)?;
-    } else {
-        let genesis: RoochGenesis = RoochGenesis::load_from(genesis_file)?;
+    } else if let RoochChainID::Builtin(chain_id) = chain_id {
+        let mut network: RoochNetwork = chain_id.into();
+        //TODO only set sequencer account if the network is local/dev
+        network.set_sequencer_account(sequencer_account.into());
+        let genesis = RoochGenesis::build(network)?;
         genesis.check_genesis(moveos_store.get_config_store())?;
     };
 

frameworks/framework-builder/Cargo.toml

@@ -29,7 +29,6 @@ codespan-reporting = { workspace = true }
 pathdiff = { workspace = true }
 itertools = { workspace = true }
 tracing = { workspace = true }
-include_dir = { workspace = true }
 
 move-binary-format = { workspace = true }
 move-bytecode-utils = { workspace = true }

frameworks/framework-builder/src/lib.rs

@@ -3,7 +3,6 @@
 
 use anyhow::{ensure, Result};
 use codespan_reporting::term::termcolor::{ColorChoice, StandardStream};
-use include_dir::{include_dir, Dir};
 use move_binary_format::{errors::Location, CompiledModule};
 use move_cli::base::reroot_path;
 use move_core_types::account_address::AccountAddress;
@@ -329,8 +328,6 @@ where
 
 pub(crate) const RELEASE_DIR: &str = "../framework-release/released/";
 
-pub(crate) const STATIC_FRAMEWORK_DIR: Dir = include_dir!("../framework-release/released/");
-
 pub(crate) fn release_dir() -> PathBuf {
     path_in_crate(RELEASE_DIR)
 }

frameworks/framework-builder/src/stdlib_version.rs

@@ -1,7 +1,7 @@
 // Copyright (c) RoochNetwork
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{release_dir, Stdlib, STATIC_FRAMEWORK_DIR};
+use crate::{release_dir, Stdlib};
 use anyhow::{anyhow, Result};
 use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
@@ -51,7 +51,7 @@ impl StdlibVersion {
         true
     }
 
-    fn dir_with_file(&self) -> PathBuf {
+    pub fn dir_with_file(&self) -> PathBuf {
         PathBuf::from(self.to_string()).join("stdlib")
     }
 
@@ -64,22 +64,6 @@ impl StdlibVersion {
         Stdlib::load_from_file(file)
     }
 
-    /// Load stdlib from static include file
-    pub fn load(&self) -> Result<Stdlib> {
-        STATIC_FRAMEWORK_DIR
-            .get_file(self.dir_with_file())
-            .ok_or_else(|| anyhow!("stdlib not found"))
-            .and_then(|f| {
-                Stdlib::decode(f.contents()).map_err(|e| {
-                    anyhow!(
-                        "Load stdlib from static include file {:?} failed: {:?}",
-                        f.path(),
-                        e
-                    )
-                })
-            })
-    }
-
     pub fn save(&self, stdlib: &Stdlib) -> Result<()> {
         let file = self.output_file();
         let parent = file

frameworks/framework-release/Cargo.toml

@@ -20,6 +20,7 @@ once_cell = { workspace = true }
 serde = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
+include_dir = { workspace = true }
 
 move-core-types = { workspace = true }
 move-binary-format = { workspace = true }

frameworks/framework-release/src/lib.rs

@@ -0,0 +1,23 @@
+// Copyright (c) RoochNetwork
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{anyhow, Result};
+use framework_builder::{stdlib_version::StdlibVersion, Stdlib};
+use include_dir::{include_dir, Dir};
+
+pub(crate) const STATIC_FRAMEWORK_DIR: Dir = include_dir!("released");
+
+pub fn load_stdlib(version: StdlibVersion) -> Result<Stdlib> {
+    STATIC_FRAMEWORK_DIR
+        .get_file(version.dir_with_file())
+        .ok_or_else(|| anyhow!("stdlib not found"))
+        .and_then(|f| {
+            Stdlib::decode(f.contents()).map_err(|e| {
+                anyhow!(
+                    "Load stdlib from static include file {:?} failed: {:?}",
+                    f.path(),
+                    e
+                )
+            })
+        })
+}

frameworks/rooch-framework/doc/transfer.md

@@ -11,8 +11,7 @@
 -  [Function `transfer_object`](#0x3_transfer_transfer_object)
 
 
-<pre><code><b>use</b> <a href="">0x1::debug</a>;
-<b>use</b> <a href="">0x1::option</a>;
+<pre><code><b>use</b> <a href="">0x1::option</a>;
 <b>use</b> <a href="">0x2::account</a>;
 <b>use</b> <a href="">0x2::object</a>;
 <b>use</b> <a href="account.md#0x3_account">0x3::account</a>;

frameworks/rooch-framework/sources/session_key.move

@@ -258,9 +258,15 @@ module rooch_framework::session_key {
     public(friend) fun active_session_key(authentication_key: vector<u8>) {
         let sender_addr = tx_context::sender();
         let now_seconds = timestamp::now_seconds();
-        assert!(account::exists_resource<SessionKeys>(sender_addr), ErrorSessionKeyIsInvalid);
+        // If the session key is not exists, do nothing
+        // Because the user may remove the session key in the same transaction
+        if(!account::exists_resource<SessionKeys>(sender_addr)){
+            return
+        };
         let session_keys = account::borrow_mut_resource<SessionKeys>(sender_addr);
-        assert!(table::contains(&session_keys.keys, authentication_key), ErrorSessionKeyIsInvalid);
+        if(!table::contains(&session_keys.keys, authentication_key)){
+            return
+        };
         let session_key = table::borrow_mut(&mut session_keys.keys, authentication_key);
         session_key.last_active_time = now_seconds;
     }