Upstream Updates - #4
Merged
Merged
Conversation
* docs: update PR template and remove PR Check workflow * docs: add hidden agent issue and PR templates
* fix(web): align admin binding types Refs #6985 * test(web): restore animation mock
Co-authored-by: seefs001 <i@seefs.me>
* fix(relay): return 400 for invalid request parameters
mrdjango
added a commit
that referenced
this pull request
Aug 29, 2026
Brings in 9 upstream commits, notably QuantumNous#7076 (sandboxed JS task plugin system), which rewrites the task submit/billing pipeline that the TensorGrid billing patches sit on. Conflicts resolved in 2 files: controller/relay.go Took upstream's executeTaskSubmission wholesale. Its reserve -> insert -> settle barrier supersedes our inline "settle then insert" block, and it already carries every field our fork added (BillingSource, SubscriptionId, TokenId, NodeName, BillingContext). Dropped our redundant `relayInfo.PriceData.Quota = result.Quota` — upstream sets it in relay/relay_task.go. service/task_billing.go Kept upstream's 3-arg log-only LogTaskConsumption (task param carries the tiered-snapshot fields) and moved settlement to the caller, per upstream's design. To preserve eaf0871, the structured consume params must still reach the TensorGrid wallet so its credit event is complete at commit time, so params building is split into BuildTaskConsumeLogParams and passed to SettleBilling's variadic consumeParams. relay.go builds them once and shares them with settle and log, which also avoids emitting the quota-saturation warning twice. Verified: go build, go vet, go test ./... (39 pkgs), web typecheck, and web vitest (397 tests) all pass. Upstream's TestLogTaskConsumption* and our TensorGrid refund/settle tests pass together. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
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
7 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.
English template:
.github/PULL_REQUEST_TEMPLATE/en.mdImportant
🔗 关联任务 / Related Issue
新功能请填写下方 Issue 编号；若还没有对应 Issue，请先自行创建。功能讨论请放在 Issue 中进行。
改动较大或方向性变更，请先在关联 Issue 中与维护者达成一致，再提交 PR。
Bug 修复请关联对应 Issue。设计取舍、理解偏差或预期不一致，更适合作为讨论或功能请求。
Closes #
🚀 变更类型 / Type of change
📝 变更描述 / Description
(简述做了什么、为什么生效。如果难以简述，建议先拆分范围，或在 Issue 中与维护者对齐。)
📸 运行证明 / Proof of Work
(请写明如何验证：实际步骤与观察结果。UI 变更请附截图或录屏；Bug 修复请说明复现过程与修复后结果。)
✅ 提交前检查项 / Checklist
New feature，我已关联对应 Issue；若尚无 Issue，我已先自行创建。