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

revert back optional for Miner; remove ActorAddress call in node.MinerHandler

Browse Source
This commit is contained in:
Anton Evangelatov 2021-07-02 11:49:04 +02:00
parent 1869de7662
commit 4194c7fa24
5 changed files with 303 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dev.gen Normal file
View File

Binary file not shown.

300
localnet.json Normal file
View File

@ -0,0 +1,300 @@
{
"NetworkVersion": 13,
"Accounts": [
{
"Type": "account",
"Balance": "50000000000000000000000000",
"Meta": {
"Owner": "t3wsuwcjemfa4puhlbi3awgahpdtkkxfbjeopzb66ddlpcophfslb4ovvbv7bebmpgvtmr6tngfdef4um7zara"
}
}
],
"Miners": [
{
"ID": "t01000",
"Owner": "t3wsuwcjemfa4puhlbi3awgahpdtkkxfbjeopzb66ddlpcophfslb4ovvbv7bebmpgvtmr6tngfdef4um7zara",
"Worker": "t3wsuwcjemfa4puhlbi3awgahpdtkkxfbjeopzb66ddlpcophfslb4ovvbv7bebmpgvtmr6tngfdef4um7zara",
"PeerId": "12D3KooWDx1q8XxEHXuGCh8nE6in1RLMGGbomLo9TjKxdZbewUea",
"MarketBalance": "0",
"PowerBalance": "0",
"SectorSize": 2048,
"Sectors": [
{
"CommR": {
"/": "bagboea4b5abcb36rlxm7ql3mjkdymhioqedmzrajnqseycnrtd5whzgxrbf5etqo"
},
"CommD": {
"/": "baga6ea4seaqgpxg3uaomxyhkpc2rexx62a7w4jeitd4rzbfg4ktaowsisqwscaq"
},
"SectorID": 0,
"Deal": {
"PieceCID": {
"/": "baga6ea4seaqgpxg3uaomxyhkpc2rexx62a7w4jeitd4rzbfg4ktaowsisqwscaq"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "t3wsuwcjemfa4puhlbi3awgahpdtkkxfbjeopzb66ddlpcophfslb4ovvbv7bebmpgvtmr6tngfdef4um7zara",
"Provider": "t01000",
"Label": "0",
"StartEpoch": 0,
"EndEpoch": 9001,
"StoragePricePerEpoch": "0",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ProofType": 5
},
{
"CommR": {
"/": "bagboea4b5abcbsjglrcrxraosp5qd4ntfa7lyokuyyyxwsx7liaatmoaey4rs2ke"
},
"CommD": {
"/": "baga6ea4seaqjwvw2qzqy7aousluji424lqsvpvo2i2uruso4uvicfm4eogs32ly"
},
"SectorID": 1,
"Deal": {
"PieceCID": {
"/": "baga6ea4seaqjwvw2qzqy7aousluji424lqsvpvo2i2uruso4uvicfm4eogs32ly"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "t3wsuwcjemfa4puhlbi3awgahpdtkkxfbjeopzb66ddlpcophfslb4ovvbv7bebmpgvtmr6tngfdef4um7zara",
"Provider": "t01000",
"Label": "1",
"StartEpoch": 0,
"EndEpoch": 9001,
"StoragePricePerEpoch": "0",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ProofType": 5
},
{
"CommR": {
"/": "bagboea4b5abca6omqhoiuk3gp4olq3nlxq3ivbsjphqfcmqqvtebh5xdxpiacx3n"
},
"CommD": {
"/": "baga6ea4seaqkkpsy2n3kqlnezppfvqszry32psvjatr3ur5dva3blj34sfitkgi"
},
"SectorID": 2,
"Deal": {
"PieceCID": {
"/": "baga6ea4seaqkkpsy2n3kqlnezppfvqszry32psvjatr3ur5dva3blj34sfitkgi"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "t3wsuwcjemfa4puhlbi3awgahpdtkkxfbjeopzb66ddlpcophfslb4ovvbv7bebmpgvtmr6tngfdef4um7zara",
"Provider": "t01000",
"Label": "2",
"StartEpoch": 0,
"EndEpoch": 9001,
"StoragePricePerEpoch": "0",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ProofType": 5
},
{
"CommR": {
"/": "bagboea4b5abcaqstvnte4h5hyscfadixlqtpwpeqgzthuom2bv5bcwfe23p5yja3"
},
"CommD": {
"/": "baga6ea4seaqahsm5vpi7y5cviri5r6aqxrxkv7vuetrc5neg26kicqjnknssyhy"
},
"SectorID": 3,
"Deal": {
"PieceCID": {
"/": "baga6ea4seaqahsm5vpi7y5cviri5r6aqxrxkv7vuetrc5neg26kicqjnknssyhy"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "t3wsuwcjemfa4puhlbi3awgahpdtkkxfbjeopzb66ddlpcophfslb4ovvbv7bebmpgvtmr6tngfdef4um7zara",
"Provider": "t01000",
"Label": "3",
"StartEpoch": 0,
"EndEpoch": 9001,
"StoragePricePerEpoch": "0",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ProofType": 5
},
{
"CommR": {
"/": "bagboea4b5abca2pbffycxwjt2663qbvxnyfwgx44wxffa6yvbfi52vneoewpbtil"
},
"CommD": {
"/": "baga6ea4seaqfhkkwj4qbjo7h3fluvwovjkm2zairs2s4hpw42ofqgsxhv5ahudy"
},
"SectorID": 4,
"Deal": {
"PieceCID": {
"/": "baga6ea4seaqfhkkwj4qbjo7h3fluvwovjkm2zairs2s4hpw42ofqgsxhv5ahudy"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "t3wsuwcjemfa4puhlbi3awgahpdtkkxfbjeopzb66ddlpcophfslb4ovvbv7bebmpgvtmr6tngfdef4um7zara",
"Provider": "t01000",
"Label": "4",
"StartEpoch": 0,
"EndEpoch": 9001,
"StoragePricePerEpoch": "0",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ProofType": 5
},
{
"CommR": {
"/": "bagboea4b5abcbf37ugtzegx3r3o2vapvdi5b5kmsbsbihzf3jup24rbkmh73npzi"
},
"CommD": {
"/": "baga6ea4seaqpe434qqmqtwkwgelughhzvsw4paiejvhhdzmbexu4tyfq34pu4ka"
},
"SectorID": 5,
"Deal": {
"PieceCID": {
"/": "baga6ea4seaqpe434qqmqtwkwgelughhzvsw4paiejvhhdzmbexu4tyfq34pu4ka"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "t3wsuwcjemfa4puhlbi3awgahpdtkkxfbjeopzb66ddlpcophfslb4ovvbv7bebmpgvtmr6tngfdef4um7zara",
"Provider": "t01000",
"Label": "5",
"StartEpoch": 0,
"EndEpoch": 9001,
"StoragePricePerEpoch": "0",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ProofType": 5
},
{
"CommR": {
"/": "bagboea4b5abcbhpeqdzlued6vhfttm34kii666yx7yfgsgh22ggt4posnzpmczsc"
},
"CommD": {
"/": "baga6ea4seaqi7gm62wcdim5wo6sw5pytfro7bduhg6puann353n6hrzkejq5kpa"
},
"SectorID": 6,
"Deal": {
"PieceCID": {
"/": "baga6ea4seaqi7gm62wcdim5wo6sw5pytfro7bduhg6puann353n6hrzkejq5kpa"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "t3wsuwcjemfa4puhlbi3awgahpdtkkxfbjeopzb66ddlpcophfslb4ovvbv7bebmpgvtmr6tngfdef4um7zara",
"Provider": "t01000",
"Label": "6",
"StartEpoch": 0,
"EndEpoch": 9001,
"StoragePricePerEpoch": "0",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ProofType": 5
},
{
"CommR": {
"/": "bagboea4b5abcbeyhkkygqwal3yqotylwcy276z23vrmmbc46am4l2tcgdgemmxsx"
},
"CommD": {
"/": "baga6ea4seaqbcbosan5gczfwwshsybdp435isirhrtx7mbeqstzvsg357kedoaa"
},
"SectorID": 7,
"Deal": {
"PieceCID": {
"/": "baga6ea4seaqbcbosan5gczfwwshsybdp435isirhrtx7mbeqstzvsg357kedoaa"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "t3wsuwcjemfa4puhlbi3awgahpdtkkxfbjeopzb66ddlpcophfslb4ovvbv7bebmpgvtmr6tngfdef4um7zara",
"Provider": "t01000",
"Label": "7",
"StartEpoch": 0,
"EndEpoch": 9001,
"StoragePricePerEpoch": "0",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ProofType": 5
},
{
"CommR": {
"/": "bagboea4b5abcao3ju6z2iddoo3geqxqeoyn4flswssfdt46rgdb3knglruxacerf"
},
"CommD": {
"/": "baga6ea4seaqidbukpgrforz5c7fsp4azsrtekxhn4jvevm6i27odolaaaxysmhq"
},
"SectorID": 8,
"Deal": {
"PieceCID": {
"/": "baga6ea4seaqidbukpgrforz5c7fsp4azsrtekxhn4jvevm6i27odolaaaxysmhq"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "t3wsuwcjemfa4puhlbi3awgahpdtkkxfbjeopzb66ddlpcophfslb4ovvbv7bebmpgvtmr6tngfdef4um7zara",
"Provider": "t01000",
"Label": "8",
"StartEpoch": 0,
"EndEpoch": 9001,
"StoragePricePerEpoch": "0",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ProofType": 5
},
{
"CommR": {
"/": "bagboea4b5abcbn7h3c6usm4agt6d66qg6n27jlfyhb2revurj3zhy4bw27mpjnb3"
},
"CommD": {
"/": "baga6ea4seaql57676vo2ekforzormyz5syewhqza3wjaygjseyrmuptrgdxvsgy"
},
"SectorID": 9,
"Deal": {
"PieceCID": {
"/": "baga6ea4seaql57676vo2ekforzormyz5syewhqza3wjaygjseyrmuptrgdxvsgy"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "t3wsuwcjemfa4puhlbi3awgahpdtkkxfbjeopzb66ddlpcophfslb4ovvbv7bebmpgvtmr6tngfdef4um7zara",
"Provider": "t01000",
"Label": "9",
"StartEpoch": 0,
"EndEpoch": 9001,
"StoragePricePerEpoch": "0",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ProofType": 5
}
]
}
],
"NetworkName": "localnet-cd5cfecc-1e68-420a-b754-7d0b427a30cd",
"VerifregRootKey": {
"Type": "multisig",
"Balance": "0",
"Meta": {
"Signers": [
"t1ceb34gnsc6qk5dt6n7xg6ycwzasjhbxm3iylkiy"
],
"Threshold": 1,
"VestingDuration": 0,
"VestingStart": 0
}
},
"RemainderAccount": {
"Type": "multisig",
"Balance": "0",
"Meta": {
"Signers": [
"t1ceb34gnsc6qk5dt6n7xg6ycwzasjhbxm3iylkiy"
],
"Threshold": 1,
"VestingDuration": 0,
"VestingStart": 0
}
}
}

2
node/builder_miner.go
View File

@ -99,7 +99,7 @@ func ConfigStorageMiner(c interface{}) Option {
// Mining / proving
Override(new(*slashfilter.SlashFilter), modules.NewSlashFilter),
// Override(new(*storage.Miner), modules.StorageMiner(config.DefaultStorageMiner().Fees)),
Override(new(*storage.Miner), modules.StorageMiner(config.DefaultStorageMiner().Fees)),
Override(new(*miner.Miner), modules.SetupBlockProducer),
Override(new(gen.WinningPoStProver), storage.NewWinningPoStProver),
Override(new(*storage.Miner), modules.StorageMiner(cfg.Fees)),

2
node/impl/storminer.go
View File

@ -61,7 +61,7 @@ type StorageMinerAPI struct {
Host dtypes.Libp2pHost `optional:"true"`
// Miner / storage
Miner *storage.Miner
Miner *storage.Miner `optional:"true"`
BlockMiner *miner.Miner `optional:"true"`
StorageMgr *sectorstorage.Manager `optional:"true"`
IStorageMgr sectorstorage.SectorManager `optional:"true"`

2
node/rpc.go
View File

@ -118,7 +118,7 @@ func MinerHandler(a api.StorageMiner, permissioned bool) (http.Handler, error) {
mapi = api.PermissionedStorMinerAPI(mapi)
}
_, _ = a.ActorAddress(context.Background())
//_, _ = a.ActorAddress(context.Background())
readerHandler, readerServerOpt := rpcenc.ReaderParamDecoder()
rpcServer := jsonrpc.NewServer(readerServerOpt)
rpcServer.Register("Filecoin", mapi)