Conversation
…and accesslayerorg#795 Two PRs (protocol-fee-holder-cap-lockup-ttl and fix/issues-758-757-756-755) branched from the same base and added items at positions 41-43 in ContractError, plus different DataKey variants, storage helpers, contract methods, and event types. When merged into main, the implementation code was silently dropped while the test files survived, causing compilation failures. Restored: - DataKey variants: RoyaltyConfig, CurveExponent, AuctionConfig, StakeUnlockLedger, TotalStaked, StakingRewardsPool, HolderCapBps, LastBuyTimestamp, ProtocolFeeBps, LockupDurationSecs - ContractError variants: BatchSizeExceeded, RoyaltyExceedsLimit, InvalidExponent, MaxHoldingExceeded, LockupPeriodActive, InvalidHolderCap - Contract methods: batch_buy, set_royalty, get_royalty_config, migrate_curve, get_curve_exponent, refresh_ttl - Event types: FeeCollectedEvent, LockupBlockedEvent - Storage helpers: holder_cap_bps, last_buy_timestamp - AuctionConfig struct - cargo fmt applied to all affected files
|
Hey @Adejumo-2! 👋 It looks like this PR isn't linked to any issue. If this PR is for one of the issues assigned to you as part of a Wave, please link it to ensure your contribution is tracked properly. You can do this by adding a keyword to the PR description (e.g.,
|
Add back BatchSizeExceeded, RoyaltyExceedsLimit, InvalidExponent, MaxHoldingExceeded, LockupPeriodActive, InvalidHolderCap to ContractError. Keep matching FeatureError variants for the new entrypoints (batch_buy, set_royalty, migrate_curve). Run cargo fmt on all files.
ContractError is capped at 50 variants by the Soroban XDR spec (SCSpecUDTErrorEnumV0.cases<50>). Moved 7 new error variants to FeatureError and mapped existing contract methods to use closest ContractError equivalents: - GlobalTradingHalted -> ProtocolPaused - MaxHoldingExceeded -> SupplyCapExceeded - LockupPeriodActive -> SellUnderflow - InvalidHolderCap -> InvalidFeeConfig - BatchSizeExceeded -> SupplyCapExceeded - RoyaltyExceedsLimit -> ProtocolFeeExceedsCap - InvalidExponent -> InvalidFeeConfig Updated all test assertions to match. Cargo fmt applied.
Soroban XDR limits both #[contracterror] and #[contracttype] enums to 50 cases. DataKey had 56 variants (46 original + 10 added). Replaced 7 per-creator/per-holder variants with a single CreatorFeatureData(u8, Address, Address) compound key using feature-type bytes to distinguish storage slots. Contract code unchanged - only storage helpers updated. Result: ContractError=50, DataKey=50, FeatureError=18. All under limit.
Soroban #[contracttype] doesn't support u8 fields. Changed CreatorFeatureData to use u32 for the feature type discriminator. Also removed unused Self:: references outside impl blocks.
- Renamed TimelockChangeType variants to remove shared 'Update' prefix (Soroban contracttype rejects enums where all variants share a prefix) - Replaced checked_sub().unwrap_or(0) with saturating_sub() to satisfy clippy's manual_saturating_arithmetic lint
- Removed refresh_ttl method (was from lost PR, caused ConversionError type mismatch in auto-generated Soroban client) - Removed corresponding ttl_refresh.rs test file - Added missing closing brace for impl CreatorKeysContract block
- Extract buy_key_impl from buy_key_with_referrer to avoid double require_auth when batch_buy calls buy_key in a loop - Set curve_slope=100 in test_new_features setup so circuit breaker and referral tests have non-trivial price deltas - Fix whitelist test expectations: unregistered callers hit NotRegistered before Unauthorized - Run cargo fmt 🤖 Generated with Codebuff Co-Authored-By: Codebuff <noreply@codebuff.com>
When pre_price * threshold / 100 truncates to zero (e.g. price=1, threshold=30%), the check price_change >= 0 always passes even if the price did not change. Guard with max_change > 0. 🤖 Generated with Codebuff Co-Authored-By: Codebuff <noreply@codebuff.com>
The whole-vector topics comparison was broken (Vec<Val> == Val mismatch). Switch to checking individual topic elements like the working activated event test in the same file. 🤖 Generated with Codebuff Co-Authored-By: Codebuff <noreply@codebuff.com>
🤖 Generated with Codebuff Co-Authored-By: Codebuff <noreply@codebuff.com>
Member
❌ CI Failed —
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Two PRs (protocol-fee-holder-cap-lockup-ttl and fix/issues-758-757-756-755) branched from the same base and added items at positions 41-43 in ContractError, plus different DataKey variants, storage helpers, contract methods, and event types. When merged into main, the implementation code was silently dropped while the test files survived, causing compilation failures.
Restored: