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

add modules.StorageAuthWithURL to set correct token

Browse Source
This commit is contained in:
Anton Evangelatov 2021-06-01 11:42:28 +02:00
parent d195a12565
commit e4136b0d42
5 changed files with 315 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.

3
go.sum
View File

@ -308,17 +308,14 @@ github.com/filecoin-project/go-storedcounter v0.0.0-20200421200003-1c99c62e8a5b
github.com/filecoin-project/go-storedcounter v0.0.0-20200421200003-1c99c62e8a5b/go.mod h1:Q0GQOBtKf1oE10eSXSlhN45kDBdGvEcVOqMiffqX+N8= github.com/filecoin-project/go-storedcounter v0.0.0-20200421200003-1c99c62e8a5b/go.mod h1:Q0GQOBtKf1oE10eSXSlhN45kDBdGvEcVOqMiffqX+N8=
github.com/filecoin-project/specs-actors v0.9.4/go.mod h1:BStZQzx5x7TmCkLv0Bpa07U6cPKol6fd3w9KjMPZ6Z4= github.com/filecoin-project/specs-actors v0.9.4/go.mod h1:BStZQzx5x7TmCkLv0Bpa07U6cPKol6fd3w9KjMPZ6Z4=
github.com/filecoin-project/specs-actors v0.9.12/go.mod h1:TS1AW/7LbG+615j4NsjMK1qlpAwaFsG9w0V2tg2gSao= github.com/filecoin-project/specs-actors v0.9.12/go.mod h1:TS1AW/7LbG+615j4NsjMK1qlpAwaFsG9w0V2tg2gSao=
github.com/filecoin-project/specs-actors v0.9.13 h1:rUEOQouefi9fuVY/2HOroROJlZbOzWYXXeIh41KF2M4=
github.com/filecoin-project/specs-actors v0.9.13/go.mod h1:TS1AW/7LbG+615j4NsjMK1qlpAwaFsG9w0V2tg2gSao= github.com/filecoin-project/specs-actors v0.9.13/go.mod h1:TS1AW/7LbG+615j4NsjMK1qlpAwaFsG9w0V2tg2gSao=
github.com/filecoin-project/specs-actors v0.9.14 h1:68PVstg2UB3ZsMLF+DKFTAs/YKsqhKWynkr0IqmVRQY= github.com/filecoin-project/specs-actors v0.9.14 h1:68PVstg2UB3ZsMLF+DKFTAs/YKsqhKWynkr0IqmVRQY=
github.com/filecoin-project/specs-actors v0.9.14/go.mod h1:TS1AW/7LbG+615j4NsjMK1qlpAwaFsG9w0V2tg2gSao= github.com/filecoin-project/specs-actors v0.9.14/go.mod h1:TS1AW/7LbG+615j4NsjMK1qlpAwaFsG9w0V2tg2gSao=
github.com/filecoin-project/specs-actors/v2 v2.0.1/go.mod h1:v2NZVYinNIKA9acEMBm5wWXxqv5+frFEbekBFemYghY= github.com/filecoin-project/specs-actors/v2 v2.0.1/go.mod h1:v2NZVYinNIKA9acEMBm5wWXxqv5+frFEbekBFemYghY=
github.com/filecoin-project/specs-actors/v2 v2.3.2/go.mod h1:UuJQLoTx/HPvvWeqlIFmC/ywlOLHNe8SNQ3OunFbu2Y= github.com/filecoin-project/specs-actors/v2 v2.3.2/go.mod h1:UuJQLoTx/HPvvWeqlIFmC/ywlOLHNe8SNQ3OunFbu2Y=
github.com/filecoin-project/specs-actors/v2 v2.3.5-0.20210114162132-5b58b773f4fb h1:orr/sMzrDZUPAveRE+paBdu1kScIUO5zm+HYeh+VlhA=
github.com/filecoin-project/specs-actors/v2 v2.3.5-0.20210114162132-5b58b773f4fb/go.mod h1:LljnY2Mn2homxZsmokJZCpRuhOPxfXhvcek5gWkmqAc= github.com/filecoin-project/specs-actors/v2 v2.3.5-0.20210114162132-5b58b773f4fb/go.mod h1:LljnY2Mn2homxZsmokJZCpRuhOPxfXhvcek5gWkmqAc=
github.com/filecoin-project/specs-actors/v2 v2.3.5 h1:PbT4tPlSXZ8sRgajhb4D8AOEmiaaZ+jg6tc6BBv8VQc= github.com/filecoin-project/specs-actors/v2 v2.3.5 h1:PbT4tPlSXZ8sRgajhb4D8AOEmiaaZ+jg6tc6BBv8VQc=
github.com/filecoin-project/specs-actors/v2 v2.3.5/go.mod h1:LljnY2Mn2homxZsmokJZCpRuhOPxfXhvcek5gWkmqAc= github.com/filecoin-project/specs-actors/v2 v2.3.5/go.mod h1:LljnY2Mn2homxZsmokJZCpRuhOPxfXhvcek5gWkmqAc=
github.com/filecoin-project/specs-actors/v3 v3.1.0 h1:s4qiPw8pgypqBGAy853u/zdZJ7K9cTZdM1rTiSonHrg=
github.com/filecoin-project/specs-actors/v3 v3.1.0/go.mod h1:mpynccOLlIRy0QnR008BwYBwT9fen+sPR13MA1VmMww= github.com/filecoin-project/specs-actors/v3 v3.1.0/go.mod h1:mpynccOLlIRy0QnR008BwYBwT9fen+sPR13MA1VmMww=
github.com/filecoin-project/specs-actors/v3 v3.1.1 h1:BE8fsns1GnEOxt1DTE5LxBK2FThXtWmCChgcJoHTg0E= github.com/filecoin-project/specs-actors/v3 v3.1.1 h1:BE8fsns1GnEOxt1DTE5LxBK2FThXtWmCChgcJoHTg0E=
github.com/filecoin-project/specs-actors/v3 v3.1.1/go.mod h1:mpynccOLlIRy0QnR008BwYBwT9fen+sPR13MA1VmMww= github.com/filecoin-project/specs-actors/v3 v3.1.1/go.mod h1:mpynccOLlIRy0QnR008BwYBwT9fen+sPR13MA1VmMww=

