chore: update near sdk pointer to 5 alpha (via git only for now)

integration-tests/src/lib.rs

@@ -1,21 +1,29 @@
-use const_format::formatcp;
-
-/// published `near-sdk` version
-pub const SDK_VERSION: &str = "4.1.1";
-/// NOTE: this version is version of near-sdk in master branch from 5.x.x development cycle
-pub const SDK_VERSION_MASTER: &str = "4.1.1";
-pub const SDK_GIT_REV: &str = "15bfb0e6d54ff386478d137074027c2cb863df03";
-pub const SDK_VERSION_TOML: &str = formatcp!(r#"version = "{SDK_VERSION}""#);
-pub const SDK_GIT_VERSION_TOML_COMMA: &str = formatcp!(
-    r#"version = "{SDK_VERSION_MASTER}", git = "https://github.com/near/near-sdk-rs.git", rev = "{SDK_GIT_REV}""#
-);
-pub const SDK_GIT_VERSION_TOML_TABLE: &str = formatcp!(
-    r#"
-    version = "{SDK_VERSION_MASTER}"
-    git = "https://github.com/near/near-sdk-rs.git"
-    rev = "{SDK_GIT_REV}"
-    "#
-);
+/// NOTE: `near-sdk` version, published on crates.io
+pub mod from_crates_io {
+    use const_format::formatcp;
+
+    pub const SDK_VERSION: &str = "5.0.0-alpha.2";
+    pub const SDK_VERSION_TOML: &str = formatcp!(r#"version = "{SDK_VERSION}""#);
+}
+
+/// NOTE: this version is version of near-sdk in arbitrary revision from N.x.x development cycle
+pub mod from_git {
+    use const_format::formatcp;
+
+    pub const SDK_VERSION: &str = "5.0.0-alpha.2";
+    pub const SDK_REVISION: &str = "5d340f2f8e3fec3da875043adb67466f65a5d1ac";
+    pub const SDK_SHORT_VERSION_TOML: &str = formatcp!(r#"version = "{SDK_VERSION}""#);
+    pub const SDK_REPO: &str = "https://github.com/near/near-sdk-rs.git";
+    pub const SDK_VERSION_TOML: &str =
+        formatcp!(r#"version = "{SDK_VERSION}", git = "{SDK_REPO}", rev = "{SDK_REVISION}""#);
+    pub const SDK_VERSION_TOML_TABLE: &str = formatcp!(
+        r#"
+        version = "{SDK_VERSION}"
+        git = "https://github.com/near/near-sdk-rs.git"
+        rev = "{SDK_REVISION}"
+        "#
+    );
+}
 
 #[macro_export]
 macro_rules! invoke_cargo_near {
@@ -30,11 +38,12 @@ macro_rules! invoke_cargo_near {
         $(cargo_toml = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), $cargo_path)).to_string())?;
         let mut cargo_vars = std::collections::HashMap::new();
         $(cargo_vars = $cargo_vars)?;
-        cargo_vars.insert("sdk-version", $crate::SDK_VERSION);
-        cargo_vars.insert("sdk-git-rev", $crate::SDK_GIT_REV);
-        cargo_vars.insert("sdk-version-toml", $crate::SDK_VERSION_TOML);
-        cargo_vars.insert("sdk-git-version-toml-comma", $crate::SDK_GIT_VERSION_TOML_COMMA);
-        cargo_vars.insert("sdk-git-version-toml-table", $crate::SDK_GIT_VERSION_TOML_TABLE);
+        cargo_vars.insert("sdk-cratesio-version", $crate::from_crates_io::SDK_VERSION);
+        cargo_vars.insert("sdk-cratesio-version-toml", $crate::from_crates_io::SDK_VERSION_TOML);
+        cargo_vars.insert("sdk-git-version", $crate::from_git::SDK_VERSION);
+        cargo_vars.insert("sdk-git-short-version-toml", $crate::from_git::SDK_SHORT_VERSION_TOML);
+        cargo_vars.insert("sdk-git-version-toml", $crate::from_git::SDK_VERSION_TOML);
+        cargo_vars.insert("sdk-git-version-toml-table", $crate::from_git::SDK_VERSION_TOML_TABLE);
         cargo_vars.insert("name", function_name!());
         for (k, v) in cargo_vars {
             cargo_toml = cargo_toml.replace(&format!("::{}::", k), v);

integration-tests/templates/_Cargo.toml

@@ -8,10 +8,9 @@ crate-type = ["cdylib"]
 
 [dependencies]
 # NOTE: uncomment line 11 and comment 12, if it's desirable to switch to published `near-sdk` version
-# near-sdk = { features = ["unstable"], ::sdk-version-toml:: }
-near-sdk = { features = ["unstable"], ::sdk-git-version-toml-comma:: }
+# near-sdk = { features = ["unstable"], ::sdk-cratesio-version-toml:: }
+near-sdk = { features = ["unstable"], ::sdk-git-version-toml:: }
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [workspace]
 members = []

integration-tests/templates/negative/_Cargo_malformed.toml

@@ -7,9 +7,8 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-near-sdk = 4
+near-sdk = 5
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [workspace]
 members = []

integration-tests/templates/negative/_Cargo_no_abi_feature.toml

@@ -8,10 +8,9 @@ crate-type = ["cdylib"]
 
 [dependencies]
 # NOTE: uncomment line 11 and comment 12, if it's desirable to switch to published `near-sdk` version
-# near-sdk = { default-features = false, ::sdk-version-toml:: }
-near-sdk = { default-features = false, ::sdk-git-version-toml-comma:: }
+# near-sdk = { default-features = false, ::sdk-cratesio-version-toml:: }
+near-sdk = { default-features = false, ::sdk-git-version-toml:: }
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [workspace]
 members = []

integration-tests/templates/negative/_Cargo_old_sdk.toml

@@ -9,7 +9,6 @@ crate-type = ["cdylib"]
 [dependencies]
 near-sdk = "=4.0.0"
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 # XXX: parity-secp256k1 was purged from crates.io, so we need to patch the old SDK with git dependency:
 # See https://github.com/near/near-sdk-rs/issues/1126
@@ -26,3 +25,6 @@ opt-level = "z"
 lto = true
 debug = false
 panic = "abort"
+
+[patch.crates-io]
+parity-secp256k1 = { git = 'https://github.com/paritytech/rust-secp256k1.git' }

integration-tests/templates/sdk-dependency/_Cargo_explicit.toml

@@ -8,10 +8,9 @@ crate-type = ["cdylib"]
 
 [dependencies]
 # NOTE: uncomment line 11 and comment 12, if it's desirable to switch to published `near-sdk` version
-# near-sdk = { features = ["abi"], ::sdk-version-toml:: }
-near-sdk = { features = ["abi"], ::sdk-git-version-toml-comma:: }
+# near-sdk = { features = ["abi"], ::sdk-cratesio-version-toml:: }
+near-sdk = { features = ["abi"], ::sdk-git-version-toml:: }
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [workspace]
 members = []

integration-tests/templates/sdk-dependency/_Cargo_local_path.toml

@@ -9,7 +9,6 @@ crate-type = ["cdylib"]
 [dependencies]
 near-sdk = { path = "::path::" }
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [workspace]
 members = []

integration-tests/templates/sdk-dependency/_Cargo_local_path_with_version.toml

@@ -7,9 +7,8 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-near-sdk = { path = "::path::", ::sdk-version-toml:: }
+near-sdk = { path = "::path::", ::sdk-git-short-version-toml:: }
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [workspace]
 members = []

integration-tests/templates/sdk-dependency/_Cargo_multiple_features.toml

@@ -8,10 +8,9 @@ crate-type = ["cdylib"]
 
 [dependencies]
 # NOTE: uncomment line 11 and comment 12, if it's desirable to switch to published `near-sdk` version
-# near-sdk = { features = ["abi", "unstable"], ::sdk-version-toml:: }
-near-sdk = { features = ["abi", "unstable"], ::sdk-git-version-toml-comma:: }
+# near-sdk = { features = ["abi", "unstable"], ::sdk-cratesio-version-toml:: }
+near-sdk = { features = ["abi", "unstable"], ::sdk-git-version-toml:: }
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [workspace]
 members = []

integration-tests/templates/sdk-dependency/_Cargo_no_default_features.toml

@@ -8,10 +8,9 @@ crate-type = ["cdylib"]
 
 [dependencies]
 # NOTE: uncomment line 11 and comment 12, if it's desirable to switch to published `near-sdk` version
-# near-sdk = { default-features = false, features = ["abi"], ::sdk-version-toml:: }
-near-sdk = { default-features = false, features = ["abi"], ::sdk-git-version-toml-comma:: }
+# near-sdk = { default-features = false, features = ["abi"], ::sdk-cratesio-version-toml:: }
+near-sdk = { default-features = false, features = ["abi"], ::sdk-git-version-toml:: }
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [workspace]
 members = []

integration-tests/templates/sdk-dependency/_Cargo_not_a_table.toml

@@ -7,9 +7,8 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-near-sdk = "::sdk-version::"
+near-sdk = "::sdk-cratesio-version::"
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [workspace]
 members = []

integration-tests/templates/sdk-dependency/_Cargo_patch.toml

@@ -7,9 +7,8 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-near-sdk = "4.0.0"
+near-sdk = "::sdk-git-version::"
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [patch.crates-io.near-sdk]
 ::sdk-git-version-toml-table::

integration-tests/templates/sdk-dependency/_Cargo_platform_specific.toml

@@ -8,17 +8,17 @@ crate-type = ["cdylib"]
 
 [dependencies]
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
+
 
 [target.'cfg(windows)'.dependencies]
 # NOTE: uncomment line 15 and comment 16, if it's desirable to switch to published `near-sdk` version
-# near-sdk = { ::sdk-version-toml:: }
-near-sdk = { ::sdk-git-version-toml-comma:: }
+# near-sdk = { ::sdk-cratesio-version-toml:: }
+near-sdk = { ::sdk-git-version-toml:: }
 
 [target.'cfg(unix)'.dependencies]
 # NOTE: uncomment line 20 and comment 21, if it's desirable to switch to published `near-sdk` version
-# near-sdk = { ::sdk-version-toml:: }
-near-sdk = { ::sdk-git-version-toml-comma:: }
+# near-sdk = { ::sdk-cratesio-version-toml:: }
+near-sdk = { ::sdk-git-version-toml:: }
 
 [workspace]
 members = []

integration-tests/templates/sdk-dependency/_Cargo_renamed.toml

@@ -8,10 +8,9 @@ crate-type = ["cdylib"]
 
 [dependencies]
 serde = { version = "1", features = ["derive"] }
-schemars = "0.8"
 
 [dependencies.near]
-near = { package = "near-sdk", ::sdk-version-toml:: }
+near = { package = "near-sdk", ::sdk-git-version-toml:: }
 
 [workspace]
 members = []

integration-tests/tests/abi/borsh_schema.rs

@@ -19,8 +19,8 @@ fn test_borsh_schema_numeric_primitives_signed() -> cargo_near::CliResult {
         ) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.borsh_schemas()?;
     assert_eq!(params.len(), 6);
     let i8_schema = BorshSchemaContainer::new(
@@ -69,8 +69,8 @@ fn test_borsh_schema_numeric_primitives_unsigned() -> cargo_near::CliResult {
         ) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.borsh_schemas()?;
     assert_eq!(params.len(), 6);
     let u8_schema = BorshSchemaContainer::new(
@@ -111,8 +111,8 @@ fn test_borsh_schema_numeric_primitives_float() -> cargo_near::CliResult {
         pub fn foo(&self, #[serializer(borsh)] a: f32, #[serializer(borsh)] b: f64) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.borsh_schemas()?;
     assert_eq!(params.len(), 2);
     let f32_schema = BorshSchemaContainer::new(
@@ -136,8 +136,8 @@ fn test_borsh_schema_string() -> cargo_near::CliResult {
         pub fn foo(&self, #[serializer(borsh)] a: String, #[serializer(borsh)] b: &str, #[serializer(borsh)] c: &'static str) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.borsh_schemas()?;
     assert_eq!(params.len(), 3);
     let string_schema = BorshSchemaContainer::new(
@@ -168,8 +168,8 @@ fn test_borsh_schema_other_primitives() -> cargo_near::CliResult {
         pub fn foo(&self, #[serializer(borsh)] b: bool, #[serializer(borsh)] c: ()) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.borsh_schemas()?;
     assert_eq!(params.len(), 2);
     // char is unsupported by borsh spec
@@ -203,8 +203,8 @@ fn test_borsh_schema_tuples() -> cargo_near::CliResult {
         ) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.borsh_schemas()?;
     assert_eq!(params.len(), 3);
     let tuple1_schema = BorshSchemaContainer::new(
@@ -262,8 +262,8 @@ fn test_borsh_schema_arrays() -> cargo_near::CliResult {
         ) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.borsh_schemas()?;
     assert_eq!(params.len(), 3);
     let array8_schema = BorshSchemaContainer::new(
@@ -346,8 +346,8 @@ fn test_borsh_schema_struct() -> cargo_near::CliResult {
         }
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.borsh_schemas()?;
     assert_eq!(params.len(), 2);
     let pair_def_schema = BorshSchemaContainer::new(
@@ -417,8 +417,8 @@ fn test_borsh_schema_enum() -> cargo_near::CliResult {
         }
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.borsh_schemas()?;
     assert_eq!(params.len(), 2);
     let ip_addr_kind_def_schema = BorshSchemaContainer::new(
@@ -529,8 +529,8 @@ fn test_borsh_schema_complex() -> cargo_near::CliResult {
         }
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.borsh_schemas()?;
     assert_eq!(params.len(), 1);
     let ip_addr_def_schema = BorshSchemaContainer::new(

integration-tests/tests/abi/callbacks.rs

@@ -12,8 +12,8 @@ fn test_callbacks_unwrapped() -> cargo_near::CliResult {
         pub fn foo(&self, #[callback_unwrap] a: bool, #[callback_unwrap] b: u32) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.json_schemas()?;
     assert_eq!(params.len(), 0);
     assert_eq!(function.callbacks.len(), 2);
@@ -46,8 +46,8 @@ fn test_callbacks_result() -> cargo_near::CliResult {
         ) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.json_schemas()?;
     assert_eq!(params.len(), 0);
     assert_eq!(function.callbacks.len(), 2);
@@ -80,8 +80,8 @@ fn test_callbacks_vec() -> cargo_near::CliResult {
         ) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.json_schemas()?;
     assert_eq!(params.len(), 0);
     assert_eq!(function.callbacks.len(), 1);
@@ -117,8 +117,8 @@ fn test_callbacks_mixed_with_params() -> cargo_near::CliResult {
         ) {}
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
-    let function = &abi_root.body.functions[0];
+    assert_eq!(abi_root.body.functions.len(), 2);
+    let function = &abi_root.body.functions[1];
     let params = function.params.json_schemas()?;
     assert_eq!(params.len(), 2);
     assert_eq!(function.callbacks.len(), 2);

integration-tests/tests/abi/e2e.rs

@@ -12,7 +12,7 @@ fn test_simple_function() -> cargo_near::CliResult {
         }
     };
 
-    assert_eq!(abi_root.body.functions.len(), 1);
+    assert_eq!(abi_root.body.functions.len(), 2);
     let function = &abi_root.body.functions[0];
     let u32_schema = SchemaGenerator::default().subschema_for::<u32>();
     assert_eq!(