cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Update gas prices

Browse Source 
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
This commit is contained in:
Jakub Sztandera 2020-07-20 19:57:06 +02:00
parent 310fa67f9d
commit 7da629d03b
No known key found for this signature in database
GPG Key ID: 9A9AF56F8B3879BA
19 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chain/market/fundmgr.go
View File

@ -69,8 +69,6 @@ func (fm *FundMgr) EnsureAvailable(ctx context.Context, addr, wallet address.Add
To: builtin.StorageMarketActorAddr, To: builtin.StorageMarketActorAddr,
From: wallet, From: wallet,
Value: toAdd, Value: toAdd,
GasPrice: types.NewInt(0),
GasLimit: 100_000_000,
Method: builtin.MethodsMarket.AddBalance, Method: builtin.MethodsMarket.AddBalance,
Params: params, Params: params,
}) })

4
chain/stmgr/forks_test.go
View File

@ -179,7 +179,7 @@ func TestForkHeightTriggers(t *testing.T) {
To: builtin.InitActorAddr, To: builtin.InitActorAddr,
Method: builtin.MethodsInit.Exec, Method: builtin.MethodsInit.Exec,
Params: enc, Params: enc,
GasLimit: 100_000_000, GasLimit: types.TestGasLimit,
GasPrice: types.NewInt(0), GasPrice: types.NewInt(0),
} }
sig, err := cg.Wallet().Sign(ctx, cg.Banker(), m.Cid().Bytes()) sig, err := cg.Wallet().Sign(ctx, cg.Banker(), m.Cid().Bytes())
@ -206,7 +206,7 @@ func TestForkHeightTriggers(t *testing.T) {
Method: 2, Method: 2,
Params: nil, Params: nil,
Nonce: nonce, Nonce: nonce,
GasLimit: 100_000_000, GasLimit: types.TestGasLimit,
GasPrice: types.NewInt(0), GasPrice: types.NewInt(0),
} }
nonce++ nonce++

2
chain/stmgr/utils.go
View File

@ -586,7 +586,7 @@ func (sm *StateManager) CirculatingSupply(ctx context.Context, ts *types.TipSet)
unsafeVM := &vm.UnsafeVM{VM: vmi} unsafeVM := &vm.UnsafeVM{VM: vmi}
rt := unsafeVM.MakeRuntime(ctx, &types.Message{ rt := unsafeVM.MakeRuntime(ctx, &types.Message{
GasLimit: 1_000_000_000, GasLimit: 100e6,
From: builtin.SystemActorAddr, From: builtin.SystemActorAddr,
}, builtin.SystemActorAddr, 0, 0, 0) }, builtin.SystemActorAddr, 0, 0, 0)

2
chain/types/message.go
View File

@ -158,3 +158,5 @@ func (m *Message) ValidForBlockInclusion(minGas int64) error {
return nil return nil
} }
const TestGasLimit = 100e6

2
cli/chain.go
View File

@ -935,7 +935,7 @@ var slashConsensusFault = &cli.Command{
From: def, From: def,
Value: types.NewInt(0), Value: types.NewInt(0),
GasPrice: types.NewInt(1), GasPrice: types.NewInt(1),
GasLimit: 100_000_000, GasLimit: 0,
Method: builtin.MethodsMiner.ReportConsensusFault, Method: builtin.MethodsMiner.ReportConsensusFault,
Params: enc, Params: enc,
} }

2
cmd/chain-noise/main.go
View File

@ -77,7 +77,7 @@ func sendSmallFundsTxs(ctx context.Context, api api.FullNode, from address.Addre
From: from, From: from,
To: sendSet[rand.Intn(20)], To: sendSet[rand.Intn(20)],
Value: types.NewInt(1), Value: types.NewInt(1),
GasLimit: 100_000_000, GasLimit: 0,
GasPrice: types.NewInt(0), GasPrice: types.NewInt(0),
} }

6
cmd/lotus-fountain/main.go
View File

@ -281,7 +281,7 @@ func (h *handler) send(w http.ResponseWriter, r *http.Request) {
To: to, To: to,
GasPrice: types.NewInt(0), GasPrice: types.NewInt(0),
GasLimit: 100_000_000, GasLimit: 0,
}) })
if err != nil { if err != nil {
w.WriteHeader(400) w.WriteHeader(400)
@ -355,7 +355,7 @@ func (h *handler) mkminer(w http.ResponseWriter, r *http.Request) {
To: owner, To: owner,
GasPrice: types.NewInt(0), GasPrice: types.NewInt(0),
GasLimit: 100_000_000, GasLimit: 0,
}) })
if err != nil { if err != nil {
w.WriteHeader(400) w.WriteHeader(400)
@ -391,7 +391,7 @@ func (h *handler) mkminer(w http.ResponseWriter, r *http.Request) {
Method: builtin.MethodsPower.CreateMiner, Method: builtin.MethodsPower.CreateMiner,
Params: params, Params: params,
GasLimit: 100_000_000, GasLimit: 0,
GasPrice: types.NewInt(0), GasPrice: types.NewInt(0),
} }

2
cmd/lotus-shed/nonce-fix.go
View File

@ -89,7 +89,7 @@ var noncefix = &cli.Command{
From: addr, From: addr,
To: addr, To: addr,
Value: types.NewInt(1), Value: types.NewInt(1),
GasLimit: 100_000_000, GasLimit: 0,
GasPrice: types.NewInt(1), GasPrice: types.NewInt(1),
Nonce: i, Nonce: i,
} }

