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

hot fix v20.0.2, increased preflight instruction fee padding to 3 million #1127

Merged
merged 4 commits into from
Dec 12, 2023
Merged

hot fix v20.0.2, increased preflight instruction fee padding to 3 million #1127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d46c0ac
increased preflight instruction fee padding to 3 million
sreuland Dec 11, 2023
8c70a13
updated test threshold interval for larger inst padding on fees
sreuland Dec 12, 2023
df4d88c
fixed simulation fee test threshold assert to be minimally determinis…
sreuland Dec 12, 2023
a27cf11
adjusted the resulting fee assertion with latest preflight results
sreuland Dec 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
14 changes: 11 additions & 3 deletions cmd/soroban-rpc/internal/test/simulate_transaction_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,15 +236,19 @@ func TestSimulateTransactionSucceeds(t *testing.T) {
ReadBytes: 0,
WriteBytes: 7048,
},
ResourceFee: 113910,
// the resulting fee is derived from the compute factors and a default padding is applied to instructions by preflight
// for test purposes, the most deterministic way to assert the resulting fee is expected value in test scope, is to capture
// the resulting fee from current preflight output and re-plug it in here, rather than try to re-implement the cost-model algo
// in the test.
ResourceFee: 135910,
}

// First, decode and compare the transaction data so we get a decent diff if it fails.
var transactionData xdr.SorobanTransactionData
err := xdr.SafeUnmarshalBase64(result.TransactionData, &transactionData)
assert.NoError(t, err)
assert.Equal(t, expectedTransactionData.Resources.Footprint, transactionData.Resources.Footprint)
assert.InDelta(t, uint32(expectedTransactionData.Resources.Instructions), uint32(transactionData.Resources.Instructions), 200000)
assert.InDelta(t, uint32(expectedTransactionData.Resources.Instructions), uint32(transactionData.Resources.Instructions), 3200000)
assert.InDelta(t, uint32(expectedTransactionData.Resources.ReadBytes), uint32(transactionData.Resources.ReadBytes), 10)
assert.InDelta(t, uint32(expectedTransactionData.Resources.WriteBytes), uint32(transactionData.Resources.WriteBytes), 300)
assert.InDelta(t, int64(expectedTransactionData.ResourceFee), int64(transactionData.ResourceFee), 3000)
Expand Down Expand Up @@ -1122,7 +1126,11 @@ func TestSimulateSystemEvent(t *testing.T) {
require.NoError(t, err)

assert.InDelta(t, 7464, uint32(transactionData.Resources.ReadBytes), 200)
assert.InDelta(t, 80980, int64(transactionData.ResourceFee), 5000)
// the resulting fee is derived from compute factors and a default padding is applied to instructions by preflight
// for test purposes, the most deterministic way to assert the resulting fee is expected value in test scope, is to capture
// the resulting fee from current preflight output and re-plug it in here, rather than try to re-implement the cost-model algo
// in the test.
assert.InDelta(t, 100980, int64(transactionData.ResourceFee), 5000)
assert.InDelta(t, 104, uint32(transactionData.Resources.WriteBytes), 15)
require.GreaterOrEqual(t, len(response.Events), 3)
}
4 changes: 2 additions & 2 deletions cmd/soroban-rpc/lib/preflight/src/fees.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,12 @@ fn calculate_host_function_soroban_resources(
.map(|c| c.encoded_new_value.as_ref().map_or(0, Vec::len) as u32)
.sum();

// Add a 20% leeway with a minimum of 1 million instructions
// Add a 20% leeway with a minimum of 3 million instructions
let budget_instructions = budget
.get_cpu_insns_consumed()
.context("cannot get instructions consumed")?;
let instructions = max(
budget_instructions + 1000000,
budget_instructions + 3000000,
budget_instructions * 120 / 100,
);
Ok(SorobanResources {
Expand Down
Loading