Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable transaction fees on mainnet #1360

Merged
merged 2 commits into from
Sep 30, 2021
Merged

Enable transaction fees on mainnet #1360

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49ae7de
Enable transaction fees on mainnet
janezpodhostnik Sep 27, 2021
db05d67
restrict fees to mainnet testnet and canary
janezpodhostnik Sep 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/scaffold.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,11 +671,11 @@ func (fnb *FlowNodeBuilder) initFvmOptions() {
fvm.WithChain(fnb.RootChainID.Chain()),
fvm.WithBlocks(blockFinder),
fvm.WithAccountStorageLimit(true),
fvm.WithTransactionFeesEnabled(true),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the impact of this on localnet and benchnet, it might break loaders, was wondering if we could still filter it by chainID be mainnet,

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we've used the loaders on canary before no? And i believe fees are enabled there.

Or did we do extra setup to get the loaders to work for canary?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you mean the marketplace simulator? I was talking about the default loader that we have for localnet, not sure if we have run it against canary before

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We ran in on both testnet and canary chain before... do the localnet and benchnet have a separate chain id? It might be better to exclude those then.

}
if fnb.RootChainID == flow.Testnet || fnb.RootChainID == flow.Canary {
vmOpts = append(vmOpts,
fvm.WithRestrictedDeployment(false),
fvm.WithTransactionFeesEnabled(true),
)
}
fnb.FvmOptions = vmOpts
Expand Down