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

fix: handle missing chequebook in addresses command #534

Merged
merged 2 commits into from
Sep 16, 2024
Merged

fix: handle missing chequebook in addresses command #534

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66b48dc
fix: handle missing chequebook in addresses command
Cafe137 Sep 16, 2024
b8a1214
style: add newline
Cafe137 Sep 16, 2024
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
34 changes: 25 additions & 9 deletions src/command/addresses.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { NodeAddresses } from '@ethersphere/bee-js'
import { ChequebookAddressResponse, NodeAddresses } from '@ethersphere/bee-js'
import { Optional } from 'cafe-utility'
import chalk from 'chalk'
import { LeafCommand } from 'furious-commander'
import { createKeyValue } from '../utils/text'
Expand All @@ -11,13 +12,23 @@ export class Addresses extends RootCommand implements LeafCommand {

public nodeAddresses!: NodeAddresses

public chequebookAddress!: string

public async run(): Promise<void> {
await super.init()

this.nodeAddresses = await this.bee.getNodeAddresses()
this.chequebookAddress = (await this.bee.getChequebookAddress()).chequebookAddress
const wrappedChequebookAddress = await this.bee
.getChequebookAddress()
.then(x => {
return Optional.of(x)
})
.catch(() => {
this.console.error('Could not fetch chequebook address')
this.console.error('This is expected if chequebook-enable: false is set in the configuration')
this.console.error('or when the Bee node is still syncing with the blockchain')
this.console.log('')

return Optional.empty<ChequebookAddressResponse>()
})

const longest = 'PSS Public Key'.length
this.console.log(chalk.bold('Node Addresses'))
Expand All @@ -27,16 +38,21 @@ export class Addresses extends RootCommand implements LeafCommand {
this.console.log(createKeyValue('PSS Public Key', this.nodeAddresses.pssPublicKey, longest))
this.console.log(createKeyValue('Public Key', this.nodeAddresses.publicKey, longest))
this.console.log(createKeyValue('Underlay', this.nodeAddresses.underlay.join(' '), longest))
this.console.log('')
this.console.log(chalk.bold('Chequebook Address'))
this.console.divider()
this.console.log(this.chequebookAddress)

wrappedChequebookAddress.ifPresent(chequebookAddress => {
this.console.log('')
this.console.log(chalk.bold('Chequebook Address'))
this.console.divider()
this.console.log(chequebookAddress.chequebookAddress)
})

this.console.quiet('Ethereum ' + this.nodeAddresses.ethereum)
this.console.quiet('Overlay ' + this.nodeAddresses.overlay)
this.console.quiet('PSS_Public_Key ' + this.nodeAddresses.pssPublicKey)
this.console.quiet('Public_Key ' + this.nodeAddresses.publicKey)
this.console.quiet('Underlay ' + this.nodeAddresses.underlay)
this.console.quiet('Chequebook ' + this.chequebookAddress)
wrappedChequebookAddress.ifPresent(chequebookAddress => {
this.console.quiet('Chequebook ' + chequebookAddress.chequebookAddress)
})
}
}
Loading