Merge pull request #255 from xssnick/dev-v19

v1.10.0

Author: xssnick

README.md

@@ -4,7 +4,7 @@
 
 [![Based on TON][ton-svg]][ton]
 [![Telegram Channel][tgc-svg]][tg-channel]
-![Coverage](https://img.shields.io/badge/Coverage-73.8%25-brightgreen)
+![Coverage](https://img.shields.io/badge/Coverage-73.5%25-brightgreen)
 
 Golang library for interacting with TON blockchain.
 

adnl/adnl.go

@@ -146,6 +146,24 @@ func (c *Channel) process(buf []byte) error {
 
 func (a *ADNL) processPacket(packet *PacketContent, ch *Channel) (err error) {
 	a.mx.Lock()
+
+	if packet.DstReinitDate != nil && *packet.DstReinitDate > 0 && *packet.DstReinitDate < a.reinitTime {
+		if packet.ReinitDate != nil {
+			a.dstReinit = *packet.ReinitDate
+		}
+		a.mx.Unlock()
+
+		buf, err := a.buildRequest(ch, MessageNop{})
+		if err != nil {
+			return fmt.Errorf("failed to create packet: %w", err)
+		}
+		if err = a.send(context.Background(), buf); err != nil {
+			return fmt.Errorf("failed to send ping reinit: %w", err)
+		}
+
+		return nil
+	}
+
 	seqno := uint64(*packet.Seqno)
 	a.lastReceiveAt = time.Now()
 
@@ -161,17 +179,14 @@ func (a *ADNL) processPacket(packet *PacketContent, ch *Channel) (err error) {
 		a.confirmSeqno = seqno
 	}
 
-	if packet.ReinitDate != nil && *packet.ReinitDate > a.dstReinit {
+	if (packet.ReinitDate != nil && *packet.ReinitDate > a.dstReinit) &&
+		(packet.DstReinitDate != nil && *packet.DstReinitDate == a.reinitTime) {
 		// reset their seqno even if it is lower,
 		// because other side could lose counter
 		a.confirmSeqno = seqno
 		a.loss = 0
 
-		// a.dstReinit = *packet.ReinitDate
-		// a.seqno = 0
-		//	a.channel = nil
-		//	a.confirmSeqno = 0
-		//	a.reinitTime = a.dstReinit
+		a.dstReinit = *packet.ReinitDate
 	}
 
 	if packet.RecvPriorityAddrListVersion != nil {
@@ -329,6 +344,8 @@ func (a *ADNL) processMessage(message any, ch *Channel) error {
 				return fmt.Errorf("failed to handle custom message: %w", err)
 			}
 		}
+	case MessageNop:
+		return nil
 	default:
 		return fmt.Errorf("skipped unprocessable message of type %s", reflect.TypeOf(message).String())
 	}

adnl/gateway.go

@@ -279,7 +279,7 @@ func (g *Gateway) listen(rootId []byte) {
 		g.mx.RUnlock()
 
 		if proc == nil {
-			Logger("no processor for ADNL packet from", hex.EncodeToString(id))
+			Logger("no processor for ADNL packet from", addr.String(), hex.EncodeToString(id))
 			continue
 		}
 
@@ -384,18 +384,17 @@ func (g *Gateway) registerClient(addr net.Addr, key ed25519.PublicKey, id string
 			closer:       ch.adnl.Close,
 		}
 		g.mx.Unlock()
+	})
 
-		if oldId == "" { // connection = first channel initialisation
-			connHandler := g.connHandler
-			if connHandler != nil {
-				err := connHandler(peer)
-				if err != nil {
-					// close connection if connection handler reports an error
-					ch.adnl.Close()
-				}
+	connHandler := g.connHandler
+	if connHandler != nil {
+		go func() {
+			if err := connHandler(peer); err != nil {
+				// close connection if connection handler reports an error
+				a.Close()
 			}
-		}
-	})
+		}()
+	}
 
 	return peer, nil
 }

adnl/packet.go

@@ -162,9 +162,9 @@ func parsePacket(data []byte) (_ *PacketContent, err error) {
 		data = data[4:]
 		packet.ReinitDate = &reinit
 
-		reinit = int32(binary.LittleEndian.Uint32(data))
+		dstReinit := int32(binary.LittleEndian.Uint32(data))
 		data = data[4:]
-		packet.DstReinitDate = &reinit
+		packet.DstReinitDate = &dstReinit
 	}
 
 	if flags&_FlagSignature != 0 {

adnl/rldp/client.go

@@ -357,6 +357,9 @@ func (r *RLDP) sendMessageParts(ctx context.Context, transferId, data []byte) er
 
 		if symbolsSent > fastSymbols {
 			x := (symbolsSent - fastSymbols) / 2
+			if x > 70 { // 7 ms max delay
+				x = 70
+			}
 
 			select {
 			case <-ctx.Done():
@@ -365,7 +368,7 @@ func (r *RLDP) sendMessageParts(ctx context.Context, transferId, data []byte) er
 			case <-ch:
 				// we got complete from receiver, finish sending
 				return nil
-			case <-time.After(time.Duration(x) * _PacketWaitTime):
+			case <-time.After(time.Duration(x) * (time.Millisecond / 10)):
 				// send additional FEC recovery parts until complete
 			}
 		}

adnl/rldp/client_test.go

@@ -377,10 +377,14 @@ func TestRDLP_sendMessageParts(t *testing.T) {
 			}
 
 			decoded, receivData, err := tDecoder.Decode()
-			if err != nil || decoded != true {
+			if err != nil {
 				t.Fatal("failed to decode received test data, err: ", err)
 			}
 
+			if decoded != true {
+				return nil
+			}
+
 			if !bytes.Equal(data, receivData) {
 				t.Fatal("bad data received in 'sendCustomMessage'")
 			}
@@ -479,10 +483,14 @@ func TestRLDP_DoQuery(t *testing.T) {
 			}
 
 			decoded, receivData, err := tDecoder.Decode()
-			if err != nil || decoded != true {
+			if err != nil {
 				t.Fatal("failed to decode received test data, err: ", err)
 			}
 
+			if decoded != true {
+				return nil
+			}
+
 			var checkReq Query
 			_, err = tl.Parse(&checkReq, receivData, true)
 			if err != nil {
@@ -568,10 +576,14 @@ func TestRLDP_SendAnswer(t *testing.T) {
 			}
 
 			decoded, receivData, err := tDecoder.Decode()
-			if err != nil || decoded != true {
+			if err != nil {
 				t.Fatal("failed to decode received test data, err: ", err)
 			}
 
+			if decoded != true {
+				return nil
+			}
+
 			var checkAnswer Answer
 			_, err = tl.Parse(&checkAnswer, receivData, true)
 			if err != nil {

adnl/rldp/http/client.go

@@ -112,7 +112,7 @@ func (t *Transport) connectRLDP(ctx context.Context, key ed25519.PublicKey, addr
 	}
 
 	rCap := GetCapabilities{
-		Capabilities: CapabilityRLDP2,
+		Capabilities: 0,
 	}
 
 	var caps Capabilities
@@ -126,7 +126,7 @@ func (t *Transport) connectRLDP(ctx context.Context, key ed25519.PublicKey, addr
 		switch query.Data.(type) {
 		case GetCapabilities:
 			ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-			err := a.Answer(ctx, query.ID, &Capabilities{Value: CapabilityRLDP2})
+			err := a.Answer(ctx, query.ID, &Capabilities{Value: 0})
 			cancel()
 			if err != nil {
 				return fmt.Errorf("failed to send capabilities answer: %w", err)
@@ -284,7 +284,7 @@ func (t *Transport) RoundTrip(request *http.Request) (_ *http.Response, err erro
 	req := Request{
 		ID:      qid,
 		Method:  request.Method,
-		URL:     request.URL.String(),
+		URL:     request.URL.RequestURI(),
 		Version: "HTTP/1.1",
 		Headers: []Header{
 			{

adnl/rldp/http/server.go

@@ -157,7 +157,7 @@ func (s *Server) ListenAndServe(listenAddr string) error {
 			switch query.Data.(type) {
 			case GetCapabilities:
 				ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-				err := client.Answer(ctx, query.ID, &Capabilities{Value: CapabilityRLDP2})
+				err := client.Answer(ctx, query.ID, &Capabilities{Value: 0}) // CapabilityRLDP2
 				cancel()
 				if err != nil {
 					return fmt.Errorf("failed to send capabilities answer: %w", err)
@@ -236,11 +236,15 @@ func (s *Server) handle(client RLDP, adnlId, addr string) func(transferId []byte
 			if err != nil {
 				return fmt.Errorf("failed to parse url `%s`: %w", uri, err)
 			}
+			uri.Scheme = "http"
 
 			contentLen := int64(-1)
 			headers := http.Header{}
 			for _, header := range req.Headers {
-				if header.Name == "Content-Length" {
+				name := http.CanonicalHeaderKey(header.Name)
+				if name == "Host" {
+					uri.Host = header.Value
+				} else if name == "Content-Length" {
 					contentLen, err = strconv.ParseInt(header.Value, 10, 64)
 					if err != nil {
 						return fmt.Errorf("failed to parse content len `%s`: %w", header.Value, err)
@@ -250,7 +254,8 @@ func (s *Server) handle(client RLDP, adnlId, addr string) func(transferId []byte
 						return fmt.Errorf("failed to parse content len: should be >= 0")
 					}
 				}
-				headers[header.Name] = append(headers[header.Name], header.Value)
+
+				headers[name] = append(headers[name], header.Value)
 			}
 			headers.Set("X-Adnl-Ip", netAddr.IP.String())
 			headers.Set("X-Adnl-Id", adnlId)

example/nft-info/main.go

@@ -44,7 +44,7 @@ func main() {
 		case *nft.ContentOffchain:
 			fmt.Println("    content offchain :", content.URI)
 		case *nft.ContentOnchain:
-			fmt.Println("    content onchain  :", content.Name)
+			fmt.Println("    content onchain  :", content.GetAttribute("name"))
 		}
 		fmt.Println("    owner            :", collectionData.OwnerAddress.String())
 		fmt.Println("    minted items num :", collectionData.NextItemIndex)
@@ -69,7 +69,7 @@ func main() {
 				fmt.Println("    full content :", nftContent.(*nft.ContentOffchain).URI)
 			}
 		case *nft.ContentOnchain:
-			fmt.Println("    content name :", content.Name)
+			fmt.Println("    content name :", content.GetAttribute("name"))
 		}
 	} else {
 		fmt.Println("    empty content")

tlb/coins.go

@@ -222,3 +222,15 @@ func (g *Coins) UnmarshalJSON(data []byte) error {
 
 	return nil
 }
+
+func (g *Coins) Compare(coins *Coins) int {
+	if g.decimals != coins.decimals {
+		panic("invalid comparsion")
+	}
+
+	return g.Nano().Cmp(coins.Nano())
+}
+
+func (g *Coins) Decimals() int {
+	return g.decimals
+}