Add functionality to use cycles balance instead of CMC for topups by patnorris · Pull Request #142 · onicai/PoAIW

patnorris · 2026-04-09T09:34:40Z

No description provided.

Copilot

Pull request overview

Adds a new path for handling incoming ICP for mAIner top-ups/creation that can skip CMC conversion when the protocol’s cycles balance is above a buffer, and introduces optional disbursement of ICP to a team wallet in that “no conversion” scenario.

Changes:

Add an admin-controlled DISBURSE_FUNDS_TO_TEAM flag (toggle + getter).
Add team ICP disbursement flow (disburseIncomingFundsToTeam + transferToTeam).
Update handleIncomingFunds to (a) decide conversion based on Cycles.balance() vs PROTOCOL_CYCLES_BALANCE_BUFFER, and (b) add a bonus cycles amount when no conversion is performed, plus optional ICP disbursements.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 5 comments.

File	Description
`src/GameState/src/Main.mo`	Adds team-disbursement flag + transfer logic; updates incoming-funds handling to optionally skip CMC conversion and disburse ICP to treasury/team.
`src/common/Types.mo`	Introduces `IcpTransferArgsAccount` for ledger transfers by account identifier.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-09T09:39:54Z

+        let amountForTransfer : TokenLedger.Tokens = { e8s : Nat64 = Nat64.fromNat(amountToDisburse); };
+        D.print("GameState: disburseIncomingFundsToTeam - amountForTransfer: " # debug_show(amountForTransfer)); 
+        let TEAM_WALLET_ADDRESS : Blob = "5d9bb4f164022de0933d3b45eaf33f1902e9578a2f330a1301d531c42bebf783";
+        let transferArgs : Types.IcpTransferArgsAccount = {
+            amount : TokenLedger.Tokens = amountForTransfer;
+            to = TEAM_WALLET_ADDRESS;     
+        };


TEAM_WALLET_ADDRESS is declared as a Blob but the literal provided is a hex text string; as a Motoko blob literal this becomes the ASCII bytes for those characters (length 64), not the 32-byte account identifier the ICP ledger transfer API expects. This will likely fail the transfer or send to the wrong destination. Decode the hex string into bytes (e.g., via a hex-decoder helper) and ensure the resulting blob is exactly 32 bytes.

@copilot apply changes based on this feedback
the Principal module from the Motoko base library has the functions Principal.toBlob(principal) and Principal.toLedgerAccount(principal : Principal, subAccount : ?Blob) : Blob
https://docs.internetcomputer.org/motoko/base/Principal#function-toledgeraccount

The team wallet where the ICP should be sent to has the following info:
"ICP Native": 5d9bb4f164022de0933d3b45eaf33f1902e9578a2f330a1301d531c42bebf783
"ICRC-1": k3pwi-qyaaa-aaaab-acbrq-cai-uco74ta.ed7b8190c5714532b566097699c9715800000000000000000000000000000000

Implemented in commit 61ad81e.

The team wallet destination is now derived with Principal.toLedgerAccount(Principal.fromText("k3pwi-qyaaa-aaaab-acbrq-cai"), null) instead of using an ASCII hex blob literal. I also added a guard in transferToTeam to verify the derived account matches the provided ICP Native account id (5d9bb4f164022de0933d3b45eaf33f1902e9578a2f330a1301d531c42bebf783) before any transfer proceeds.

@copilot I don't think this will work as "k3pwi-qyaaa-aaaab-acbrq-cai" (as defined in
let TEAM_WALLET_PRINCIPAL : Principal = Principal.fromText("k3pwi-qyaaa-aaaab-acbrq-cai"); ) isn't the team's principal, the team just has a subaccount there, see the info above:
"ICP Native": 5d9bb4f164022de0933d3b45eaf33f1902e9578a2f330a1301d531c42bebf783
"ICRC-1": k3pwi-qyaaa-aaaab-acbrq-cai-uco74ta.ed7b8190c5714532b566097699c9715800000000000000000000000000000000

so sending the ICP to the account 5d9bb4f164022de0933d3b45eaf33f1902e9578a2f330a1301d531c42bebf783 is the way to go. Please update the code accordingly.

The Motoko base library has this function:
let blob = Text.encodeUtf8("Hello");

Updated in 6d4678a: team disbursement now targets the ICP Native account identifier directly by using the raw 32-byte account-id blob for 5d9bb4f164022de0933d3b45eaf33f1902e9578a2f330a1301d531c42bebf783 (no principal-based derivation). No UI changes to screenshot.

Copilot · 2026-04-09T09:39:55Z

