near · miraclx · Aug 26, 2022 · Aug 16, 2022 · Aug 17, 2022 · Aug 23, 2022
diff --git a/cargo-near/Cargo.toml b/cargo-near/Cargo.toml
@@ -16,16 +16,16 @@ cargo_metadata = "0.14"
 clap = { version = "3.2", features = ["derive", "env"] }
 colored = "2.0"
 env_logger = "0.9"
-near-sdk = { version = "4.1.0-pre.1", features = ["abi"] }
 log = "0.4"
 prettyplease = "0.1"
 toml = "0.5"
 serde_json = "1.0"
 symbolic-debuginfo = "8.8"
 syn = "1.0"
 quote = "1.0"
+schemars = "0.8"
+near-abi = { version = "0.1.0-pre.0", features = ["__chunked-entries"] }
 
 [dev-dependencies]
 function_name = "0.3"
 proc-macro2 = "1.0"
-schemars = "0.8"
diff --git a/cargo-near/src/abi/generation.rs b/cargo-near/src/abi/generation.rs
@@ -125,7 +125,7 @@ pub(crate) fn generate_main_rs(dylib_path: &Path) -> anyhow::Result<String> {
     let near_abi_function_defs = near_abi_symbols.iter().map(|s| {
         let name = format_ident!("{}", s);
         quote! {
-            fn #name() -> near_sdk::__private::AbiRoot;
+            fn #name() -> near_sdk::__private::ChunkedAbiEntry;
         }
     });
     let near_abi_function_invocations = near_abi_symbols.iter().map(|s| {
@@ -141,9 +141,8 @@ pub(crate) fn generate_main_rs(dylib_path: &Path) -> anyhow::Result<String> {
         }
 
         fn main() -> Result<(), std::io::Error> {
-            let root_abis = vec![#(#near_abi_function_invocations),*];
-            let combined_root_abi = near_sdk::__private::AbiRoot::combine(root_abis);
-            let contents = serde_json::to_string_pretty(&combined_root_abi)?;
+            let abi_entries = vec![#(#near_abi_function_invocations),*];
+            let contents = serde_json::to_string_pretty(&abi_entries)?;
             print!("{}", contents);
             Ok(())
         }

diff --git a/cargo-near/src/abi/mod.rs b/cargo-near/src/abi/mod.rs
@@ -1,7 +1,5 @@
 use crate::cargo::{manifest::CargoManifestPath, metadata::CrateMetadata};
 use crate::util;
-use near_sdk::__private::schemars::schema::{Schema, SchemaObject};
-use near_sdk::__private::{AbiMetadata, AbiRoot};
 use std::collections::HashMap;
 use std::{fs, path::PathBuf};
 
@@ -50,35 +48,36 @@ pub(crate) fn execute(
         )],
     )?;
 
-    let mut near_abi: AbiRoot = serde_json::from_slice(&stdout)?;
-    let metadata = extract_metadata(&crate_metadata);
-    near_abi.metadata = metadata;
+    let mut contract_abi = near_abi::__private::ChunkedAbiEntry::combine(
+        serde_json::from_slice::<Vec<_>>(&stdout)?.into_iter(),
+    )?
+    .into_abi_root(extract_metadata(&crate_metadata));
     if !generate_docs {
-        strip_docs(&mut near_abi);
+        strip_docs(&mut contract_abi);
     }
-    let near_abi_json = serde_json::to_string_pretty(&near_abi)?;
+    let near_abi_json = serde_json::to_string_pretty(&contract_abi)?;
     let out_path_abi = crate_metadata.target_directory.join(ABI_FILE);
     fs::write(&out_path_abi, near_abi_json)?;
 
     Ok(AbiResult { path: out_path_abi })
 }
 
-fn extract_metadata(crate_metadata: &CrateMetadata) -> AbiMetadata {
+fn extract_metadata(crate_metadata: &CrateMetadata) -> near_abi::AbiMetadata {
     let package = &crate_metadata.root_package;
-    AbiMetadata {
+    near_abi::AbiMetadata {
         name: Some(package.name.clone()),
         version: Some(package.version.to_string()),
         authors: package.authors.clone(),
         other: HashMap::new(),
     }
 }
 
-fn strip_docs(abi_root: &mut AbiRoot) {
-    for function in &mut abi_root.abi.functions {
+fn strip_docs(abi_root: &mut near_abi::AbiRoot) {
+    for function in &mut abi_root.body.functions {
         function.doc = None;
     }
-    for schema in &mut abi_root.abi.root_schema.definitions.values_mut() {
-        if let Schema::Object(SchemaObject {
+    for schema in &mut abi_root.body.root_schema.definitions.values_mut() {
+        if let schemars::schema::Schema::Object(schemars::schema::SchemaObject {
             metadata: Some(metadata),
             ..
         }) = schema

diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
@@ -6,14 +6,15 @@ publish = false
 
 [dev-dependencies]
 anyhow = "1.0"
+borsh = "0.9"
 cargo-near = { path = "../cargo-near" }
 function_name = "0.3"
 git2 = "0.14"
-near-sdk = { version = "4.1.0-pre.1", features = ["abi"] }
 prettyplease = "0.1"
 proc-macro2 = "1.0"
 schemars = "0.8"
 serde_json = "1.0"
 syn = "1.0"
 tempfile = "3.3"
 quote = "1.0"
+near-abi = "0.1.0-pre.0"
diff --git a/integration-tests/src/lib.rs b/integration-tests/src/lib.rs
@@ -26,7 +26,7 @@ macro_rules! generate_abi {
             doc: false,
         }))?;
 
-        let abi_root: near_sdk::__private::AbiRoot =
+        let abi_root: near_abi::AbiRoot =
             serde_json::from_slice(&fs::read(workspace_dir.join(function_name!()).join("target").join("near").join("abi.json"))?)?;
         abi_root
     }};

diff --git a/integration-tests/templates/_Cargo.toml b/integration-tests/templates/_Cargo.toml
@@ -7,10 +7,14 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-near-sdk = { version = "4.1.0-pre.1", features = ["abi"] }
 serde = { version = "1", features = ["derive"] }
 schemars = "0.8"
 
+[dependencies.near-sdk]
+git = "https://github.com/near/near-sdk-rs.git"
+rev = "97a0d01cafe1cd7dceb2774f5840052e577edf40"
+features = ["abi"]
+
 [workspace]
 members = []
 

diff --git a/integration-tests/templates/_Cargo_no_abi_feature.toml b/integration-tests/templates/_Cargo_no_abi_feature.toml
@@ -7,10 +7,13 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-near-sdk = { version = "4.1.0-pre.1" }
 serde = { version = "1", features = ["derive"] }
 schemars = "0.8"
 
+[dependencies.near-sdk]
+git = "https://github.com/near/near-sdk-rs.git"
+rev = "97a0d01cafe1cd7dceb2774f5840052e577edf40"
+
 [workspace]
 members = []
 

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_explicit.toml b/integration-tests/templates/sdk-dependency/_Cargo_explicit.toml
@@ -11,7 +11,8 @@ serde = { version = "1", features = ["derive"] }
 schemars = "0.8"
 
 [dependencies.near-sdk]
-version = "4.1.0-pre.1"
+git = "https://github.com/near/near-sdk-rs.git"
+rev = "97a0d01cafe1cd7dceb2774f5840052e577edf40"
 features = ["abi"]
 
 [workspace]

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_multiple_features.toml b/integration-tests/templates/sdk-dependency/_Cargo_multiple_features.toml
@@ -7,10 +7,14 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-near-sdk = { version = "4.1.0-pre.1", features = ["abi", "unstable"] }
 serde = { version = "1", features = ["derive"] }
 schemars = "0.8"
 
+[dependencies.near-sdk]
+git = "https://github.com/near/near-sdk-rs.git"
+rev = "97a0d01cafe1cd7dceb2774f5840052e577edf40"
+features = ["abi", "unstable"]
+
 [workspace]
 members = []
 

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_no_default_features.toml b/integration-tests/templates/sdk-dependency/_Cargo_no_default_features.toml
@@ -7,10 +7,15 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-near-sdk = { version = "4.1.0-pre.1", default-features = false, features = ["abi"] }
 serde = { version = "1", features = ["derive"] }
 schemars = "0.8"
 
+[dependencies.near-sdk]
+git = "https://github.com/near/near-sdk-rs.git"
+rev = "97a0d01cafe1cd7dceb2774f5840052e577edf40"
+default-features = false
+features = ["abi"]
+
 [workspace]
 members = []
 

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_patch.toml b/integration-tests/templates/sdk-dependency/_Cargo_patch.toml
@@ -12,7 +12,7 @@ serde = { version = "1", features = ["derive"] }
 schemars = "0.8"
 
 [patch.crates-io]
-near-sdk = { git = "https://github.com/near/near-sdk-rs.git", rev = "aa151597033872d44d5639933540ce6f1eca505a" }
+near-sdk = { git = "https://github.com/near/near-sdk-rs.git", rev = "97a0d01cafe1cd7dceb2774f5840052e577edf40" }
 
 [workspace]
 members = []

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_platform_specific.toml b/integration-tests/templates/sdk-dependency/_Cargo_platform_specific.toml
@@ -10,11 +10,15 @@ crate-type = ["cdylib"]
 serde = { version = "1", features = ["derive"] }
 schemars = "0.8"
 
-[target.'cfg(windows)'.dependencies]
-near-sdk = { version = "4.1.0-pre.1", features = ["abi"] }
+[target.'cfg(windows)'.dependencies.near-sdk]
+git = "https://github.com/near/near-sdk-rs.git"
+rev = "97a0d01cafe1cd7dceb2774f5840052e577edf40"
+features = ["abi"]
 
-[target.'cfg(unix)'.dependencies]
-near-sdk = { version = "4.1.0-pre.1", features = ["abi"] }
+[target.'cfg(unix)'.dependencies.near-sdk]
+git = "https://github.com/near/near-sdk-rs.git"
+rev = "97a0d01cafe1cd7dceb2774f5840052e577edf40"
+features = ["abi"]
 
 [workspace]
 members = []

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_renamed.toml b/integration-tests/templates/sdk-dependency/_Cargo_renamed.toml
@@ -7,10 +7,15 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-near = { version = "4.1.0-pre.1", package = "near-sdk", features = ["abi"] }
 serde = { version = "1", features = ["derive"] }
 schemars = "0.8"
 
+[dependencies.near]
+package = "near-sdk"
+git = "https://github.com/near/near-sdk-rs.git"
+rev = "97a0d01cafe1cd7dceb2774f5840052e577edf40"
+features = ["abi"]
+
 [workspace]
 members = []
 

diff --git a/integration-tests/tests/cargo/mod.rs b/integration-tests/tests/cargo/mod.rs
@@ -19,7 +19,7 @@ fn clone_git_repo(version: &str) -> anyhow::Result<TempDir> {
 #[test]
 #[named]
 fn test_dependency_local_path() -> anyhow::Result<()> {
-    let near_sdk_dir = clone_git_repo("aa151597033872d44d5639933540ce6f1eca505a")?;
+    let near_sdk_dir = clone_git_repo("97a0d01cafe1cd7dceb2774f5840052e577edf40")?;
     let near_sdk_dep_path = near_sdk_dir.path().join("near-sdk");
 
     // near-sdk = { path = "::path::", features = ["abi"] }
@@ -30,8 +30,8 @@ fn test_dependency_local_path() -> anyhow::Result<()> {
         pub fn foo(&self, a: bool, b: u32) {}
     };
 
-    assert_eq!(abi_root.abi.functions.len(), 1);
-    let function = &abi_root.abi.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 1);
+    let function = &abi_root.body.functions[0];
     assert_eq!(function.params.len(), 2);
 
     Ok(())
@@ -40,7 +40,7 @@ fn test_dependency_local_path() -> anyhow::Result<()> {
 #[test]
 #[named]
 fn test_dependency_local_path_with_version() -> anyhow::Result<()> {
-    let near_sdk_dir = clone_git_repo("aa151597033872d44d5639933540ce6f1eca505a")?;
+    let near_sdk_dir = clone_git_repo("97a0d01cafe1cd7dceb2774f5840052e577edf40")?;
     let near_sdk_dep_path = near_sdk_dir.path().join("near-sdk");
 
     // near-sdk = { path = "::path::", version = "4.1.0-pre.1", features = ["abi"] }
@@ -51,8 +51,8 @@ fn test_dependency_local_path_with_version() -> anyhow::Result<()> {
         pub fn foo(&self, a: bool, b: u32) {}
     };
 
-    assert_eq!(abi_root.abi.functions.len(), 1);
-    let function = &abi_root.abi.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 1);
+    let function = &abi_root.body.functions[0];
     assert_eq!(function.params.len(), 2);
 
     Ok(())
@@ -70,8 +70,8 @@ fn test_dependency_explicit() -> anyhow::Result<()> {
         pub fn foo(&self, a: bool, b: u32) {}
     };
 
-    assert_eq!(abi_root.abi.functions.len(), 1);
-    let function = &abi_root.abi.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 1);
+    let function = &abi_root.body.functions[0];
     assert_eq!(function.params.len(), 2);
 
     Ok(())
@@ -87,8 +87,8 @@ fn test_dependency_no_default_features() -> anyhow::Result<()> {
         pub fn foo(&self, a: bool, b: u32) {}
     };
 
-    assert_eq!(abi_root.abi.functions.len(), 1);
-    let function = &abi_root.abi.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 1);
+    let function = &abi_root.body.functions[0];
     assert_eq!(function.params.len(), 2);
 
     Ok(())
@@ -104,8 +104,8 @@ fn test_dependency_multiple_features() -> anyhow::Result<()> {
         pub fn foo(&self, a: bool, b: u32) {}
     };
 
-    assert_eq!(abi_root.abi.functions.len(), 1);
-    let function = &abi_root.abi.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 1);
+    let function = &abi_root.body.functions[0];
     assert_eq!(function.params.len(), 2);
 
     Ok(())
@@ -127,8 +127,8 @@ fn test_dependency_platform_specific() -> anyhow::Result<()> {
         pub fn foo(&self, a: bool, b: u32) {}
     };
 
-    assert_eq!(abi_root.abi.functions.len(), 1);
-    let function = &abi_root.abi.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 1);
+    let function = &abi_root.body.functions[0];
     assert_eq!(function.params.len(), 2);
 
     Ok(())
@@ -156,8 +156,8 @@ fn test_dependency_renamed() -> anyhow::Result<()> {
         }
     };
 
-    assert_eq!(abi_root.abi.functions.len(), 1);
-    let function = &abi_root.abi.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 1);
+    let function = &abi_root.body.functions[0];
     assert_eq!(function.params.len(), 2);
 
     Ok(())
@@ -172,15 +172,15 @@ fn test_dependency_patch() -> anyhow::Result<()> {
     // near-sdk = { version = "4.1.0-pre.1", features = ["abi"] }
     //
     // [patch.crates-io]
-    // near-sdk = { git = "https://github.com/near/near-sdk-rs.git", rev = "aa151597033872d44d5639933540ce6f1eca505a" }
+    // near-sdk = { git = "https://github.com/near/near-sdk-rs.git", rev = "97a0d01cafe1cd7dceb2774f5840052e577edf40" }
     let abi_root = generate_abi_fn! {
         with Cargo "/templates/sdk-dependency/_Cargo_patch.toml";
 
         pub fn foo(&self, a: bool, b: u32) {}
     };
 
-    assert_eq!(abi_root.abi.functions.len(), 1);
-    let function = &abi_root.abi.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 1);
+    let function = &abi_root.body.functions[0];
     assert_eq!(function.params.len(), 2);
 
     Ok(())