From d68dca6fb30912c1897c2833b3f2fcd2146e1d48 Mon Sep 17 00:00:00 2001 From: Jennifer Wang Date: Tue, 6 Aug 2024 12:58:12 -0400 Subject: [PATCH] add datacap balance to circ supply --- chain/actors/builtin/builtin.go | 10 ++++++++++ chain/stmgr/supply.go | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/chain/actors/builtin/builtin.go b/chain/actors/builtin/builtin.go index 4516683a85c..72b96d9c1e7 100644 --- a/chain/actors/builtin/builtin.go +++ b/chain/actors/builtin/builtin.go @@ -28,6 +28,7 @@ var SystemActorAddr = builtin.SystemActorAddr var BurntFundsActorAddr = builtin.BurntFundsActorAddr var CronActorAddr = builtin.CronActorAddr var EthereumAddressManagerActorAddr = builtin.EthereumAddressManagerActorAddr +var DatacapActorAddr = builtin.DatacapActorAddr var SaftAddress = makeAddress("t0122") var ReserveAddress = makeAddress("t090") var RootVerifierAddress = makeAddress("t080") @@ -276,6 +277,15 @@ func IsPaymentChannelActor(c cid.Cid) bool { return false } +func IsDatacapActor(c cid.Cid) bool { + name, _, ok := actors.GetActorMetaByCode(c) + if ok { + return name == manifest.DatacapKey + } + + return false +} + func IsPlaceholderActor(c cid.Cid) bool { name, _, ok := actors.GetActorMetaByCode(c) if ok { diff --git a/chain/stmgr/supply.go b/chain/stmgr/supply.go index 48e713c28d8..4bc42d57952 100644 --- a/chain/stmgr/supply.go +++ b/chain/stmgr/supply.go @@ -443,7 +443,8 @@ func (sm *StateManager) GetCirculatingSupply(ctx context.Context, height abi.Cha builtin.IsPaymentChannelActor(actor.Code) || builtin.IsEthAccountActor(actor.Code) || builtin.IsEvmActor(actor.Code) || - builtin.IsPlaceholderActor(actor.Code): + builtin.IsPlaceholderActor(actor.Code) || + builtin.IsDatacapActor(actor.Code): circ = big.Add(circ, actor.Balance)