search

near / cargo-near

Cargo extension for building Rust smart contracts on NEAR
Apache License 2.0
33 stars 16 forks source link

git(source-scan): resolve conflicts with `main` #162

Closed dj8yfo closed 3 months ago

dj8yfo commented 3 months ago

commit https://github.com/near/cargo-near/pull/162/commits/ca135003f059c24b531fde89967e1a36e9c96f8b was lost in merge of https://github.com/near/cargo-near/pull/159, as it was accidentally not pushed to remote before merge, which was discovered when testing on contract

SIDENOTE: commit https://github.com/near/cargo-near/pull/162/commits/787c3a429e24957101f44857e3f33ea4c8e906cb fixes somewhat unrelated problem, also present in main . It can be cherry-picked into a standalone pr to main :

as cargo metadata is called without any additional args (--features or whatnot), the following diff: 

-near-sdk = { version = "5.1.0", features = ["legacy"], git = "https://github.com/dj8yfo/near-sdk-rs.git", branch = "add_contract_metadata" }
+near-sdk = { version = "5.1.0", default-features = false, features = ["wee_alloc", "legacy"], git = "https://github.com/dj8yfo/near-sdk-rs.git", branch = "add_contract_metadata" }

results in 

Error:
   0: `near-sdk` dependency must have the `abi` feature enabled

which somewhat contradicts no explicit abi feature , which is promoted for use by near-docs