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

Add some Inner Ring UX improvements #2673

Merged
merged 5 commits into from
Jan 18, 2024
Merged

Add some Inner Ring UX improvements #2673

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2ef403
config/ir: Adjust `morph.consensus` section docs
cthulhu-rider Dec 8, 2023
581787f
ir: Improve feedback on consensus misconfiguration
cthulhu-rider Dec 8, 2023
ad8a8f8
ir: Deduplicate FS chain config path literals in the code
cthulhu-rider Dec 8, 2023
d671151
ir: Clarify context of scope setup errors
cthulhu-rider Dec 8, 2023
12f95f2
deploy: Write validator->committee GAS/NEO transfer to log
cthulhu-rider Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pkg/morph/client/nns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,26 +101,26 @@ func (c *Client) InitSidechainScope() error {
func autoSidechainScope(ws *rpcclient.WSClient, conf *cfg) error {
nnsHash, err := nns.InferHash(ws)
if err != nil {
return fmt.Errorf("InferHash: %w", err)
return fmt.Errorf("resolve NNS contract address: %w", err)
}

var nnsReader = nns.NewReader(invoker.New(ws, nil), nnsHash)

balanceHash, err := nnsReader.ResolveFSContract(nns.NameBalance)
if err != nil {
return fmt.Errorf("resolving balance: %w", err)
return fmt.Errorf("resolve Balance contract address by NNS domain name %q: %w", nns.NameBalance, err)
}
cntHash, err := nnsReader.ResolveFSContract(nns.NameContainer)
if err != nil {
return fmt.Errorf("resolving container: %w", err)
return fmt.Errorf("resolve Container contract address by NNS domain name %q: %w", nns.NameContainer, err)
Copy link
Member

Choose a reason for hiding this comment

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

"NNS domain name" confuses me. seems like it is about some ".nns"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

not sure i got ur point, pls write message text u suggest

}
netmapHash, err := nnsReader.ResolveFSContract(nns.NameNetmap)
if err != nil {
return fmt.Errorf("resolving netmap: %w", err)
return fmt.Errorf("resolve Netmap contract address by NNS domain name %q: %w", nns.NameNetmap, err)
}
neofsIDHash, err := nnsReader.ResolveFSContract(nns.NameNeoFSID)
if err != nil {
return fmt.Errorf("resolving neofsid: %w", err)
return fmt.Errorf("resolve NeoFS ID contract address by NNS domain name %q: %w", nns.NameNeoFSID, err)
}

conf.signer = GetUniversalSignerScope(nnsHash, balanceHash, cntHash, netmapHash, neofsIDHash)
Expand Down