From e8115559df1657e20aa8f48dae4ff2587a50cea7 Mon Sep 17 00:00:00 2001 From: Oleg Baranov Date: Fri, 12 Apr 2024 14:07:43 +0400 Subject: [PATCH] Small naming change --- ton/wallet/address.go | 8 ++++---- ton/wallet/seed.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ton/wallet/address.go b/ton/wallet/address.go index fa4d1562..aa999ab0 100644 --- a/ton/wallet/address.go +++ b/ton/wallet/address.go @@ -13,8 +13,8 @@ import ( const DefaultSubwallet = 698983191 -func AddressFromPubKey(key ed25519.PublicKey, spec VersionConfig, subwallet uint32) (*address.Address, error) { - state, err := GetStateInit(key, spec, subwallet) +func AddressFromPubKey(key ed25519.PublicKey, version VersionConfig, subwallet uint32) (*address.Address, error) { + state, err := GetStateInit(key, version, subwallet) if err != nil { return nil, fmt.Errorf("failed to get state: %w", err) } @@ -47,9 +47,9 @@ func GetWalletVersion(account *tlb.Account) Version { return Unknown } -func GetStateInit(pubKey ed25519.PublicKey, spec VersionConfig, subWallet uint32) (*tlb.StateInit, error) { +func GetStateInit(pubKey ed25519.PublicKey, version VersionConfig, subWallet uint32) (*tlb.StateInit, error) { var ver Version - switch v := spec.(type) { + switch v := version.(type) { case Version: ver = v switch ver { diff --git a/ton/wallet/seed.go b/ton/wallet/seed.go index afdba86c..5efcec4d 100644 --- a/ton/wallet/seed.go +++ b/ton/wallet/seed.go @@ -61,11 +61,11 @@ func NewSeedWithPassword(password string) []string { type VersionConfig any -func FromSeed(api TonAPI, seed []string, spec VersionConfig) (*Wallet, error) { - return FromSeedWithPassword(api, seed, "", spec) +func FromSeed(api TonAPI, seed []string, version VersionConfig) (*Wallet, error) { + return FromSeedWithPassword(api, seed, "", version) } -func FromSeedWithPassword(api TonAPI, seed []string, password string, spec VersionConfig) (*Wallet, error) { +func FromSeedWithPassword(api TonAPI, seed []string, password string, version VersionConfig) (*Wallet, error) { // validate seed if len(seed) < 12 { return nil, fmt.Errorf("seed should have at least 12 words") @@ -94,7 +94,7 @@ func FromSeedWithPassword(api TonAPI, seed []string, password string, spec Versi k := pbkdf2.Key(hash, []byte(_Salt), _Iterations, 32, sha512.New) - return FromPrivateKey(api, ed25519.NewKeyFromSeed(k), spec) + return FromPrivateKey(api, ed25519.NewKeyFromSeed(k), version) } var wordsArr = func() []string {