Merge branch 'miraclx/abi-embed' into miraclx/inspect

near · Aug 26, 2022 · 3b3d52e · 3b3d52e
2 parents 7b0425f + 4cc22b0
commit 3b3d52e
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -1,12 +1,13 @@
 # cargo-near
-Cargo extension for building Rust smart contracts on NEAR
+
+Cargo extension for building [near-sdk-rs](https://github.com/near/near-sdk-rs) smart contracts and [ABI schemas](https://github.com/near/abi) on NEAR
 
 To install:
 ```
 cargo install --path cargo-near
 ```
 
-To generate ABI for a contract (while in the directory containing contract's Cargo.toml):
+To generate an [ABI](https://github.com/near/abi) for a contract (while in the directory containing contract's Cargo.toml):
 ```
 cargo near abi
 ```

diff --git a/integration-tests/templates/_Cargo.toml b/integration-tests/templates/_Cargo.toml
@@ -12,7 +12,7 @@ schemars = "0.8"
 
 [dependencies.near-sdk]
 git = "https://github.com/near/near-sdk-rs.git"
-rev = "1f9a7b23b943b6c8ee4d1db2c2427a2b5f0716bb"
+rev = "03bab8db6145e038626c4b15b34b0bd8a33fba44"
 features = ["abi"]
 
 [workspace]

diff --git a/integration-tests/templates/_Cargo_no_abi_feature.toml b/integration-tests/templates/_Cargo_no_abi_feature.toml
@@ -12,7 +12,7 @@ schemars = "0.8"
 
 [dependencies.near-sdk]
 git = "https://github.com/near/near-sdk-rs.git"
-rev = "1f9a7b23b943b6c8ee4d1db2c2427a2b5f0716bb"
+rev = "03bab8db6145e038626c4b15b34b0bd8a33fba44"
 
 [workspace]
 members = []

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_explicit.toml b/integration-tests/templates/sdk-dependency/_Cargo_explicit.toml
@@ -12,7 +12,7 @@ schemars = "0.8"
 
 [dependencies.near-sdk]
 git = "https://github.com/near/near-sdk-rs.git"
-rev = "1f9a7b23b943b6c8ee4d1db2c2427a2b5f0716bb"
+rev = "03bab8db6145e038626c4b15b34b0bd8a33fba44"
 features = ["abi"]
 
 [workspace]

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_local_path_with_version.toml b/integration-tests/templates/sdk-dependency/_Cargo_local_path_with_version.toml
@@ -7,7 +7,7 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-near-sdk = { path = "::path::", version = "4.1.0-pre.1", features = ["abi"] }
+near-sdk = { path = "::path::", version = "4.1.0-pre.2", features = ["abi"] }
 serde = { version = "1", features = ["derive"] }
 schemars = "0.8"
 

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_multiple_features.toml b/integration-tests/templates/sdk-dependency/_Cargo_multiple_features.toml
@@ -12,7 +12,7 @@ schemars = "0.8"
 
 [dependencies.near-sdk]
 git = "https://github.com/near/near-sdk-rs.git"
-rev = "1f9a7b23b943b6c8ee4d1db2c2427a2b5f0716bb"
+rev = "03bab8db6145e038626c4b15b34b0bd8a33fba44"
 features = ["abi", "unstable"]
 
 [workspace]

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_no_default_features.toml b/integration-tests/templates/sdk-dependency/_Cargo_no_default_features.toml
@@ -12,7 +12,7 @@ schemars = "0.8"
 
 [dependencies.near-sdk]
 git = "https://github.com/near/near-sdk-rs.git"
-rev = "1f9a7b23b943b6c8ee4d1db2c2427a2b5f0716bb"
+rev = "03bab8db6145e038626c4b15b34b0bd8a33fba44"
 default-features = false
 features = ["abi"]
 

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_patch.toml b/integration-tests/templates/sdk-dependency/_Cargo_patch.toml
@@ -7,12 +7,12 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-near-sdk = { version = "4.1.0-pre.1", features = ["abi"] }
+near-sdk = { version = "4.1.0-pre.2", features = ["abi"] }
 serde = { version = "1", features = ["derive"] }
 schemars = "0.8"
 
 [patch.crates-io]
-near-sdk = { git = "https://github.com/near/near-sdk-rs.git", rev = "1f9a7b23b943b6c8ee4d1db2c2427a2b5f0716bb" }
+near-sdk = { git = "https://github.com/near/near-sdk-rs.git", rev = "03bab8db6145e038626c4b15b34b0bd8a33fba44" }
 
 [workspace]
 members = []

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_platform_specific.toml b/integration-tests/templates/sdk-dependency/_Cargo_platform_specific.toml
@@ -12,12 +12,12 @@ schemars = "0.8"
 
 [target.'cfg(windows)'.dependencies.near-sdk]
 git = "https://github.com/near/near-sdk-rs.git"
-rev = "1f9a7b23b943b6c8ee4d1db2c2427a2b5f0716bb"
+rev = "03bab8db6145e038626c4b15b34b0bd8a33fba44"
 features = ["abi"]
 
 [target.'cfg(unix)'.dependencies.near-sdk]
 git = "https://github.com/near/near-sdk-rs.git"
-rev = "1f9a7b23b943b6c8ee4d1db2c2427a2b5f0716bb"
+rev = "03bab8db6145e038626c4b15b34b0bd8a33fba44"
 features = ["abi"]
 
 [workspace]

diff --git a/integration-tests/templates/sdk-dependency/_Cargo_renamed.toml b/integration-tests/templates/sdk-dependency/_Cargo_renamed.toml
@@ -13,7 +13,7 @@ schemars = "0.8"
 [dependencies.near]
 package = "near-sdk"
 git = "https://github.com/near/near-sdk-rs.git"
-rev = "1f9a7b23b943b6c8ee4d1db2c2427a2b5f0716bb"
+rev = "03bab8db6145e038626c4b15b34b0bd8a33fba44"
 features = ["abi"]
 
 [workspace]

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("1f9a7b23b943b6c8ee4d1db2c2427a2b5f0716bb")?;
+    let near_sdk_dir = clone_git_repo("03bab8db6145e038626c4b15b34b0bd8a33fba44")?;
     let near_sdk_dep_path = near_sdk_dir.path().join("near-sdk");
 
     // near-sdk = { path = "::path::", features = ["abi"] }
@@ -40,10 +40,10 @@ 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("1f9a7b23b943b6c8ee4d1db2c2427a2b5f0716bb")?;
+    let near_sdk_dir = clone_git_repo("03bab8db6145e038626c4b15b34b0bd8a33fba44")?;
     let near_sdk_dep_path = near_sdk_dir.path().join("near-sdk");
 
-    // near-sdk = { path = "::path::", version = "4.1.0-pre.1", features = ["abi"] }
+    // near-sdk = { path = "::path::", version = "4.1.0-pre.2", features = ["abi"] }
     let abi_root = generate_abi_fn! {
         with Cargo "/templates/sdk-dependency/_Cargo_local_path_with_version.toml",
         and vars HashMap::from([("path", near_sdk_dep_path.to_str().unwrap())]);
@@ -62,7 +62,7 @@ fn test_dependency_local_path_with_version() -> anyhow::Result<()> {
 #[named]
 fn test_dependency_explicit() -> anyhow::Result<()> {
     // [dependencies.near-sdk]
-    // version = "4.1.0-pre.1"
+    // version = "4.1.0-pre.2"
     // features = ["abi"]
     let abi_root = generate_abi_fn! {
         with Cargo "/templates/sdk-dependency/_Cargo_explicit.toml";
@@ -80,7 +80,7 @@ fn test_dependency_explicit() -> anyhow::Result<()> {
 #[test]
 #[named]
 fn test_dependency_no_default_features() -> anyhow::Result<()> {
-    // near-sdk = { version = "4.1.0-pre.1", default-features = false, features = ["abi"] }
+    // near-sdk = { version = "4.1.0-pre.2", default-features = false, features = ["abi"] }
     let abi_root = generate_abi_fn! {
         with Cargo "/templates/sdk-dependency/_Cargo_no_default_features.toml";
 
@@ -97,7 +97,7 @@ fn test_dependency_no_default_features() -> anyhow::Result<()> {
 #[test]
 #[named]
 fn test_dependency_multiple_features() -> anyhow::Result<()> {
-    // near-sdk = { version = "4.1.0-pre.1", features = ["abi", "unstable"] }
+    // near-sdk = { version = "4.1.0-pre.2", features = ["abi", "unstable"] }
     let abi_root = generate_abi_fn! {
         with Cargo "/templates/sdk-dependency/_Cargo_multiple_features.toml";
 
@@ -117,10 +117,10 @@ fn test_dependency_multiple_features() -> anyhow::Result<()> {
 #[named]
 fn test_dependency_platform_specific() -> anyhow::Result<()> {
     // [target.'cfg(windows)'.dependencies]
-    // near-sdk = { version = "4.1.0-pre.1", features = ["abi"] }
+    // near-sdk = { version = "4.1.0-pre.2", features = ["abi"] }
     //
     // [target.'cfg(unix)'.dependencies]
-    // near-sdk = { version = "4.1.0-pre.1", features = ["abi"] }
+    // near-sdk = { version = "4.1.0-pre.2", features = ["abi"] }
     let abi_root = generate_abi_fn! {
         with Cargo "/templates/sdk-dependency/_Cargo_platform_specific.toml";
 
@@ -139,7 +139,7 @@ fn test_dependency_platform_specific() -> anyhow::Result<()> {
 #[test]
 #[named]
 fn test_dependency_renamed() -> anyhow::Result<()> {
-    // near = { version = "4.1.0-pre.1", package = "near-sdk", features = ["abi"] }
+    // near = { version = "4.1.0-pre.2", package = "near-sdk", features = ["abi"] }
     let abi_root = generate_abi! {
         with Cargo "/templates/sdk-dependency/_Cargo_renamed.toml";
 
@@ -169,10 +169,10 @@ fn test_dependency_renamed() -> anyhow::Result<()> {
 #[named]
 fn test_dependency_patch() -> anyhow::Result<()> {
     // [dependencies]
-    // near-sdk = { version = "4.1.0-pre.1", features = ["abi"] }
+    // near-sdk = { version = "4.1.0-pre.2", features = ["abi"] }
     //
     // [patch.crates-io]
-    // near-sdk = { git = "https://github.com/near/near-sdk-rs.git", rev = "1f9a7b23b943b6c8ee4d1db2c2427a2b5f0716bb" }
+    // near-sdk = { git = "https://github.com/near/near-sdk-rs.git", rev = "03bab8db6145e038626c4b15b34b0bd8a33fba44" }
     let abi_root = generate_abi_fn! {
         with Cargo "/templates/sdk-dependency/_Cargo_patch.toml";