fix(primary-names): add patch for adding demand factor data to primar… #408
+316
−1
Conversation
This file contains 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
added 2 commits
March 10, 2025 08:48
…nction and update the handler
dtfiedler
commented
Mar 10, 2025
| baseNameOwner = record.processId, | ||
| fundingPlan = fundingPlan, | ||
| fundingResult = fundingResult, | ||
| df = demand.getDemandFactorInfo(), |
There was a problem hiding this comment.
includes the df data
dtfiedler
commented
Mar 10, 2025
Comment on lines
+98
to
+182
|
|
||
| local function Send(msg, response) | ||
| if msg.reply then | ||
| --- Reference: https://github.com/permaweb/aos/blob/main/blueprints/patch-legacy-reply.lua | ||
| msg.reply(response) | ||
| else | ||
| ao.send(response) | ||
| end | ||
| end | ||
|
|
||
| local function assertValidFundFrom(fundFrom) | ||
| if fundFrom == nil then | ||
| return | ||
| end | ||
| local validFundFrom = utils.createLookupTable({ "any", "balance", "stakes" }) | ||
| assert(validFundFrom[fundFrom], "Invalid fund from type. Must be one of: any, balance, stakes") | ||
| end | ||
|
|
||
| local function addPrimaryNameCounts(ioEvent) | ||
| ioEvent:addField("Total-Primary-Names", utils.lengthOfTable(primaryNames.getUnsafePrimaryNames())) | ||
| ioEvent:addField("Total-Primary-Name-Requests", utils.lengthOfTable(primaryNames.getUnsafePrimaryNameRequests())) | ||
| end | ||
|
|
||
| local function adjustSuppliesForFundingPlan(fundingPlan, rewardForInitiator) | ||
| if not fundingPlan then | ||
| return | ||
| end | ||
| rewardForInitiator = rewardForInitiator or 0 | ||
| local totalActiveStakesUsed = utils.reduce(fundingPlan.stakes, function(acc, _, stakeSpendingPlan) | ||
| return acc + stakeSpendingPlan.delegatedStake | ||
| end, 0) | ||
| local totalWithdrawStakesUsed = utils.reduce(fundingPlan.stakes, function(acc, _, stakeSpendingPlan) | ||
| return acc | ||
| + utils.reduce(stakeSpendingPlan.vaults, function(acc2, _, vaultBalance) | ||
| return acc2 + vaultBalance | ||
| end, 0) | ||
| end, 0) | ||
| LastKnownStakedSupply = LastKnownStakedSupply - totalActiveStakesUsed | ||
| LastKnownWithdrawSupply = LastKnownWithdrawSupply - totalWithdrawStakesUsed | ||
| LastKnownCirculatingSupply = LastKnownCirculatingSupply - fundingPlan.balance + rewardForInitiator | ||
| end | ||
|
|
||
| local function addResultFundingPlanFields(ioEvent, result) | ||
| ioEvent:addFieldsWithPrefixIfExist(result.fundingPlan, "FP-", { "balance" }) | ||
| local fundingPlanVaultsCount = 0 | ||
| local fundingPlanStakesAmount = utils.reduce( | ||
| result.fundingPlan and result.fundingPlan.stakes or {}, | ||
| function(acc, _, delegation) | ||
| return acc | ||
| + delegation.delegatedStake | ||
| + utils.reduce(delegation.vaults, function(acc2, _, vaultAmount) | ||
| fundingPlanVaultsCount = fundingPlanVaultsCount + 1 | ||
| return acc2 + vaultAmount | ||
| end, 0) | ||
| end, | ||
| 0 | ||
| ) | ||
| if fundingPlanStakesAmount > 0 then | ||
| ioEvent:addField("FP-Stakes-Amount", fundingPlanStakesAmount) | ||
| end | ||
| if fundingPlanVaultsCount > 0 then | ||
| ioEvent:addField("FP-Vaults-Count", fundingPlanVaultsCount) | ||
| end | ||
| local newWithdrawVaultsTallies = utils.reduce( | ||
| result.fundingResult and result.fundingResult.newWithdrawVaults or {}, | ||
| function(acc, _, newWithdrawVault) | ||
| acc.totalBalance = acc.totalBalance | ||
| + utils.reduce(newWithdrawVault, function(acc2, _, vault) | ||
| acc.count = acc.count + 1 | ||
| return acc2 + vault.balance | ||
| end, 0) | ||
| return acc | ||
| end, | ||
| { count = 0, totalBalance = 0 } | ||
| ) | ||
| if newWithdrawVaultsTallies.count > 0 then | ||
| ioEvent:addField("New-Withdraw-Vaults-Count", newWithdrawVaultsTallies.count) | ||
| ioEvent:addField("New-Withdraw-Vaults-Total-Balance", newWithdrawVaultsTallies.totalBalance) | ||
| end | ||
| adjustSuppliesForFundingPlan(result.fundingPlan, result.returnedName and result.returnedName.rewardForInitiator) | ||
| end | ||
|
|
||
| --- @param ioEvent ARIOEvent | ||
| --- @param primaryNameResult CreatePrimaryNameResult|PrimaryNameRequestApproval | ||
| local function addPrimaryNameRequestData(ioEvent, primaryNameResult) |
There was a problem hiding this comment.
unfortunately, these all need to be added as they are not available in the global scope
dtfiedler
commented
Mar 10, 2025
Comment on lines
189
to
200
| -- add the demand factor data to the ioEvent | ||
| if primaryNameResult.df and type(primaryNameResult.df) == "table" then | ||
| ioEvent:addField("DF-Trailing-Period-Purchases", (primaryNameResult.df.trailingPeriodPurchases or {})) | ||
| ioEvent:addField("DF-Trailing-Period-Revenues", (primaryNameResult.df.trailingPeriodRevenues or {})) | ||
| ioEvent:addFieldsWithPrefixIfExist(primaryNameResult.df, "DF-", { | ||
| "currentPeriod", | ||
| "currentDemandFactor", | ||
| "consecutivePeriodsWithMinDemandFactor", | ||
| "revenueThisPeriod", | ||
| "purchasesThisPeriod", | ||
| }) | ||
| end |
There was a problem hiding this comment.
the DF data is now included in the event
fedellen
previously approved these changes
Mar 10, 2025
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #408 +/- ##
========================================
Coverage 91.35% 91.35%
========================================
Files 10 10
Lines 3181 3182 +1
========================================
+ Hits 2906 2907 +1
Misses 275 275 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
arielmelendez
approved these changes
Mar 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
…y name requests
Steps to test:
❯ aos df-data-event-patch-2 --module=CWxzoe4IoNpFHiykadZWphZtLWybDF8ocNi7gmK6zCg --cu-url https://localhost:6363 _____ _______ _____ /\ \ /::\ \ /\ \ /::\ \ /::::\ \ /::\ \ /::::\ \ /::::::\ \ /::::\ \ /::::::\ \ /::::::::\ \ /::::::\ \ /:::/\:::\ \ /:::/~~\:::\ \ /:::/\:::\ \ /:::/__\:::\ \ /:::/ \:::\ \ /:::/__\:::\ \ /::::\ \:::\ \ /:::/ / \:::\ \ \:::\ \:::\ \ /::::::\ \:::\ \ /:::/____/ \:::\____\ ___\:::\ \:::\ \ /:::/\:::\ \:::\ \ |:::| | |:::| | /\ \:::\ \:::\ \ /:::/ \:::\ \:::\____\|:::|____| |:::| |/::\ \:::\ \:::\____\ \::/ \:::\ /:::/ / \:::\ \ /:::/ / \:::\ \:::\ \::/ / \/____/ \:::\/:::/ / \:::\ \ /:::/ / \:::\ \:::\ \/____/ \::::::/ / \:::\ /:::/ / \:::\ \:::\ \ \::::/ / \:::\__/:::/ / \:::\ \:::\____\ /:::/ / \::::::::/ / \:::\ /:::/ / /:::/ / \::::::/ / \:::\/:::/ / /:::/ / \::::/ / \::::::/ / /:::/ / \::/____/ \::::/ / \::/ / ~~ \::/ / \/____/ \/____/ Welcome to AOS: Your operating system for AO, the decentralized open access supercomputer. Type ".load-blueprint chat" to join the community chat and ask questions! Using CU: https://localhost:6363 AOS Client Version: 2.0.4. 2024 Type "Ctrl-C" twice to exit Your AOS process: 4_zQY9ZhaiiODch4r1YCUKQWq6-CQcs1TdJc3AQHzQY