Skip to content

Commit c220b1f

Browse files
committed
Merge main into pr-100: resolve go.mod/go.sum conflicts, update stale fee comment
2 parents 199c8c0 + 1524dda commit c220b1f

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

state/process.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -904,9 +904,9 @@ outer:
904904
// of our tracked accounts.
905905
if i.isTracked(payer, newAccounts) && fees > 0 {
906906
// NOTE(tav): This is theoretically possible if someone
907-
// manually deposits FLOW into the FlowFees contract.
907+
// manually deposits FLOW into a fee address.
908908
//
909-
// We explicitly disallow making direct transfers to the fee
909+
// We explicitly disallow making direct transfers to a fee
910910
// address within transaction construction. But, just in
911911
// case, we add this additional check here which is
912912
// effectively a fatal error.

0 commit comments

Comments
 (0)