move config to ton package

liteapi/client.go

@@ -744,7 +744,7 @@ func (c *Client) GetConfigAll(ctx context.Context, mode ConfigMode) (tlb.ConfigP
 	if err != nil {
 		return tlb.ConfigParams{}, err
 	}
-	return decodeConfigParams(res.ConfigProof)
+	return ton.DecodeConfigParams(res.ConfigProof)
 }
 
 func (c *Client) GetConfigAllRaw(ctx context.Context, mode ConfigMode) (liteclient.LiteServerConfigInfoC, error) {
@@ -775,28 +775,7 @@ func (c *Client) GetConfigParams(ctx context.Context, mode ConfigMode, paramList
 	if err != nil {
 		return tlb.ConfigParams{}, err
 	}
-	return decodeConfigParams(r.ConfigProof)
-}
-
-func decodeConfigParams(b []byte) (tlb.ConfigParams, error) {
-	cells, err := boc.DeserializeBoc(b)
-	if err != nil {
-		return tlb.ConfigParams{}, err
-	}
-	if len(cells) != 1 {
-		return tlb.ConfigParams{}, boc.ErrNotSingleRoot
-	}
-	var proof struct {
-		Proof tlb.MerkleProof[tlb.ShardStateUnsplit]
-	}
-	err = tlb.Unmarshal(cells[0], &proof)
-	if err != nil {
-		return tlb.ConfigParams{}, err
-	}
-	if proof.Proof.VirtualRoot.ShardStateUnsplit.Custom.Exists {
-		return proof.Proof.VirtualRoot.ShardStateUnsplit.Custom.Value.Value.Config, nil
-	}
-	return tlb.ConfigParams{}, fmt.Errorf("empty Custom field")
+	return ton.DecodeConfigParams(r.ConfigProof)
 }
 
 func (c *Client) GetValidatorStats(

liteapi/config.go → ton/config.go

@@ -1,12 +1,11 @@
-package liteapi
+package ton
 
 import (
 	"fmt"
 	"reflect"
 
 	"github.com/tonkeeper/tongo/boc"
 	"github.com/tonkeeper/tongo/tlb"
-	"github.com/tonkeeper/tongo/ton"
 )
 
 // BlockchainConfig represents the TON blockchain configuration stored inside key blocks.
@@ -71,39 +70,39 @@ type BlockchainConfig struct {
 	ConfigParamNegative999 *boc.Cell `json:",omitempty"`
 }
 
-func (conf *BlockchainConfig) ConfigAddr() (ton.AccountID, bool) {
+func (conf *BlockchainConfig) ConfigAddr() (AccountID, bool) {
 	if conf.ConfigParam0 != nil {
-		return ton.AccountID{Workchain: -1, Address: conf.ConfigParam0.ConfigAddr}, true
+		return AccountID{Workchain: -1, Address: conf.ConfigParam0.ConfigAddr}, true
 	}
-	return ton.AccountID{}, false
+	return AccountID{}, false
 }
 
-func (conf *BlockchainConfig) ElectorAddr() (ton.AccountID, bool) {
+func (conf *BlockchainConfig) ElectorAddr() (AccountID, bool) {
 	if conf.ConfigParam1 != nil {
-		return ton.AccountID{Workchain: -1, Address: conf.ConfigParam1.ElectorAddr}, true
+		return AccountID{Workchain: -1, Address: conf.ConfigParam1.ElectorAddr}, true
 	}
-	return ton.AccountID{}, false
+	return AccountID{}, false
 }
 
-func (conf *BlockchainConfig) MinterAddr() (ton.AccountID, bool) {
+func (conf *BlockchainConfig) MinterAddr() (AccountID, bool) {
 	if conf.ConfigParam2 != nil {
-		return ton.AccountID{Workchain: -1, Address: conf.ConfigParam2.MinterAddr}, true
+		return AccountID{Workchain: -1, Address: conf.ConfigParam2.MinterAddr}, true
 	}
-	return ton.AccountID{}, false
+	return AccountID{}, false
 }
 
-func (conf *BlockchainConfig) FeeCollectorAddr() (ton.AccountID, bool) {
+func (conf *BlockchainConfig) FeeCollectorAddr() (AccountID, bool) {
 	if conf.ConfigParam3 != nil {
-		return ton.AccountID{Workchain: -1, Address: conf.ConfigParam3.FeeCollectorAddr}, true
+		return AccountID{Workchain: -1, Address: conf.ConfigParam3.FeeCollectorAddr}, true
 	}
-	return ton.AccountID{}, false
+	return AccountID{}, false
 }
 
-func (conf *BlockchainConfig) DnsRootAddr() (ton.AccountID, bool) {
+func (conf *BlockchainConfig) DnsRootAddr() (AccountID, bool) {
 	if conf.ConfigParam4 != nil {
-		return ton.AccountID{Workchain: -1, Address: conf.ConfigParam4.DnsRootAddr}, true
+		return AccountID{Workchain: -1, Address: conf.ConfigParam4.DnsRootAddr}, true
 	}
-	return ton.AccountID{}, false
+	return AccountID{}, false
 }
 
 func (conf *BlockchainConfig) MandatoryParams() []int {
@@ -160,3 +159,24 @@ func ConvertBlockchainConfig(params tlb.ConfigParams) (*BlockchainConfig, error)
 	}
 	return conf, nil
 }
+
+func DecodeConfigParams(b []byte) (tlb.ConfigParams, error) {
+	cells, err := boc.DeserializeBoc(b)
+	if err != nil {
+		return tlb.ConfigParams{}, err
+	}
+	if len(cells) != 1 {
+		return tlb.ConfigParams{}, boc.ErrNotSingleRoot
+	}
+	var proof struct {
+		Proof tlb.MerkleProof[tlb.ShardStateUnsplit]
+	}
+	err = tlb.Unmarshal(cells[0], &proof)
+	if err != nil {
+		return tlb.ConfigParams{}, err
+	}
+	if proof.Proof.VirtualRoot.ShardStateUnsplit.Custom.Exists {
+		return proof.Proof.VirtualRoot.ShardStateUnsplit.Custom.Value.Value.Config, nil
+	}
+	return tlb.ConfigParams{}, fmt.Errorf("empty Custom field")
+}

liteapi/config_test.go → ton/config_test.go

@@ -1,4 +1,4 @@
-package liteapi
+package ton
 
 import (
 	"encoding/json"
@@ -25,9 +25,9 @@ func TestConvertBlockchainConfig(t *testing.T) {
 			if err != nil {
 				t.Fatalf("os.ReadFile() failed: %v", err)
 			}
-			params, err := decodeConfigParams(configProof)
+			params, err := DecodeConfigParams(configProof)
 			if err != nil {
-				t.Fatalf("decodeConfigParams() failed: %v", err)
+				t.Fatalf("DecodeConfigParams() failed: %v", err)
 			}
 			config, err := ConvertBlockchainConfig(params)
 			if err != nil {