From 3d6e7b929099f7de9ebd353db95e07e70e72e37f Mon Sep 17 00:00:00 2001 From: segfaultdoctor Date: Tue, 25 Oct 2022 01:26:26 -0400 Subject: [PATCH 1/2] add accountsdb conn submod (#170) --- .gitignore | 2 +- .gitmodules | 3 +++ dev/Dockerfile | 5 ++++- scripts/increment-cargo-version.sh | 1 + solana-accountsdb-connector | 1 + 5 files changed, 10 insertions(+), 2 deletions(-) create mode 160000 solana-accountsdb-connector diff --git a/.gitignore b/.gitignore index 9b0e4c9c7e..92281a9a08 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ /solana-release.tar.bz2 /solana-metrics/ /solana-metrics.tar.bz2 -/target/ +**/target/ /test-ledger/ **/*.rs.bk diff --git a/.gitmodules b/.gitmodules index 5ee418f4a8..aa71e4734a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "jito-protos/protos"] path = jito-protos/protos url = org-87542516@github.com:jito-labs/mev-protos-priv.git +[submodule "solana-accountsdb-connector"] + path = solana-accountsdb-connector + url = org-87542516@github.com:jito-labs/solana-accountsdb-connector.git diff --git a/dev/Dockerfile b/dev/Dockerfile index ffb6a85f0f..0f3c3e38f8 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -38,4 +38,7 @@ ENV CI_COMMIT=$ci_commit RUN --mount=type=cache,mode=0777,target=/solana/target \ --mount=type=cache,mode=0777,target=/usr/local/cargo/registry \ --mount=type=cache,mode=0777,target=/usr/local/cargo/git \ - cargo build --release && cp target/release/solana* ./docker-output + cargo build --release && cp target/release/solana* ./docker-output && \ + cargo build --release --manifest-path solana-accountsdb-connector/Cargo.toml && \ + cp solana-accountsdb-connector/target/release/libsolana* ./docker-output + diff --git a/scripts/increment-cargo-version.sh b/scripts/increment-cargo-version.sh index 27c7165422..ce2fcc86ad 100755 --- a/scripts/increment-cargo-version.sh +++ b/scripts/increment-cargo-version.sh @@ -27,6 +27,7 @@ ignores=( node_modules jito-programs anchor + solana-accountsdb-connector ) not_paths=() diff --git a/solana-accountsdb-connector b/solana-accountsdb-connector new file mode 160000 index 0000000000..f824355c32 --- /dev/null +++ b/solana-accountsdb-connector @@ -0,0 +1 @@ +Subproject commit f824355c3212e610ee06b82c7c7c442e1eb978f1 From 5121ace6bac53209d05437fe702c5ebfa574de1c Mon Sep 17 00:00:00 2001 From: segfaultdoctor Date: Tue, 25 Oct 2022 13:48:16 -0400 Subject: [PATCH 2/2] bump submod --- solana-accountsdb-connector | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solana-accountsdb-connector b/solana-accountsdb-connector index f824355c32..45cab4114e 160000 --- a/solana-accountsdb-connector +++ b/solana-accountsdb-connector @@ -1 +1 @@ -Subproject commit f824355c3212e610ee06b82c7c7c442e1eb978f1 +Subproject commit 45cab4114e32ba408a7b9ad1174fcfa20a3e9748