Skip to content

Seg/update submods (#187) #189

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

Merged
segfaultdoc merged 6 commits into from
Nov 18, 2022
Merged

Seg/update submods (#187) #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f2f92ac
Seg/update submods (#187)
segfaultdoc Nov 3, 2022
2075a29
fix tests (#190)
segfaultdoc Nov 10, 2022
46031e4
rm geyser submod (#192)
segfaultdoc Nov 11, 2022
058072b
rm dangling geyser references
segfaultdoc Nov 14, 2022
98e3fc1
fix syntax err
segfaultdoc Nov 16, 2022
d5cec5c
use deterministic req ids in batch calls
segfaultdoc Nov 18, 2022
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: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,3 @@
[submodule "jito-protos/protos"]
path = jito-protos/protos
url = https://github.com/jito-labs/mev-protos.git
[submodule "solana-accountsdb-connector"]
path = solana-accountsdb-connector
url = https://github.com/jito-foundation/solana-accountsdb-connector.git
5 changes: 2 additions & 3 deletions client/src/http_sender.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,8 @@ impl RpcSender for HttpSender {
requests_and_params: Vec<(RpcRequest, serde_json::Value)>,
) -> Result<serde_json::Value> {
let mut batch_request = vec![];
for (rpc_req, params) in requests_and_params {
let request_id = self.request_id.fetch_add(1, Ordering::Relaxed);
batch_request.push(rpc_req.build_request_json(request_id, params));
for (request_id, req) in requests_and_params.into_iter().enumerate() {
batch_request.push(req.0.build_request_json(request_id as u64, req.1));
}

let resp = self
Expand Down
5 changes: 1 addition & 4 deletions dev/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,4 @@ 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 --manifest-path solana-accountsdb-connector/Cargo.toml && \
cp solana-accountsdb-connector/target/release/libsolana* ./docker-output

cargo build --release && cp target/release/solana* ./docker-output
2 changes: 1 addition & 1 deletion jito-programs
Open in desktop
Submodule jito-programs updated 8 files
+1 −13 README.md
+1 −1 tip-payment/Anchor.toml
+18 −32 tip-payment/Cargo.lock
+96 −29 tip-payment/programs/tip-distribution/src/lib.rs
+16 −15 tip-payment/programs/tip-distribution/src/state.rs
+103 −0 tip-payment/tests/merkle-tree.ts
+0 −473 tip-payment/tests/tip-distribution.js
+1,092 −0 tip-payment/tests/tip-distribution.ts
1 change: 0 additions & 1 deletion scripts/increment-cargo-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ ignores=(
node_modules
jito-programs
anchor
solana-accountsdb-connector
)

not_paths=()
Expand Down
1 change: 0 additions & 1 deletion solana-accountsdb-connector
Open in desktop
Submodule solana-accountsdb-connector deleted from f82435
5 changes: 5 additions & 0 deletions tip-distributor/src/stake_meta_generator_workflow.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,12 +573,15 @@ mod tests {
bank.epoch(),
);

let expires_at = bank.epoch() + 3;

let tda_0 = TipDistributionAccount {
validator_vote_account: validator_keypairs_0.vote_keypair.pubkey(),
merkle_root_upload_authority,
merkle_root: None,
epoch_created_at: bank.epoch(),
validator_commission_bps: 50,
expires_at,
bump: tip_distribution_account_0.1,
};
let tda_1 = TipDistributionAccount {
Expand All @@ -587,6 +590,7 @@ mod tests {
merkle_root: None,
epoch_created_at: bank.epoch(),
validator_commission_bps: 500,
expires_at: 0,
bump: tip_distribution_account_1.1,
};
let tda_2 = TipDistributionAccount {
Expand All @@ -595,6 +599,7 @@ mod tests {
merkle_root: None,
epoch_created_at: bank.epoch(),
validator_commission_bps: 75,
expires_at: 0,
bump: tip_distribution_account_2.1,
};

Expand Down