fix: NetworkInfo model

examples/main.go

@@ -0,0 +1,42 @@
+package main
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/rpc"
+	api "github.com/gateway-fm/near-api-go"
+	"github.com/gateway-fm/near-api-go/config"
+)
+
+func main() {
+	rpc, err := rpc.DialContext(context.Background(), "https://rpc.mainnet.near.org")
+	if err != nil {
+		panic(err)
+	}
+
+	cfg := &config.Config{
+		RPCClient: rpc,
+		NetworkID: "mainnet",
+	}
+
+	apiN, err := api.NewClient(cfg)
+	if err != nil {
+		panic(err)
+	}
+
+	status, err := apiN.NodeStatus(context.Background())
+	if err != nil {
+		panic(err)
+	}
+
+	fmt.Println(status.ChainID)
+
+	netInfo, err := apiN.NetworkInfo(context.Background())
+	if err != nil {
+		panic(err)
+	}
+
+	fmt.Println(netInfo.NumActivePeers)
+	fmt.Println(netInfo.ReceivedBytesPerSec)
+}

models/network_structs.go

@@ -12,28 +12,22 @@ import (
 
 // NetworkInfo holds network information
 type NetworkInfo struct {
-	ActivePeers         []FullPeerInfo  `json:"active_peers"`
+	ActivePeers         []*PeerInfo     `json:"active_peers"`
 	NumActivePeers      uint            `json:"num_active_peers"`
 	PeerMaxCount        uint32          `json:"peer_max_count"`
-	HighestHeightPeers  []FullPeerInfo  `json:"highest_height_peers"`
+	HighestHeightPeers  []*PeerInfo     `json:"highest_height_peers"`
 	SentBytesPerSec     uint64          `json:"sent_bytes_per_sec"`
 	ReceivedBytesPerSec uint64          `json:"received_bytes_per_sec"`
-	KnownProducers      []KnownProducer `json:"known_producers"`
-	MetricRecorder      MetricRecorder  `json:"metric_recorder"`
+	KnownProducers      []*PeerInfo     `json:"known_producers"`
+	MetricRecorder      *MetricRecorder `json:"metric_recorder"`
 	PeerCounter         uint            `json:"peer_counter"`
 }
 
-type FullPeerInfo struct {
-	PeerInfo  PeerInfo      `json:"peer_info"`
-	ChainInfo PeerChainInfo `json:"chain_info"`
-	EdgeInfo  EdgeInfo      `json:"edge_info"`
-}
-
 // PeerInfo holds peer information
 type PeerInfo struct {
-	ID        key.PeerID       `json:"id"`
-	Addr      *string          `json:"addr"`
-	AccountID *types.AccountID `json:"account_id"`
+	ID        string          `json:"id"`
+	Addr      string          `json:"addr"`
+	AccountID types.AccountID `json:"account_id"`
 }
 
 // PeerChainInfo contains peer chain information. This is derived from PeerCHainInfoV2 in nearcore

types/balance_test.go

@@ -5,7 +5,7 @@ import (
 
 	fuzz "github.com/google/gofuzz"
 
-	. "github.com/eteu-technologies/near-api-go/pkg/types"
+	. "github.com/gateway-fm/near-api-go/pkg/types"
 )
 
 func TestNEARToYocto(t *testing.T) {

types/hash/crypto_hash.go

@@ -20,7 +20,7 @@ func (c *CryptoHash) UnmarshalJSON(b []byte) error {
 
 	data, err := base58.Decode(string(s))
 	if err != nil {
-		return err
+		return fmt.Errorf("decode base58Hash: %w", err)
 	}
 
 	if l := len(data); l != sha256.Size {
@@ -48,7 +48,7 @@ func NewCryptoHash(data []byte) CryptoHash {
 func NewCryptoHashFromBase58(blob string) (ch CryptoHash, err error) {
 	bytes, err := base58.Decode(blob)
 	if err != nil {
-		return
+		return [sha256.Size]byte{}, fmt.Errorf("decode base58Hash: %w", err)
 	}
 
 	if len(bytes) != sha256.Size {

types/key/key_pair.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/mr-tron/base58"
 
-	"github.com/eteu-technologies/near-api-go/pkg/types/signature"
+	"github.com/gateway-fm/near-api-go/types/signature"
 )
 
 type KeyPair struct {

types/key/public_key.go

@@ -5,10 +5,11 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"strings"
 
 	"github.com/mr-tron/base58"
 
-	"github.com/eteu-technologies/near-api-go/pkg/types/signature"
+	"github.com/gateway-fm/near-api-go/types/signature"
 )
 
 // TODO: SECP256K1
@@ -36,9 +37,17 @@ func (p *PublicKey) UnmarshalJSON(b []byte) error {
 		return err
 	}
 
+	fmt.Println(s)
+
+	keyParts := strings.Split(s, ":")
+
+	if len(keyParts) > 1 {
+		s = keyParts[1]
+	}
+
 	dec, err := base58.Decode(s)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to decode public key: %w", err)
 	}
 
 	*p = PublicKey{}

types/key/public_key_test.go

@@ -3,7 +3,7 @@ package key_test
 import (
 	"testing"
 
-	"github.com/eteu-technologies/near-api-go/pkg/types/key"
+	"github.com/gateway-fm/near-api-go/types/key"
 )
 
 func TestED25519Key(t *testing.T) {