+        let TEAM_WALLET_ADDRESS : Blob = "5d9bb4f164022de0933d3b45eaf33f1902e9578a2f330a1301d531c42bebf783";
+        D.print(
+            "Transferring "
+            # debug_show (args.amount)
+            # " tokens to TEAM_WALLET_ADDRESS "
+            # debug_show (TEAM_WALLET_ADDRESS)
+        );
+
+        let transferArgs : TokenLedger.TransferArgs = {
+            to : Blob = TEAM_WALLET_ADDRESS;


Same issue as above: TEAM_WALLET_ADDRESS is written as a hex text string but typed as Blob. For ledger transfer, to must be the raw 32-byte account identifier; using the ASCII bytes of the hex string will not represent the intended account.

@copilot apply changes based on this feedback
use the same fix you'll implement above, based on this info again:
the Principal module from the Motoko base library has the functions Principal.toBlob(principal) and Principal.toLedgerAccount(principal : Principal, subAccount : ?Blob) : Blob
https://docs.internetcomputer.org/motoko/base/Principal#function-toledgeraccount

The team wallet where the ICP should be sent to has the following info:
"ICP Native": 5d9bb4f164022de0933d3b45eaf33f1902e9578a2f330a1301d531c42bebf783
"ICRC-1": k3pwi-qyaaa-aaaab-acbrq-cai-uco74ta.ed7b8190c5714532b566097699c9715800000000000000000000000000000000

Handled already in 61ad81e: both team-transfer paths now use Principal.toLedgerAccount(Principal.fromText("k3pwi-qyaaa-aaaab-acbrq-cai"), null) and no longer use the hex-text blob literal. Backend-only change (no UI changes/screenshot).

@copilot apply changes based on this feedback

I don't think this will work as "k3pwi-qyaaa-aaaab-acbrq-cai" (as defined in
let TEAM_WALLET_PRINCIPAL : Principal = Principal.fromText("k3pwi-qyaaa-aaaab-acbrq-cai"); ) isn't the team's principal, the team just has a subaccount there, see the info above:
"ICP Native": 5d9bb4f164022de0933d3b45eaf33f1902e9578a2f330a1301d531c42bebf783
"ICRC-1": k3pwi-qyaaa-aaaab-acbrq-cai-uco74ta.ed7b8190c5714532b566097699c9715800000000000000000000000000000000

so sending the ICP to the account 5d9bb4f164022de0933d3b45eaf33f1902e9578a2f330a1301d531c42bebf783 is the way to go. Please update the code accordingly.

The Motoko base library has this function:
let blob = Text.encodeUtf8("Hello");

Implemented in 6d4678a: team transfers now use the explicit ICP Native account-id destination (5d9bb4f164022de0933d3b45eaf33f1902e9578a2f330a1301d531c42bebf783) via raw 32-byte blob bytes, not principal derivation/subaccount inference. No UI changes.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Agent-Logs-Url: https://github.com/onicai/PoAIW/sessions/b2ca583e-6016-4447-85f9-b88632c99db5 Co-authored-by: patnorris <23037714+patnorris@users.noreply.github.com>

Copilot · 2026-04-23T08:53:50Z

Just as a heads up, I was blocked by some firewall rules while working on your feedback. Expand below for details.

Warning

Firewall rules blocked me from connecting to one or more addresses (expand for details)

I tried to connect to the following addresses, but was blocked by firewall rules:

icp-api.io
- Triggering command: /home/REDACTED/work/_temp/ghcca-node/node/bin/node node /home/REDACTED/work/_temp/ghcca-node/node/bin/mops install (dns block)

If you need me to access, download, or install something from one of these locations, you can either:

Configure Actions setup steps to set up my environment, which run before the firewall is enabled
Add the appropriate URLs or hosts to the custom allowlist in this repository's Copilot coding agent settings (admins only)

Agent-Logs-Url: https://github.com/onicai/PoAIW/sessions/f19ebc12-d53d-482f-833d-747ebb47ca1f Co-authored-by: patnorris <23037714+patnorris@users.noreply.github.com>

Add functionality to use cycles balance instead of CMC for topups

9794bc6

patnorris requested review from Copilot and icppWorld April 9, 2026 09:34

Copilot started reviewing on behalf of patnorris April 9, 2026 09:35 View session

Copilot AI reviewed Apr 9, 2026

View reviewed changes

Copilot started work on behalf of patnorris April 23, 2026 08:38 View session

patnorris and others added 3 commits April 23, 2026 10:39

Update src/GameState/src/Main.mo

1a7eebb

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Fix team wallet account derivation for ICP transfers

2f28a5e

Agent-Logs-Url: https://github.com/onicai/PoAIW/sessions/b2ca583e-6016-4447-85f9-b88632c99db5 Co-authored-by: patnorris <23037714+patnorris@users.noreply.github.com>

Derive and validate team ICP account from principal

61ad81e

Agent-Logs-Url: https://github.com/onicai/PoAIW/sessions/b2ca583e-6016-4447-85f9-b88632c99db5 Co-authored-by: patnorris <23037714+patnorris@users.noreply.github.com>

Copilot finished work on behalf of patnorris April 23, 2026 08:53

Copilot started work on behalf of patnorris April 23, 2026 08:54 View session

Copilot finished work on behalf of patnorris April 23, 2026 08:58

Copilot started work on behalf of patnorris April 23, 2026 09:13 View session

Use ICP native account-id bytes for team wallet transfers

6d4678a

Agent-Logs-Url: https://github.com/onicai/PoAIW/sessions/f19ebc12-d53d-482f-833d-747ebb47ca1f Co-authored-by: patnorris <23037714+patnorris@users.noreply.github.com>

Copilot finished work on behalf of patnorris April 23, 2026 09:16

Copilot started work on behalf of patnorris April 23, 2026 09:17 View session

Copilot finished work on behalf of patnorris April 23, 2026 09:22

Conversation

patnorris commented Apr 9, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Apr 9, 2026

Choose a reason for hiding this comment

Uh oh!

patnorris Apr 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 23, 2026

Choose a reason for hiding this comment

Uh oh!

patnorris Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 23, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Apr 9, 2026

Choose a reason for hiding this comment

Uh oh!

patnorris Apr 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 23, 2026

Choose a reason for hiding this comment

Uh oh!

patnorris Apr 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 23, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI commented Apr 23, 2026

I tried to connect to the following addresses, but was blocked by firewall rules:

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

patnorris Apr 23, 2026 •

edited

Loading