fix: Change receiver_id type to String to be compatible with nearcore (…

…#160) * fix: Change receiver_id type to String to be compatible with nearcore * escape the `receiver_id` to avoid null-bytes
near · Sep 1, 2021 · b3037f5 · b3037f5
1 parent e20730d
commit b3037f5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.9.2 (hotfix)
+
+* Change `receiver_id` field type to `String` to be compatible with `nearcore` `AccessKeyPermissionView` struct (it caused problems during AccessKey serialization)
+
 ## 0.9.1
 
 * Upgrade `nearcore` to 1.21.0 (rc1)

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "indexer-explorer"
-version = "0.9.1"
+version = "0.9.2"
 authors = ["Near Inc <[email protected]>"]
 edition = "2018"
 

diff --git a/src/models/serializers.rs b/src/models/serializers.rs
@@ -1,9 +1,6 @@
-use std::str::FromStr;
-
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 
-use near_indexer::near_primitives;
 use near_indexer::near_primitives::serialize::option_u128_dec_format;
 use near_indexer::near_primitives::views::ActionView;
 
@@ -38,7 +35,7 @@ pub(crate) enum AccessKeyPermissionView {
     FunctionCall {
         #[serde(with = "option_u128_dec_format")]
         allowance: Option<near_indexer::near_primitives::types::Balance>,
-        receiver_id: near_indexer::near_primitives::types::AccountId,
+        receiver_id: String,
         method_names: Vec<String>,
     },
     FullAccess,
@@ -58,8 +55,7 @@ impl From<near_indexer::near_primitives::views::AccessKeyPermissionView>
                 method_names,
             } => Self::FunctionCall {
                 allowance,
-                receiver_id: near_primitives::types::AccountId::from_str(&receiver_id)
-                    .expect("receiver_id is not valid AccountId"),
+                receiver_id: receiver_id.escape_default().to_string(),
                 method_names: method_names
                     .into_iter()
                     .map(|method_name| method_name.escape_default().to_string())