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

Adds expiration iterator #104

Merged
merged 3 commits into from
Jun 22, 2023
Merged

Adds expiration iterator #104

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a4cfa1
Adds expiration iterator
SirTyson Jun 13, 2023
e104b2b
Add BucketList size window and remove eviction iterator
SirTyson Jun 16, 2023
f2fbdb0
Merge branch 'next' into temp-entry-expiration
SirTyson Jun 22, 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
26 changes: 16 additions & 10 deletions Stellar-contract-config-setting.x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ struct ConfigSettingContractLedgerCostV0
int64 feeReadLedgerEntry; // Fee per ledger entry read
int64 feeWriteLedgerEntry; // Fee per ledger entry write

int64 feeRead1KB; // Fee for reading 1KB
int64 feeRead1KB; // Fee for reading 1KB
int64 feeWrite1KB; // Fee for writing 1KB

// Bucket list fees grow slowly up to that size
Expand Down Expand Up @@ -158,26 +158,29 @@ enum ContractCostType {
struct ContractCostParamEntry {
// use `ext` to add more terms (e.g. higher order polynomials) in the future
ExtensionPoint ext;

int64 constTerm;
int64 linearTerm;
};

struct StateExpirationSettings {
uint32 maxEntryExpiration;
uint32 minTempEntryExpiration;
uint32 minRestorableEntryExpiration;
uint32 minPersistentEntryExpiration;
uint32 autoBumpLedgers;

// rent_fee = wfee_rate_average / rent_rate_denominator_for_type
int64 restorableRentRateDenominator;
int64 persistentRentRateDenominator;
int64 tempRentRateDenominator;

union switch (int v)
{
case 0:
void;
} ext;
// max number of entries that emit expiration meta in a single ledger
uint32 maxEntriesToExpire;
Copy link
Contributor

@jayz22 jayz22 Jun 28, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happens if number of expiring entries exceeds this? They still all expire but some of them don't emit meta?
Never mind, your PR description is pretty clear, sorry about that.


// Number of snapshots to use when calculating average BucketList size
uint32 bucketListSizeWindowSampleSize;

// Maximum number of bytes that we scan for eviction per ledger
uint64 evictionScanSize;
};

// limits the ContractCostParams size to 20kB
Expand All @@ -199,7 +202,8 @@ enum ConfigSettingID
CONFIG_SETTING_CONTRACT_DATA_KEY_SIZE_BYTES = 8,
CONFIG_SETTING_CONTRACT_DATA_ENTRY_SIZE_BYTES = 9,
CONFIG_SETTING_STATE_EXPIRATION = 10,
CONFIG_SETTING_CONTRACT_EXECUTION_LANES = 11
CONFIG_SETTING_CONTRACT_EXECUTION_LANES = 11,
CONFIG_SETTING_BUCKETLIST_SIZE_WINDOW = 12
};

union ConfigSettingEntry switch (ConfigSettingID configSettingID)
Expand Down Expand Up @@ -228,5 +232,7 @@ case CONFIG_SETTING_STATE_EXPIRATION:
StateExpirationSettings stateExpirationSettings;
case CONFIG_SETTING_CONTRACT_EXECUTION_LANES:
ConfigSettingContractExecutionLanesV0 contractExecutionLanes;
case CONFIG_SETTING_BUCKETLIST_SIZE_WINDOW:
uint64 bucketListSizeWindow<>;
};
}