4
cmd/lotus-shed/verifreg.go
View File

@ -76,7 +76,7 @@ var verifRegAddVerifierCmd = &cli.Command{
From: fromk, From: fromk,
Method: builtin.MethodsVerifiedRegistry.AddVerifier, Method: builtin.MethodsVerifiedRegistry.AddVerifier,
GasPrice: types.NewInt(1), GasPrice: types.NewInt(1),
GasLimit: 100_000_000, GasLimit: 0,
Params: params, Params: params,
} }
@ -152,7 +152,7 @@ var verifRegVerifyClientCmd = &cli.Command{
From: fromk, From: fromk,
Method: builtin.MethodsVerifiedRegistry.AddVerifiedClient, Method: builtin.MethodsVerifiedRegistry.AddVerifiedClient,
GasPrice: types.NewInt(1), GasPrice: types.NewInt(1),
GasLimit: 100_000_000, GasLimit: 0,
Params: params, Params: params,
} }

4
cmd/lotus-storage-miner/init.go
View File

@ -557,7 +557,7 @@ func configureStorageMiner(ctx context.Context, api lapi.FullNode, addr address.
Params: enc, Params: enc,
Value: types.NewInt(0), Value: types.NewInt(0),
GasPrice: gasPrice, GasPrice: gasPrice,
GasLimit: 100_000_000, GasLimit: 0,
} }
smsg, err := api.MpoolPushMessage(ctx, msg) smsg, err := api.MpoolPushMessage(ctx, msg)
@ -636,7 +636,7 @@ func createStorageMiner(ctx context.Context, api lapi.FullNode, peerid peer.ID,
Method: builtin.MethodsPower.CreateMiner, Method: builtin.MethodsPower.CreateMiner,
Params: params, Params: params,
GasLimit: 100_000_000, GasLimit: 0,
GasPrice: gasPrice, GasPrice: gasPrice,
} }

2
markets/storageadapter/client.go
View File

@ -138,7 +138,7 @@ func (c *ClientNodeAdapter) AddFunds(ctx context.Context, addr address.Address,
From: addr, From: addr,
Value: amount, Value: amount,
GasPrice: types.NewInt(0), GasPrice: types.NewInt(0),
GasLimit: 200_000_000, GasLimit: 0,
Method: builtin.MethodsMarket.AddBalance, Method: builtin.MethodsMarket.AddBalance,
}) })
if err != nil { if err != nil {

4
markets/storageadapter/provider.go
View File

@ -78,7 +78,7 @@ func (n *ProviderNodeAdapter) PublishDeals(ctx context.Context, deal storagemark
From: mi.Worker, From: mi.Worker,
Value: types.NewInt(0), Value: types.NewInt(0),
GasPrice: types.NewInt(0), GasPrice: types.NewInt(0),
GasLimit: 600_000_000, GasLimit: 0,
Method: builtin.MethodsMarket.PublishStorageDeals, Method: builtin.MethodsMarket.PublishStorageDeals,
Params: params, Params: params,
}) })
@ -175,7 +175,7 @@ func (n *ProviderNodeAdapter) AddFunds(ctx context.Context, addr address.Address
From: addr, From: addr,
Value: amount, Value: amount,
GasPrice: types.NewInt(0), GasPrice: types.NewInt(0),
GasLimit: 200_000_000, GasLimit: 0,
Method: builtin.MethodsMarket.AddBalance, Method: builtin.MethodsMarket.AddBalance,
}) })
if err != nil { if err != nil {

6
node/impl/full/multisig.go
View File

@ -77,7 +77,7 @@ func (a *MsigAPI) MsigCreate(ctx context.Context, req uint64, addrs []address.Ad
Method: builtin.MethodsInit.Exec, Method: builtin.MethodsInit.Exec,
Params: enc, Params: enc,
GasPrice: gp, GasPrice: gp,
GasLimit: 100_000_000, GasLimit: 0,
Value: val, Value: val,
} }
@ -124,7 +124,7 @@ func (a *MsigAPI) MsigPropose(ctx context.Context, msig address.Address, to addr
Value: types.NewInt(0), Value: types.NewInt(0),
Method: builtin.MethodsMultisig.Propose, Method: builtin.MethodsMultisig.Propose,
Params: enc, Params: enc,
GasLimit: 100_000_000, GasLimit: 0,
GasPrice: types.NewInt(1), GasPrice: types.NewInt(1),
} }
@ -240,7 +240,7 @@ func (a *MsigAPI) msigApproveOrCancel(ctx context.Context, operation api.MsigPro
Value: types.NewInt(0), Value: types.NewInt(0),
Method: msigResponseMethod, Method: msigResponseMethod,
Params: enc, Params: enc,
GasLimit: 100_000_000, GasLimit: 0,
GasPrice: types.NewInt(1), GasPrice: types.NewInt(1),
} }

