Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

soroban sdk version bump + fixes #52

Merged
merged 2 commits into from
Dec 15, 2023
Merged

soroban sdk version bump + fixes #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e26d0f4
soroban sdk version bump + fixes
arlosiggio Dec 14, 2023
0719c70
removed test generated files
arlosiggio Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ test-cases/**/Cargo.lock
detectors/**/Cargo.lock
scout-audit-internal/Cargo.lock

#ignore test generated files
test-cases/**/test_snapshots/**

# -------------------------------------------------------------------------------------
# -------------------------------------- Misc -----------------------------------------
# -------------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions detectors/overflow-check/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ crate-type = ["cdylib"]
soroban-sdk = "20.0.0-rc2"

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down Expand Up @@ -63,7 +63,7 @@ crate-type = ["cdylib"]
soroban-sdk = "20.0.0-rc2"

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
4 changes: 2 additions & 2 deletions test-cases/avoid-core-mem-forget/avoid-core-mem-forget-1/remediated-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
soroban-sdk = { version = "20.0.0-rc2" }
soroban-sdk = { version = "=20.0.0" }

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
4 changes: 2 additions & 2 deletions test-cases/avoid-core-mem-forget/avoid-core-mem-forget-1/vulnerable-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
soroban-sdk = { version = "20.0.0-rc2" }
soroban-sdk = { version = "=20.0.0" }

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
4 changes: 2 additions & 2 deletions test-cases/divide-before-multiply/divide-before-multiply-1/remediated-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
soroban-sdk = { version = "20.0.0-rc2" }
soroban-sdk = { version = "=20.0.0" }

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
4 changes: 2 additions & 2 deletions test-cases/divide-before-multiply/divide-before-multiply-1/vulnerable-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
soroban-sdk = { version = "20.0.0-rc2" }
soroban-sdk = { version = "=20.0.0" }

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
4 changes: 2 additions & 2 deletions test-cases/divide-before-multiply/divide-before-multiply-2/remediated-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
soroban-sdk = { version = "20.0.0-rc2" }
soroban-sdk = { version = "=20.0.0" }

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
4 changes: 2 additions & 2 deletions test-cases/divide-before-multiply/divide-before-multiply-2/vulnerable-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
soroban-sdk = { version = "20.0.0-rc2" }
soroban-sdk = { version = "=20.0.0" }

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
4 changes: 2 additions & 2 deletions test-cases/divide-before-multiply/divide-before-multiply-3/remediated-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
soroban-sdk = { version = "20.0.0-rc2" }
soroban-sdk = { version = "=20.0.0" }

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
4 changes: 2 additions & 2 deletions test-cases/divide-before-multiply/divide-before-multiply-3/vulnerable-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
soroban-sdk = { version = "20.0.0-rc2" }
soroban-sdk = { version = "=20.0.0" }

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
2 changes: 1 addition & 1 deletion ...insufficiently-random-values/insufficiently-random-values-1/remediated-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ crate-type = ["cdylib"]
soroban-sdk = "20.0.0-rc2"

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
20 changes: 10 additions & 10 deletions ...insufficiently-random-values/insufficiently-random-values-1/remediated-example/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ impl Contract {
if max_val == 0 {
Err(Error::MaxValZero)
} else {
let val = env.prng().u64_in_range(0..max_val);
let val = env.prng().gen_range(0..max_val);
Ok(val)
}
}
Expand All @@ -39,16 +39,16 @@ mod test {

// When
let first_random_value = client.generate_random_value(&10);
let second_random_value = client.generate_random_value(&10);
let third_random_value = client.generate_random_value(&10);
let fourth_random_value = client.generate_random_value(&10);
let fifth_random_value = client.generate_random_value(&10);
let second_random_value = client.generate_random_value(&100);
let third_random_value = client.generate_random_value(&1000);
let fourth_random_value = client.generate_random_value(&10000);
let fifth_random_value = client.generate_random_value(&100000);

// Then
assert_eq!(first_random_value, 6);
assert_eq!(second_random_value, 5);
assert_eq!(third_random_value, 8);
assert_eq!(fourth_random_value, 8);
assert_eq!(fifth_random_value, 4);
assert!(first_random_value < 10);
assert!(second_random_value < 100);
assert!(third_random_value < 1000);
assert!(fourth_random_value < 10000);
assert!(fifth_random_value < 100000);
}
}
2 changes: 1 addition & 1 deletion ...insufficiently-random-values/insufficiently-random-values-1/vulnerable-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ crate-type = ["cdylib"]
soroban-sdk = "20.0.0-rc2"

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
2 changes: 1 addition & 1 deletion test-cases/overflow-check/overflow-check-1/remediated-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ crate-type = ["cdylib"]
soroban-sdk = "20.0.0-rc2"

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
2 changes: 1 addition & 1 deletion test-cases/overflow-check/overflow-check-1/vulnerable-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ crate-type = ["cdylib"]
soroban-sdk = "20.0.0-rc2"

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
4 changes: 2 additions & 2 deletions test-cases/set-contract-storage/set-contract-storage-1/remediated-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
soroban-sdk = { version = "20.0.0-rc2" }
soroban-sdk = { version = "=20.0.0" }

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
4 changes: 2 additions & 2 deletions test-cases/set-contract-storage/set-contract-storage-1/remediated-example/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ impl SetContractStorage {
let mut count: u32 = storage.get(&COUNTER).unwrap_or(0);
count += 1;
storage.set(&COUNTER, &count);
storage.bump(100, 100);
storage.extend_ttl(100, 100);
count
}
}
Expand All @@ -33,7 +33,7 @@ mod tests {
let contract_id = env.register_contract(None, SetContractStorage);
let client = SetContractStorageClient::new(&env, &contract_id);
env.mock_all_auths();
let user = <Address as testutils::Address>::random(&env);
let user = <Address as testutils::Address>::generate(&env);

// When
let first_increment = client.increment(&user);
Expand Down
4 changes: 2 additions & 2 deletions test-cases/set-contract-storage/set-contract-storage-1/vulnerable-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
soroban-sdk = { version = "20.0.0-rc2" }
soroban-sdk = { version = "=20.0.0" }

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
2 changes: 1 addition & 1 deletion test-cases/set-contract-storage/set-contract-storage-1/vulnerable-example/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ impl SetContractStorage {
let mut count: u32 = storage.get(&COUNTER).unwrap_or(0);
count += 1;
storage.set(&COUNTER, &count);
storage.bump(100, 100);
storage.extend_ttl(100, 100);
count
}
}
Expand Down
4 changes: 2 additions & 2 deletions test-cases/set-contract-storage/set-contract-storage-2/remediated-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
soroban-sdk = { version = "20.0.0-rc2" }
soroban-sdk = { version = "=20.0.0" }

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
4 changes: 2 additions & 2 deletions test-cases/set-contract-storage/set-contract-storage-2/remediated-example/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ impl SetContractStorage {
let mut count: u32 = storage.get(&COUNTER).unwrap_or(0);
count += 1;
storage.set(&COUNTER, &count);
storage.bump(&COUNTER, 100, 100);
storage.extend_ttl(&COUNTER, 100, 100);
count
}
}
Expand All @@ -33,7 +33,7 @@ mod tests {
let contract_id = env.register_contract(None, SetContractStorage);
let client = SetContractStorageClient::new(&env, &contract_id);
env.mock_all_auths();
let user = <Address as testutils::Address>::random(&env);
let user = <Address as testutils::Address>::generate(&env);

// When
let first_increment = client.increment(&user);
Expand Down
6 changes: 3 additions & 3 deletions test-cases/set-contract-storage/set-contract-storage-2/vulnerable-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[package]
name = "set-contract-storage-vulnerable-1"
name = "set-contract-storage-vulnerable-2"
version = "0.1.0"
edition = "2021"

[lib]
crate-type = ["cdylib"]

[dependencies]
soroban-sdk = { version = "20.0.0-rc2" }
soroban-sdk = { version = "=20.0.0" }

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
2 changes: 1 addition & 1 deletion test-cases/set-contract-storage/set-contract-storage-2/vulnerable-example/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ impl SetContractStorage {
let mut count: u32 = storage.get(&COUNTER).unwrap_or(0);
count += 1;
storage.set(&COUNTER, &count);
storage.bump(&COUNTER, 100, 100);
storage.extend_ttl(&COUNTER, 100, 100);
count
}
}
Expand Down
4 changes: 2 additions & 2 deletions test-cases/set-contract-storage/set-contract-storage-3/remediated-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
soroban-sdk = { version = "20.0.0-rc2" }
soroban-sdk = { version = "=20.0.0" }

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
4 changes: 2 additions & 2 deletions test-cases/set-contract-storage/set-contract-storage-3/remediated-example/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ impl SetContractStorage {
let mut count: u32 = storage.get(&COUNTER).unwrap_or(0);
count += 1;
storage.set(&COUNTER, &count);
storage.bump(&COUNTER, 100, 100);
storage.extend_ttl(&COUNTER, 100, 100);
count
}
}
Expand All @@ -33,7 +33,7 @@ mod tests {
let contract_id = env.register_contract(None, SetContractStorage);
let client = SetContractStorageClient::new(&env, &contract_id);
env.mock_all_auths();
let user = <Address as testutils::Address>::random(&env);
let user = <Address as testutils::Address>::generate(&env);

// When
let first_increment = client.increment(&user);
Expand Down
6 changes: 3 additions & 3 deletions test-cases/set-contract-storage/set-contract-storage-3/vulnerable-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[package]
name = "set-contract-storage-vulnerable-1"
name = "set-contract-storage-vulnerable-3"
version = "0.1.0"
edition = "2021"

[lib]
crate-type = ["cdylib"]

[dependencies]
soroban-sdk = { version = "20.0.0-rc2" }
soroban-sdk = { version = "=20.0.0" }

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
2 changes: 1 addition & 1 deletion test-cases/set-contract-storage/set-contract-storage-3/vulnerable-example/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ impl SetContractStorage {
let mut count: u32 = storage.get(&COUNTER).unwrap_or(0);
count += 1;
storage.set(&COUNTER, &count);
storage.bump(&COUNTER, 100, 100);
storage.extend_ttl(&COUNTER, 100, 100);
count
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...nt-contract-wasm/unprotected-update-current-contract-wasm-1/remediated-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ crate-type = ["cdylib"]
soroban-sdk = "20.0.0-rc2"

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
2 changes: 1 addition & 1 deletion ...nt-contract-wasm/unprotected-update-current-contract-wasm-1/vulnerable-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ crate-type = ["cdylib"]
soroban-sdk = "20.0.0-rc2"

[dev_dependencies]
soroban-sdk = { version = "20.0.0-rc2", features = ["testutils"] }
soroban-sdk = { version = "=20.0.0", features = ["testutils"] }

[features]
testutils = ["soroban-sdk/testutils"]
Expand Down
Loading