Skip to content

Commit

Permalink
Merge branch 'main' into ewoolsey/transaction
Browse files Browse the repository at this point in the history
  • Loading branch information
0xForerunner committed Feb 13, 2024
2 parents f7e67d9 + b72c229 commit f8f6f51
Show file tree
Hide file tree
Showing 4 changed files with 203 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
name: Vet Dependencies
runs-on: ubuntu-latest
env:
CARGO_VET_VERSION: 0.8.0
CARGO_VET_VERSION: 0.9.0
steps:
- uses: actions/checkout@master
- name: Install Rust
Expand Down
2 changes: 2 additions & 0 deletions src/database/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,8 @@ impl Database {
let mined_status = ProcessedStatus::Mined;

let mut tx = self.pool.begin().await?;
tx.execute("SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;")
.await?;

let root_id = tx.get_id_by_root(root).await?;

Expand Down
126 changes: 103 additions & 23 deletions supply-chain/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# cargo-vet config file

[cargo-vet]
version = "0.8"
version = "0.9"

[imports.bytecodealliance]
url = "https://raw.githubusercontent.com/bytecodealliance/wasmtime/main/supply-chain/audits.toml"
Expand All @@ -11,7 +11,7 @@ url = "https://raw.githubusercontent.com/bytecodealliance/wasmtime/main/supply-c
url = "https://raw.githubusercontent.com/EmbarkStudios/rust-ecosystem/main/audits.toml"

[imports.google]
url = "https://raw.githubusercontent.com/google/supply-chain/main/audits.toml"
url = "https://raw.githubusercontent.com/google/rust-crate-audits/main/audits.toml"

[imports.isrg]
url = "https://raw.githubusercontent.com/divviup/libprio-rs/main/supply-chain/audits.toml"
Expand Down Expand Up @@ -51,6 +51,10 @@ criteria = "safe-to-deploy"
version = "1.0.2"
criteria = "safe-to-deploy"

[[exemptions.alloy-rlp]]
version = "0.3.4"
criteria = "safe-to-deploy"

[[exemptions.android-tzdata]]
version = "0.1.1"
criteria = "safe-to-deploy"
Expand All @@ -75,14 +79,26 @@ criteria = "safe-to-deploy"
version = "0.3.0"
criteria = "safe-to-deploy"

[[exemptions.ark-ff]]
version = "0.4.2"
criteria = "safe-to-deploy"

[[exemptions.ark-ff-asm]]
version = "0.3.0"
criteria = "safe-to-deploy"

[[exemptions.ark-ff-asm]]
version = "0.4.2"
criteria = "safe-to-deploy"

[[exemptions.ark-ff-macros]]
version = "0.3.0"
criteria = "safe-to-deploy"

[[exemptions.ark-ff-macros]]
version = "0.4.2"
criteria = "safe-to-deploy"

[[exemptions.ark-groth16]]
version = "0.3.0@git:765817f77a6e14964c6f264d565b18676b11bd59"
criteria = "safe-to-deploy"
Expand All @@ -99,6 +115,10 @@ criteria = "safe-to-deploy"
version = "0.3.0"
criteria = "safe-to-deploy"

[[exemptions.ark-serialize]]
version = "0.4.2"
criteria = "safe-to-deploy"

[[exemptions.ark-serialize-derive]]
version = "0.3.0"
criteria = "safe-to-deploy"
Expand All @@ -111,6 +131,10 @@ criteria = "safe-to-deploy"
version = "0.3.0"
criteria = "safe-to-deploy"

[[exemptions.ark-std]]
version = "0.4.0"
criteria = "safe-to-deploy"

[[exemptions.ascii-canvas]]
version = "3.0.0"
criteria = "safe-to-deploy"
Expand All @@ -128,7 +152,7 @@ version = "0.3.3"
criteria = "safe-to-deploy"

[[exemptions.atoi]]
version = "1.0.0"
version = "2.0.0"
criteria = "safe-to-deploy"

[[exemptions.auto_impl]]
Expand Down Expand Up @@ -475,10 +499,6 @@ criteria = "safe-to-deploy"
version = "0.9.0"
criteria = "safe-to-deploy"

[[exemptions.dirs]]
version = "4.0.0"
criteria = "safe-to-deploy"

[[exemptions.dirs]]
version = "5.0.1"
criteria = "safe-to-deploy"
Expand All @@ -487,10 +507,6 @@ criteria = "safe-to-deploy"
version = "2.0.0"
criteria = "safe-to-deploy"

[[exemptions.dirs-sys]]
version = "0.3.7"
criteria = "safe-to-deploy"

[[exemptions.dirs-sys]]
version = "0.4.1"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -555,6 +571,10 @@ criteria = "safe-to-deploy"
version = "0.2.8"
criteria = "safe-to-deploy"

[[exemptions.etcetera]]
version = "0.8.0"
criteria = "safe-to-deploy"

[[exemptions.eth-keystore]]
version = "0.5.0"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -631,6 +651,10 @@ criteria = "safe-to-deploy"
version = "0.2.0"
criteria = "safe-to-deploy"

[[exemptions.fastrlp]]
version = "0.3.1"
criteria = "safe-to-deploy"

[[exemptions.ff]]
version = "0.12.1"
criteria = "safe-to-deploy"
Expand All @@ -647,6 +671,10 @@ criteria = "safe-to-deploy"
version = "1.0.25"
criteria = "safe-to-deploy"

[[exemptions.flume]]
version = "0.11.0"
criteria = "safe-to-deploy"

[[exemptions.fs2]]
version = "0.4.3"
criteria = "safe-to-deploy"
Expand All @@ -660,7 +688,7 @@ version = "0.3.26"
criteria = "safe-to-deploy"

[[exemptions.futures-intrusive]]
version = "0.4.2"
version = "0.5.0"
criteria = "safe-to-deploy"

[[exemptions.futures-locks]]
Expand Down Expand Up @@ -835,10 +863,18 @@ criteria = "safe-to-deploy"
version = "0.7.4"
criteria = "safe-to-deploy"

[[exemptions.libm]]
version = "0.2.2"
criteria = "safe-to-deploy"

[[exemptions.libmimalloc-sys]]
version = "0.1.28"
criteria = "safe-to-deploy"

[[exemptions.libsqlite3-sys]]
version = "0.25.2"
criteria = "safe-to-deploy"

[[exemptions.linked-hash-map]]
version = "0.5.6"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -931,6 +967,10 @@ criteria = "safe-to-deploy"
version = "7.1.1"
criteria = "safe-to-deploy"

[[exemptions.num-bigint-dig]]
version = "0.8.4"
criteria = "safe-to-deploy"

[[exemptions.object]]
version = "0.28.4"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -1027,10 +1067,6 @@ criteria = "safe-to-deploy"
version = "0.11.2"
criteria = "safe-to-deploy"

[[exemptions.parking_lot_core]]
version = "0.8.5"
criteria = "safe-to-deploy"

[[exemptions.parking_lot_core]]
version = "0.9.4"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -1059,6 +1095,10 @@ criteria = "safe-to-deploy"
version = "1.1.1"
criteria = "safe-to-deploy"

[[exemptions.pem-rfc7468]]
version = "0.7.0"
criteria = "safe-to-deploy"

[[exemptions.pest]]
version = "2.7.6"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -1107,6 +1147,10 @@ criteria = "safe-to-deploy"
version = "1.1.2"
criteria = "safe-to-deploy"

[[exemptions.pkcs1]]
version = "0.7.5"
criteria = "safe-to-deploy"

[[exemptions.pkcs8]]
version = "0.10.2"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -1147,6 +1191,10 @@ criteria = "safe-to-deploy"
version = "0.13.3"
criteria = "safe-to-deploy"

[[exemptions.proptest]]
version = "1.2.0"
criteria = "safe-to-deploy"

[[exemptions.prost]]
version = "0.11.9"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -1203,6 +1251,10 @@ criteria = "safe-to-deploy"
version = "0.6.28"
criteria = "safe-to-deploy"

[[exemptions.regex-syntax]]
version = "0.7.2"
criteria = "safe-to-deploy"

[[exemptions.regex-syntax]]
version = "0.7.4"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -1255,12 +1307,16 @@ criteria = "safe-to-deploy"
version = "0.7.0"
criteria = "safe-to-deploy"

[[exemptions.rsa]]
version = "0.9.1"
criteria = "safe-to-deploy"

[[exemptions.ruint]]
version = "1.7.0"
version = "1.11.1"
criteria = "safe-to-deploy"

[[exemptions.ruint-macro]]
version = "1.0.2"
version = "1.1.0"
criteria = "safe-to-deploy"

[[exemptions.rust-ini]]
Expand Down Expand Up @@ -1428,19 +1484,31 @@ version = "0.2.0"
criteria = "safe-to-deploy"

[[exemptions.sqlx]]
version = "0.6.2"
version = "0.7.2"
criteria = "safe-to-deploy"

[[exemptions.sqlx-core]]
version = "0.6.2"
version = "0.7.2"
criteria = "safe-to-deploy"

[[exemptions.sqlx-macros]]
version = "0.6.2"
version = "0.7.2"
criteria = "safe-to-deploy"

[[exemptions.sqlx-rt]]
version = "0.6.2"
[[exemptions.sqlx-macros-core]]
version = "0.7.2"
criteria = "safe-to-deploy"

[[exemptions.sqlx-mysql]]
version = "0.7.2"
criteria = "safe-to-deploy"

[[exemptions.sqlx-postgres]]
version = "0.7.2"
criteria = "safe-to-deploy"

[[exemptions.sqlx-sqlite]]
version = "0.7.2"
criteria = "safe-to-deploy"

[[exemptions.stable_deref_trait]]
Expand Down Expand Up @@ -1639,6 +1707,10 @@ criteria = "safe-to-deploy"
version = "0.9.4"
criteria = "safe-to-deploy"

[[exemptions.unarray]]
version = "0.1.4"
criteria = "safe-to-deploy"

[[exemptions.unicode_categories]]
version = "0.1.1"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -1811,6 +1883,14 @@ criteria = "safe-to-deploy"
version = "0.5.1"
criteria = "safe-to-deploy"

[[exemptions.zerocopy]]
version = "0.7.31"
criteria = "safe-to-deploy"

[[exemptions.zerocopy-derive]]
version = "0.7.31"
criteria = "safe-to-deploy"

[[exemptions.zeroize]]
version = "1.6.0"
criteria = "safe-to-deploy"
Expand Down
Loading

0 comments on commit f8f6f51

Please sign in to comment.