2
node/impl/full/state.go
View File

@ -974,7 +974,7 @@ func (a *StateAPI) StateMinerInitialPledgeCollateral(ctx context.Context, maddr
From: maddr, From: maddr,
To: builtin.StorageMarketActorAddr, To: builtin.StorageMarketActorAddr,
Method: builtin.MethodsMarket.VerifyDealsForActivation, Method: builtin.MethodsMarket.VerifyDealsForActivation,
GasLimit: 100_000_000, GasLimit: 0,
GasPrice: types.NewInt(0), GasPrice: types.NewInt(0),
Params: params, Params: params,
}, ts) }, ts)

4
node/impl/paych/paych.go
View File

@ -127,7 +127,7 @@ func (a *PaychAPI) PaychClose(ctx context.Context, addr address.Address) (cid.Ci
Method: builtin.MethodsPaych.Settle, Method: builtin.MethodsPaych.Settle,
Nonce: nonce, Nonce: nonce,
GasLimit: 100_000_000, GasLimit: 0,
GasPrice: types.NewInt(0), GasPrice: types.NewInt(0),
} }
@ -242,7 +242,7 @@ func (a *PaychAPI) PaychVoucherSubmit(ctx context.Context, ch address.Address, s
Nonce: nonce, Nonce: nonce,
Method: builtin.MethodsPaych.UpdateChannelState, Method: builtin.MethodsPaych.UpdateChannelState,
Params: enc, Params: enc,
GasLimit: 100_000_000, GasLimit: 0,
GasPrice: types.NewInt(0), GasPrice: types.NewInt(0),
} }

2
node/node_test.go
View File

@ -107,7 +107,7 @@ func testStorageNode(ctx context.Context, t *testing.T, waddr address.Address, a
Params: enc, Params: enc,
Value: types.NewInt(0), Value: types.NewInt(0),
GasPrice: types.NewInt(0), GasPrice: types.NewInt(0),
GasLimit: 100_000_000, GasLimit: 0,
} }
_, err = tnd.MpoolPushMessage(ctx, msg) _, err = tnd.MpoolPushMessage(ctx, msg)

4
paychmgr/simple.go
View File

@ -37,7 +37,7 @@ func (pm *Manager) createPaych(ctx context.Context, from, to address.Address, am
Value: amt, Value: amt,
Method: builtin.MethodsInit.Exec, Method: builtin.MethodsInit.Exec,
Params: enc, Params: enc,
GasLimit: 100_000_000, GasLimit: 0,
GasPrice: types.NewInt(0), GasPrice: types.NewInt(0),
} }
@ -92,7 +92,7 @@ func (pm *Manager) addFunds(ctx context.Context, ch address.Address, from addres
From: from, From: from,
Value: amt, Value: amt,
Method: 0, Method: 0,
GasLimit: 100_000_000, GasLimit: 0,
GasPrice: types.NewInt(0), GasPrice: types.NewInt(0),
} }

2
storage/adapter_storage_miner.go
View File

@ -117,7 +117,7 @@ func (s SealingAPIAdapter) StateComputeDataCommitment(ctx context.Context, maddr
From: maddr, From: maddr,
Value: types.NewInt(0), Value: types.NewInt(0),
GasPrice: types.NewInt(0), GasPrice: types.NewInt(0),
GasLimit: 100_000_000, GasLimit: 0,
Method: builtin.MethodsMarket.ComputeDataCommitment, Method: builtin.MethodsMarket.ComputeDataCommitment,
Params: ccparams, Params: ccparams,
} }

4
storage/wdpost_run.go
View File

@ -176,7 +176,7 @@ func (s *WindowPoStScheduler) checkNextRecoveries(ctx context.Context, dlIdx uin
Method: builtin.MethodsMiner.DeclareFaultsRecovered, Method: builtin.MethodsMiner.DeclareFaultsRecovered,
Params: enc, Params: enc,
Value: types.NewInt(0), Value: types.NewInt(0),
GasLimit: 100_000_000, // i dont know help GasLimit: 0,
GasPrice: types.NewInt(2), GasPrice: types.NewInt(2),
} }
@ -260,7 +260,7 @@ func (s *WindowPoStScheduler) checkNextFaults(ctx context.Context, dlIdx uint64,
Method: builtin.MethodsMiner.DeclareFaults, Method: builtin.MethodsMiner.DeclareFaults,
Params: enc, Params: enc,
Value: types.NewInt(0), // TODO: Is there a fee? Value: types.NewInt(0), // TODO: Is there a fee?
GasLimit: 100_000_000, // i dont know help GasLimit: 0,
GasPrice: types.NewInt(2), GasPrice: types.NewInt(2),
} }