Skip to content

Misc renames for clarity to fields in devnet-sdk and kurtosis-devnet #14705

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

Merged
protolambda merged 2 commits into from
Mar 7, 2025
Merged

Misc renames for clarity to fields in devnet-sdk and kurtosis-devnet #14705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85ef251
Improve address management in kurtosis-devnet and devnet-sdk
teddyknox Mar 7, 2025
5d5e3db
Perform various renames for clarity in kurtosis-devnet and devnet-sdk
teddyknox Mar 7, 2025
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
3 changes: 2 additions & 1 deletion devnet-sdk/book/src/shell.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export ETH_JWT_SECRET=...

```bash
# Enter devnet shell
go run devnet-sdk/shll/cmd/enter/main.go --descriptor devnet.json --chain ...
go run devnet-sdk/shell/cmd/enter/main.go --descriptor devnet.json --chain ...

# Now you can use tools directly
cast block latest
Expand All @@ -72,6 +72,7 @@ exit
## Implementation Details

The shell integration:

1. Reads the descriptor file
2. Sets up environment variables based on the descriptor content
3. Creates a new shell session with the configured environment
Expand Down
36 changes: 18 additions & 18 deletions kurtosis-devnet/pkg/kurtosis/sources/deployer/deployer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const (
defaultWalletsName = "wallets.json"
defaultStateName = "state.json"
defaultGenesisArtifactName = "el_cl_genesis_data"
defaultMnemonicsName = "mnemonics.yaml"
defaultMnemonicName = "mnemonics.yaml"
defaultGenesisNameTemplate = "genesis-{{.ChainID}}.json"
defaultL1GenesisName = "genesis.json"
)
Expand Down Expand Up @@ -71,14 +71,14 @@ type DeployerData struct {
}

type Deployer struct {
enclave string
deployerArtifactName string
walletsName string
stateName string
genesisArtifactName string
mnemonicsName string
l2GenesisNameTemplate string
l1GenesisName string
enclave string
deployerArtifactName string
walletsName string
stateName string
genesisArtifactName string
l1ValidatorMnemonicName string
l2GenesisNameTemplate string
l1GenesisName string
}

type DeployerOption func(*Deployer)
Expand Down Expand Up @@ -109,7 +109,7 @@ func WithGenesisArtifactName(name string) DeployerOption {

func WithMnemonicsName(name string) DeployerOption {
return func(d *Deployer) {
d.mnemonicsName = name
d.l1ValidatorMnemonicName = name
}
}

Expand All @@ -121,14 +121,14 @@ func WithGenesisNameTemplate(name string) DeployerOption {

func NewDeployer(enclave string, opts ...DeployerOption) *Deployer {
d := &Deployer{
enclave: enclave,
deployerArtifactName: defaultDeployerArtifactName,
walletsName: defaultWalletsName,
stateName: defaultStateName,
genesisArtifactName: defaultGenesisArtifactName,
mnemonicsName: defaultMnemonicsName,
l2GenesisNameTemplate: defaultGenesisNameTemplate,
l1GenesisName: defaultL1GenesisName,
enclave: enclave,
deployerArtifactName: defaultDeployerArtifactName,
walletsName: defaultWalletsName,
stateName: defaultStateName,
genesisArtifactName: defaultGenesisArtifactName,
l1ValidatorMnemonicName: defaultMnemonicName,
l2GenesisNameTemplate: defaultGenesisNameTemplate,
l1GenesisName: defaultL1GenesisName,
}

for _, opt := range opts {
Expand Down
6 changes: 3 additions & 3 deletions kurtosis-devnet/pkg/kurtosis/sources/deployer/wallets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ func getMnemonics(r io.Reader) (string, error) {
func (d *Deployer) getL1ValidatorWallets(deployerArtifact *ktfs.Artifact) ([]*Wallet, error) {
mnemonicsBuffer := bytes.NewBuffer(nil)
if err := deployerArtifact.ExtractFiles(
ktfs.NewArtifactFileWriter(d.mnemonicsName, mnemonicsBuffer),
ktfs.NewArtifactFileWriter(d.l1ValidatorMnemonicName, mnemonicsBuffer),
); err != nil {
return nil, err
}

mnemonics, err := getMnemonics(mnemonicsBuffer)
mnemonic, err := getMnemonics(mnemonicsBuffer)
if err != nil {
return nil, err
}

m, _ := devkeys.NewMnemonicDevKeys(mnemonics)
m, _ := devkeys.NewMnemonicDevKeys(mnemonic)
knownWallets := make([]*Wallet, 0)

var keys []devkeys.Key
Expand Down