forked from TrueCloudLab/frostfs-node
[#11] Rename `neofsid` contract to `frostfsid`
Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>carpawell/fix/multiple-cache-update-requests-FROST
parent
023396e6a4
commit
9cb4b4cc17
|
@ -42,7 +42,7 @@ const (
|
||||||
auditContract = "audit"
|
auditContract = "audit"
|
||||||
balanceContract = "balance"
|
balanceContract = "balance"
|
||||||
containerContract = "container"
|
containerContract = "container"
|
||||||
neofsIDContract = "neofsid"
|
frostfsIDContract = "frostfsid"
|
||||||
netmapContract = "netmap"
|
netmapContract = "netmap"
|
||||||
proxyContract = "proxy"
|
proxyContract = "proxy"
|
||||||
reputationContract = "reputation"
|
reputationContract = "reputation"
|
||||||
|
@ -72,7 +72,7 @@ var (
|
||||||
auditContract,
|
auditContract,
|
||||||
balanceContract,
|
balanceContract,
|
||||||
containerContract,
|
containerContract,
|
||||||
neofsIDContract,
|
frostfsIDContract,
|
||||||
netmapContract,
|
netmapContract,
|
||||||
proxyContract,
|
proxyContract,
|
||||||
reputationContract,
|
reputationContract,
|
||||||
|
@ -543,10 +543,10 @@ func (c *initializeContext) getContractDeployData(ctrName string, keysParam []in
|
||||||
items = append(items,
|
items = append(items,
|
||||||
c.Contracts[netmapContract].Hash,
|
c.Contracts[netmapContract].Hash,
|
||||||
c.Contracts[balanceContract].Hash,
|
c.Contracts[balanceContract].Hash,
|
||||||
c.Contracts[neofsIDContract].Hash,
|
c.Contracts[frostfsIDContract].Hash,
|
||||||
nnsCs.Hash,
|
nnsCs.Hash,
|
||||||
"container")
|
"container")
|
||||||
case neofsIDContract:
|
case frostfsIDContract:
|
||||||
items = append(items,
|
items = append(items,
|
||||||
c.Contracts[netmapContract].Hash,
|
c.Contracts[netmapContract].Hash,
|
||||||
c.Contracts[containerContract].Hash)
|
c.Contracts[containerContract].Hash)
|
||||||
|
|
|
@ -30,7 +30,7 @@ import (
|
||||||
balanceClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/balance"
|
balanceClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/balance"
|
||||||
cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container"
|
cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container"
|
||||||
frostfsClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfs"
|
frostfsClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfs"
|
||||||
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofsid"
|
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid"
|
||||||
nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap"
|
nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap"
|
||||||
repClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/reputation"
|
repClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/reputation"
|
||||||
morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet"
|
morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet"
|
||||||
|
@ -508,7 +508,7 @@ func New(ctx context.Context, log *logger.Logger, cfg *viper.Viper, errChan chan
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
frostfsIDClient, err := neofsid.NewFromMorph(server.morphClient, server.contracts.frostfsID, fee, neofsid.TryNotary(), neofsid.AsAlphabet())
|
frostfsIDClient, err := frostfsid.NewFromMorph(server.morphClient, server.contracts.frostfsID, fee, frostfsid.TryNotary(), frostfsid.AsAlphabet())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@ import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofsid"
|
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid"
|
||||||
cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
|
cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
|
||||||
frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa"
|
frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa"
|
||||||
"github.com/TrueCloudLab/frostfs-sdk-go/session"
|
"github.com/TrueCloudLab/frostfs-sdk-go/session"
|
||||||
|
@ -113,7 +113,7 @@ func (cp *Processor) verifySignature(v signatureVerificationData) error {
|
||||||
return errors.New("invalid signature calculated by container owner's key")
|
return errors.New("invalid signature calculated by container owner's key")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
var prm neofsid.AccountKeysPrm
|
var prm frostfsid.AccountKeysPrm
|
||||||
prm.SetID(v.ownerContainer)
|
prm.SetID(v.ownerContainer)
|
||||||
|
|
||||||
ownerKeys, err := cp.idClient.AccountKeys(prm)
|
ownerKeys, err := cp.idClient.AccountKeys(prm)
|
||||||
|
|
|
@ -5,7 +5,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container"
|
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container"
|
||||||
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofsid"
|
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid"
|
||||||
morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet"
|
morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet"
|
||||||
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
|
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
|
||||||
containerEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/container"
|
containerEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/container"
|
||||||
|
@ -27,7 +27,7 @@ type (
|
||||||
pool *ants.Pool
|
pool *ants.Pool
|
||||||
alphabetState AlphabetState
|
alphabetState AlphabetState
|
||||||
cnrClient *container.Client // notary must be enabled
|
cnrClient *container.Client // notary must be enabled
|
||||||
idClient *neofsid.Client
|
idClient *frostfsid.Client
|
||||||
subnetClient *morphsubnet.Client
|
subnetClient *morphsubnet.Client
|
||||||
netState NetworkState
|
netState NetworkState
|
||||||
notaryDisabled bool
|
notaryDisabled bool
|
||||||
|
@ -39,7 +39,7 @@ type (
|
||||||
PoolSize int
|
PoolSize int
|
||||||
AlphabetState AlphabetState
|
AlphabetState AlphabetState
|
||||||
ContainerClient *container.Client
|
ContainerClient *container.Client
|
||||||
NeoFSIDClient *neofsid.Client
|
NeoFSIDClient *frostfsid.Client
|
||||||
SubnetClient *morphsubnet.Client
|
SubnetClient *morphsubnet.Client
|
||||||
NetworkState NetworkState
|
NetworkState NetworkState
|
||||||
NotaryDisabled bool
|
NotaryDisabled bool
|
||||||
|
|
|
@ -4,7 +4,7 @@ import (
|
||||||
"crypto/elliptic"
|
"crypto/elliptic"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofsid"
|
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid"
|
||||||
frostfs "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/frostfs"
|
frostfs "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/frostfs"
|
||||||
"github.com/TrueCloudLab/frostfs-sdk-go/user"
|
"github.com/TrueCloudLab/frostfs-sdk-go/user"
|
||||||
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
|
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
|
||||||
|
@ -87,7 +87,7 @@ func (np *Processor) approveBindCommon(e *bindCommonContext) {
|
||||||
var id user.ID
|
var id user.ID
|
||||||
id.SetScriptHash(u160)
|
id.SetScriptHash(u160)
|
||||||
|
|
||||||
prm := neofsid.CommonBindPrm{}
|
prm := frostfsid.CommonBindPrm{}
|
||||||
prm.SetOwnerID(id.WalletBytes())
|
prm.SetOwnerID(id.WalletBytes())
|
||||||
prm.SetKeys(e.Keys())
|
prm.SetKeys(e.Keys())
|
||||||
prm.SetHash(e.bindCommon.TxHash())
|
prm.SetHash(e.bindCommon.TxHash())
|
||||||
|
|
|
@ -7,7 +7,7 @@ import (
|
||||||
|
|
||||||
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client"
|
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client"
|
||||||
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/balance"
|
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/balance"
|
||||||
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofsid"
|
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid"
|
||||||
nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap"
|
nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap"
|
||||||
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
|
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
|
||||||
frostfsEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/frostfs"
|
frostfsEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/frostfs"
|
||||||
|
@ -52,7 +52,7 @@ type (
|
||||||
mintEmitValue fixedn.Fixed8
|
mintEmitValue fixedn.Fixed8
|
||||||
gasBalanceThreshold int64
|
gasBalanceThreshold int64
|
||||||
|
|
||||||
frostfsIDClient *neofsid.Client
|
frostfsIDClient *frostfsid.Client
|
||||||
}
|
}
|
||||||
|
|
||||||
// Params of the processor constructor.
|
// Params of the processor constructor.
|
||||||
|
@ -60,7 +60,7 @@ type (
|
||||||
Log *logger.Logger
|
Log *logger.Logger
|
||||||
PoolSize int
|
PoolSize int
|
||||||
NeoFSContract util.Uint160
|
NeoFSContract util.Uint160
|
||||||
NeoFSIDClient *neofsid.Client
|
NeoFSIDClient *frostfsid.Client
|
||||||
BalanceClient *balance.Client
|
BalanceClient *balance.Client
|
||||||
NetmapClient *nmClient.Client
|
NetmapClient *nmClient.Client
|
||||||
MorphClient *client.Client
|
MorphClient *client.Client
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package neofsid
|
package frostfsid
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
|
@ -1,4 +1,4 @@
|
||||||
package neofsid
|
package frostfsid
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
|
@ -1,4 +1,4 @@
|
||||||
package neofsid
|
package frostfsid
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"crypto/elliptic"
|
"crypto/elliptic"
|
Loading…
Reference in New Issue