Merge pull request #22 from octopus-network/v2.2.0

Upgrade to v2.2.0

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "appchain-anchor-wrapper"
-version = "2.1.1"
+version = "2.2.0"
 authors = ["Octopus Network"]
 edition = "2021"
 
@@ -13,6 +13,7 @@ near-primitives = "0.5.0"
 near-units = "0.2.0"
 hex = "0.4.2"
 num-format = "0.4.0"
+parity-scale-codec = "2.0.0"
 secp256k1-test = { package = "secp256k1", version = "0.20.3", features = ["rand-std", "recovery"] }
 beefy-light-client = { git = "https://github.com/octopus-network/beefy-light-client.git", branch = "main" }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
@@ -24,7 +25,7 @@ mock-oct-token = { path = "./mock-oct-token" }
 wrapped-appchain-token = { git = "https://github.com/octopus-network/wrapped-appchain-token.git", branch = "v2.0.0" }
 wrapped-appchain-nft = { git = "https://github.com/octopus-network/wrapped-appchain-nft.git", branch = "main" }
 tokio = { version = "1.14", features = ["full"] }
-workspaces = "0.3"
+workspaces = "0.4"
 
 [profile.release]
 codegen-units = 1

appchain-anchor/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "appchain-anchor"
-version = "2.1.1"
+version = "2.2.0"
 authors = ["Octopus Network"]
 edition = "2021"
 

appchain-anchor/src/anchor_viewer.rs

@@ -7,6 +7,10 @@ impl AnchorViewer for AppchainAnchor {
         ANCHOR_VERSION.to_string()
     }
     //
+    fn get_appchain_template_type(&self) -> AppchainTemplateType {
+        self.appchain_template_type.clone()
+    }
+    //
     fn get_owner_pk(&self) -> PublicKey {
         self.owner_pk.clone()
     }
@@ -60,11 +64,6 @@ impl AnchorViewer for AppchainAnchor {
                 .get()
                 .unwrap()
                 .index_range(),
-            index_range_of_anchor_event_history: self
-                .anchor_event_histories
-                .get()
-                .unwrap()
-                .index_range(),
             index_range_of_staking_history: self.staking_histories.get().unwrap().index_range(),
             nonce_range_of_appchain_messages: IndexRange {
                 start_index: U64::from(u64::from(appchain_messages.min_nonce())),
@@ -489,7 +488,10 @@ impl AnchorViewer for AppchainAnchor {
         &self,
         validator_id_in_appchain: String,
     ) -> Option<ValidatorProfile> {
-        let formatted_id = AccountIdInAppchain::new(Some(validator_id_in_appchain.clone()));
+        let formatted_id = AccountIdInAppchain::new(
+            Some(validator_id_in_appchain.clone()),
+            &self.appchain_template_type,
+        );
         formatted_id.assert_valid();
         self.validator_profiles
             .get()
@@ -547,7 +549,7 @@ impl AnchorViewer for AppchainAnchor {
     //
     fn get_appchain_message_of(&self, nonce: u32) -> Option<AppchainMessage> {
         let appchain_messages = self.appchain_messages.get().unwrap();
-        appchain_messages.get_message(nonce)
+        appchain_messages.get_message(&nonce)
     }
     //
     fn get_appchain_messages(