300
localnet.json Normal file
View File

@ -0,0 +1,300 @@
{
"NetworkVersion": 12,
"Accounts": [
{
"Type": "account",
"Balance": "50000000000000000000000000",
"Meta": {
"Owner": "t3rnqpbzyhqnvkscl4qimgpqqukynzdbqyuvlc24kdam6i6oeuzhhwed5l2ahvqkdiqacc34wi4oh2grcnshuq"
}
}
],
"Miners": [
{
"ID": "t01000",
"Owner": "t3rnqpbzyhqnvkscl4qimgpqqukynzdbqyuvlc24kdam6i6oeuzhhwed5l2ahvqkdiqacc34wi4oh2grcnshuq",
"Worker": "t3rnqpbzyhqnvkscl4qimgpqqukynzdbqyuvlc24kdam6i6oeuzhhwed5l2ahvqkdiqacc34wi4oh2grcnshuq",
"PeerId": "12D3KooWPteu8RJqJzoscKmU1nyd9kxuWUqEoBZNni3hBEWN1e9J",
"MarketBalance": "0",
"PowerBalance": "0",
"SectorSize": 2048,
"Sectors": [
{
"CommR": {
"/": "bagboea4b5abcabff7i7vgvlgnf2366jre2rvyxc5qhj6cyzxzimus6dedvrqxxi7"
},
"CommD": {
"/": "baga6ea4seaqabbd2j6tsgzgdi76f6vhzacjbw26pithbdqtvw2mahoslwywswni"
},
"SectorID": 0,
"Deal": {
"PieceCID": {
"/": "baga6ea4seaqabbd2j6tsgzgdi76f6vhzacjbw26pithbdqtvw2mahoslwywswni"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "t3rnqpbzyhqnvkscl4qimgpqqukynzdbqyuvlc24kdam6i6oeuzhhwed5l2ahvqkdiqacc34wi4oh2grcnshuq",
"Provider": "t01000",
"Label": "0",
"StartEpoch": 0,
"EndEpoch": 9001,
"StoragePricePerEpoch": "0",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ProofType": 5
},
{
"CommR": {
"/": "bagboea4b5abcavd5dbzijtfwkbpbbqmr5kdhgb2tewdy6n63egem2evlr7hk4zzi"
},
"CommD": {
"/": "baga6ea4seaqbolro7w44yc545wvbbexjw3b5ohiuoutousvgw2pwlojnzz3ggma"
},
"SectorID": 1,
"Deal": {
"PieceCID": {
"/": "baga6ea4seaqbolro7w44yc545wvbbexjw3b5ohiuoutousvgw2pwlojnzz3ggma"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "t3rnqpbzyhqnvkscl4qimgpqqukynzdbqyuvlc24kdam6i6oeuzhhwed5l2ahvqkdiqacc34wi4oh2grcnshuq",
"Provider": "t01000",
"Label": "1",
"StartEpoch": 0,
"EndEpoch": 9001,
"StoragePricePerEpoch": "0",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ProofType": 5
},
{
"CommR": {
"/": "bagboea4b5abcbrnifjhj3vauuh2rnoejhl7q7uayo5ijf4iodwb3jiblzurficab"
},
"CommD": {
"/": "baga6ea4seaqcrjzlcq234z2xrl3mefikifxlb4dqmzt3uaj3mv5mqh22govmgfa"
},
"SectorID": 2,
"Deal": {
"PieceCID": {
"/": "baga6ea4seaqcrjzlcq234z2xrl3mefikifxlb4dqmzt3uaj3mv5mqh22govmgfa"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "t3rnqpbzyhqnvkscl4qimgpqqukynzdbqyuvlc24kdam6i6oeuzhhwed5l2ahvqkdiqacc34wi4oh2grcnshuq",
"Provider": "t01000",
"Label": "2",
"StartEpoch": 0,
"EndEpoch": 9001,
"StoragePricePerEpoch": "0",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ProofType": 5
},
{
"CommR": {
"/": "bagboea4b5abcayxkrdo2tkfczg6jkrfvgp6pwituchpn4qxtgn47ejmvwici6wyf"
},
"CommD": {
"/": "baga6ea4seaqbop36vw2aa3tpetkmdvlztopr664rfnaqqvgvstiatheixvnc6nq"
},
"SectorID": 3,
"Deal": {
"PieceCID": {
"/": "baga6ea4seaqbop36vw2aa3tpetkmdvlztopr664rfnaqqvgvstiatheixvnc6nq"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "t3rnqpbzyhqnvkscl4qimgpqqukynzdbqyuvlc24kdam6i6oeuzhhwed5l2ahvqkdiqacc34wi4oh2grcnshuq",
"Provider": "t01000",
"Label": "3",
"StartEpoch": 0,
"EndEpoch": 9001,
"StoragePricePerEpoch": "0",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ProofType": 5
},
{
"CommR": {
"/": "bagboea4b5abcbjid7nmwjl57jos4p7ojliwxq4qobstf65tynz3sn5lfy44jzhds"
},
"CommD": {
"/": "baga6ea4seaqntlbccxmhxic2zpac5dkbsby5doafv42aitlzk3c5qdhixtbtaba"
},
"SectorID": 4,
"Deal": {
"PieceCID": {
"/": "baga6ea4seaqntlbccxmhxic2zpac5dkbsby5doafv42aitlzk3c5qdhixtbtaba"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "t3rnqpbzyhqnvkscl4qimgpqqukynzdbqyuvlc24kdam6i6oeuzhhwed5l2ahvqkdiqacc34wi4oh2grcnshuq",
"Provider": "t01000",
"Label": "4",
"StartEpoch": 0,
"EndEpoch": 9001,
"StoragePricePerEpoch": "0",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ProofType": 5
},
{
"CommR": {
"/": "bagboea4b5abcbstygxcgobkm7qx7ya5xwpcf5axfb4ousjkcgwzfqeztczfavhsn"
},
"CommD": {
"/": "baga6ea4seaqnsf5hd64532vliew3h3cef7nr6o66yd7v5s4ch5yx3bymlhypyoa"
},
"SectorID": 5,
"Deal": {
"PieceCID": {
"/": "baga6ea4seaqnsf5hd64532vliew3h3cef7nr6o66yd7v5s4ch5yx3bymlhypyoa"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "t3rnqpbzyhqnvkscl4qimgpqqukynzdbqyuvlc24kdam6i6oeuzhhwed5l2ahvqkdiqacc34wi4oh2grcnshuq",
"Provider": "t01000",
"Label": "5",
"StartEpoch": 0,
"EndEpoch": 9001,
"StoragePricePerEpoch": "0",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ProofType": 5
},
{
"CommR": {
"/": "bagboea4b5abcbfyeiqwyooe74zmcnkk3akcjn4ounuy4m6sovn5nqei54aqcefsv"
},
"CommD": {
"/": "baga6ea4seaqfkrsl36uvnj3xn3264rkvt2lgrb3pe2pbt6ka2plzemdhqudvmoq"
},
"SectorID": 6,
"Deal": {
"PieceCID": {
"/": "baga6ea4seaqfkrsl36uvnj3xn3264rkvt2lgrb3pe2pbt6ka2plzemdhqudvmoq"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "t3rnqpbzyhqnvkscl4qimgpqqukynzdbqyuvlc24kdam6i6oeuzhhwed5l2ahvqkdiqacc34wi4oh2grcnshuq",
"Provider": "t01000",
"Label": "6",
"StartEpoch": 0,
"EndEpoch": 9001,
"StoragePricePerEpoch": "0",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ProofType": 5
},
{
"CommR": {
"/": "bagboea4b5abcbidmr6ca4eb45n7bdqbrzq4jyxmpazfg3liqld45mpf42b2iofdf"
},
"CommD": {
"/": "baga6ea4seaqaeahwyiswdcd4mhy7ltj4u7gx22tbearu7savnwqkb7xxqas64pa"
},
"SectorID": 7,
"Deal": {
"PieceCID": {
"/": "baga6ea4seaqaeahwyiswdcd4mhy7ltj4u7gx22tbearu7savnwqkb7xxqas64pa"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "t3rnqpbzyhqnvkscl4qimgpqqukynzdbqyuvlc24kdam6i6oeuzhhwed5l2ahvqkdiqacc34wi4oh2grcnshuq",
"Provider": "t01000",
"Label": "7",
"StartEpoch": 0,
"EndEpoch": 9001,
"StoragePricePerEpoch": "0",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ProofType": 5
},
{
"CommR": {
"/": "bagboea4b5abcbrap6kd5jbpp7rikxvpuqc7gp2tmj7jycnwhhtwzzffyaryoxdrv"
},
"CommD": {
"/": "baga6ea4seaqoc53weeh6snwltlbutthfa6tqpbfmzsqxvhkfsq4v47jacqzv6pi"
},
"SectorID": 8,
"Deal": {
"PieceCID": {
"/": "baga6ea4seaqoc53weeh6snwltlbutthfa6tqpbfmzsqxvhkfsq4v47jacqzv6pi"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "t3rnqpbzyhqnvkscl4qimgpqqukynzdbqyuvlc24kdam6i6oeuzhhwed5l2ahvqkdiqacc34wi4oh2grcnshuq",
"Provider": "t01000",
"Label": "8",
"StartEpoch": 0,
"EndEpoch": 9001,
"StoragePricePerEpoch": "0",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ProofType": 5
},
{
"CommR": {
"/": "bagboea4b5abcb2sl6swcwv4qchtolwj5o6onqanbslcjdcylww3hwfw5hxzmdurq"
},
"CommD": {
"/": "baga6ea4seaqb256sqbv6syryaqlxrapawsfs2dmbhhfzjms7l4vndyih55d6kji"
},
"SectorID": 9,
"Deal": {
"PieceCID": {
"/": "baga6ea4seaqb256sqbv6syryaqlxrapawsfs2dmbhhfzjms7l4vndyih55d6kji"
},
"PieceSize": 2048,
"VerifiedDeal": false,
"Client": "t3rnqpbzyhqnvkscl4qimgpqqukynzdbqyuvlc24kdam6i6oeuzhhwed5l2ahvqkdiqacc34wi4oh2grcnshuq",
"Provider": "t01000",
"Label": "9",
"StartEpoch": 0,
"EndEpoch": 9001,
"StoragePricePerEpoch": "0",
"ProviderCollateral": "0",
"ClientCollateral": "0"
},
"ProofType": 5
}
]
}
],
"NetworkName": "localnet-9899f5bc-a891-44ff-883d-176654eab965",
"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
}
}
}

1
node/builder_miner.go
View File

@ -103,6 +103,7 @@ func ConfigStorageMiner(c interface{}) Option {
), ),
If(!cfg.Subsystems.EnableSectorStorage, If(!cfg.Subsystems.EnableSectorStorage,
Override(new(sectorstorage.StorageAuth), modules.StorageAuthWithURL(cfg.Subsystems.SectorIndexApiInfo)),
Override(new(modules.MinerStorageService), modules.ConnectStorageService(cfg.Subsystems.SectorIndexApiInfo)), Override(new(modules.MinerStorageService), modules.ConnectStorageService(cfg.Subsystems.SectorIndexApiInfo)),
Override(new(sectorstorage.Unsealer), From(new(modules.MinerStorageService))), Override(new(sectorstorage.Unsealer), From(new(modules.MinerStorageService))),
Override(new(sectorblocks.SectorBuilder), From(new(modules.MinerStorageService))), Override(new(sectorblocks.SectorBuilder), From(new(modules.MinerStorageService))),

14
node/modules/storageminer.go
View File

@ -8,6 +8,7 @@ import (
"net/http" "net/http"
"os" "os"
"path/filepath" "path/filepath"
"strings"
"time" "time"
"go.uber.org/fx" "go.uber.org/fx"
@ -693,6 +694,19 @@ func StorageAuth(ctx helpers.MetricsCtx, ca v0api.Common) (sectorstorage.Storage
return sectorstorage.StorageAuth(headers), nil return sectorstorage.StorageAuth(headers), nil
} }
func StorageAuthWithURL(url string) func(ctx helpers.MetricsCtx, ca v0api.Common) (sectorstorage.StorageAuth, error) {
log.Infow("Setting auth token based on URL", "url", url)
return func(ctx helpers.MetricsCtx, ca v0api.Common) (sectorstorage.StorageAuth, error) {
s := strings.Split(url, ":")
if len(s) != 2 {
return nil, errors.New("unexpected format of URL")
}
headers := http.Header{}
headers.Add("Authorization", "Bearer "+s[0])
return sectorstorage.StorageAuth(headers), nil
}
}
func NewConsiderOnlineStorageDealsConfigFunc(r repo.LockedRepo) (dtypes.ConsiderOnlineStorageDealsConfigFunc, error) { func NewConsiderOnlineStorageDealsConfigFunc(r repo.LockedRepo) (dtypes.ConsiderOnlineStorageDealsConfigFunc, error) {
return func() (out bool, err error) { return func() (out bool, err error) {
err = readCfg(r, func(cfg *config.StorageMiner) { err = readCfg(r, func(cfg *config.StorageMiner) {