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

Jump to bottom

Backfill Release into Master #82

Merged
merged 9 commits into from
Oct 12, 2023
Merged

Backfill Release into Master #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f10a12a
skip preflight
imabdulbasit Oct 11, 2023
f9c3060
Merge pull request #77 from holaplex/abdul/skip-preflight
imabdulbasit Oct 11, 2023
3a07347
increase retries to 25
imabdulbasit Oct 11, 2023
bdc357f
Merge pull request #78 from holaplex/abdul/25-retries
imabdulbasit Oct 11, 2023
aa9bde9
Increase db connection timeout
imabdulbasit Oct 11, 2023
d614db8
Merge pull request #79 from holaplex/abdul/increase-connection-timeout
kespinola Oct 11, 2023
b3e87bf
set max delay to 1s
imabdulbasit Oct 11, 2023
eb1e99e
Merge pull request #80 from holaplex/abdul/1s-delay
imabdulbasit Oct 11, 2023
8ab9627
Merge branch 'main' into release
kespinola Oct 12, 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
7 changes: 5 additions & 2 deletions consumer/src/solana.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@
&ExponentialBuilder::default()
.with_jitter()
.with_min_delay(Duration::from_millis(30))
.with_max_times(15),
.with_max_delay(Duration::from_secs(1))
.with_max_times(25),
)
.notify(|err: &ClientError, dur: Duration| {
error!("retrying error {:?} in {:?}", err, dur);
Expand Down Expand Up @@ -273,7 +274,9 @@
message,
};

let signature = with_retry!(self.rpc().send_transaction(&transaction))
let signature = with_retry!(self.rpc().send_transaction_with_config(&transaction, RpcSendTransactionConfig {

Check failure on line 277 in consumer/src/solana.rs

View workflow job for this annotation

GitHub Actions / clippy/check/doc 

cannot find struct, variant or union type `RpcSendTransactionConfig` in this scope

Check failure on line 277 in consumer/src/solana.rs

View workflow job for this annotation

GitHub Actions / Cargo Test 

cannot find struct, variant or union type `RpcSendTransactionConfig` in this scope

Check failure on line 277 in consumer/src/solana.rs

View workflow job for this annotation

GitHub Actions / clippy/check/doc 

cannot find struct, variant or union type `RpcSendTransactionConfig` in this scope

Check failure on line 277 in consumer/src/solana.rs

View workflow job for this annotation

GitHub Actions / Cargo Test 

cannot find struct, variant or union type `RpcSendTransactionConfig` in this scope
skip_preflight: true, ..Default::default()
}))
.when(|e| {
!matches!(e.kind, ClientErrorKind::TransactionError(_) | ClientErrorKind::SigningError(_)| ClientErrorKind::RpcError(RpcError::RpcResponseError {
data: solana_client::rpc_request::RpcResponseErrorData::SendTransactionPreflightFailure(_),
Expand Down Expand Up @@ -393,7 +396,7 @@
true,
None,
None,
Some(mpl_token_metadata::state::CollectionDetails::V1 { size: 0 }),

Check warning on line 399 in consumer/src/solana.rs

View workflow job for this annotation

GitHub Actions / Cargo Test 

use of deprecated variant `mpl_token_metadata::state::CollectionDetails::V1`: The collection size tracking feature is deprecated and will soon be removed.

Check warning on line 399 in consumer/src/solana.rs

View workflow job for this annotation

GitHub Actions / Cargo Test 

use of deprecated variant `mpl_token_metadata::state::CollectionDetails::V1`: The collection size tracking feature is deprecated and will soon be removed.
);
let create_master_edition_ins = mpl_token_metadata::instruction::create_master_edition_v3(
mpl_token_metadata::ID,
Expand Down
4 changes: 2 additions & 2 deletions core/src/db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ pub struct DbArgs {
pub max_connections: u32,
#[arg(long, env, default_value_t = 60)]
pub connection_timeout: u64,
#[arg(long, env, default_value_t = 10)]
#[arg(long, env, default_value_t = 60)]
pub acquire_timeout: u64,
#[arg(long, env, default_value_t = 10)]
#[arg(long, env, default_value_t = 20)]
pub idle_timeout: u64,
#[arg(long, env)]
pub database_url: String,
Expand Down
Loading