Skip to content

v1.10.1 #257

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
merged 4 commits into from
Sep 18, 2024
Merged

v1.10.1 #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10bca54
check proof for not active account
akos-tk Sep 16, 2024
568db61
Merge pull request #256 from akos-tk/check-proof-for-nonexist
xssnick Sep 18, 2024
4f0f4c9
Merge 568db61c12c86167af957e6eb56e7e4facd80fd8 into d4afeb1394d410c19…
xssnick Sep 18, 2024
3d2d643
Updated coverage badge
Sep 18, 2024
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[![Based on TON][ton-svg]][ton]
[![Telegram Channel][tgc-svg]][tg-channel]
![Coverage](https://img.shields.io/badge/Coverage-73.5%25-brightgreen)
![Coverage](https://img.shields.io/badge/Coverage-73.6%25-brightgreen)

Golang library for interacting with TON blockchain.

Expand Down
15 changes: 9 additions & 6 deletions ton/getstate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package ton
import (
"bytes"
"context"
"errors"
"fmt"
"github.com/xssnick/tonutils-go/address"
"github.com/xssnick/tonutils-go/tl"
Expand Down Expand Up @@ -58,12 +59,6 @@ func (c *APIClient) GetAccount(ctx context.Context, block *BlockIDExt, addr *add
return nil, fmt.Errorf("response with incorrect master block")
}

if t.State == nil {
return &tlb.Account{
IsActive: false,
}, nil
}

if t.Proof == nil {
return nil, fmt.Errorf("no proof")
}
Expand All @@ -87,9 +82,17 @@ func (c *APIClient) GetAccount(ctx context.Context, block *BlockIDExt, addr *add
}

shardAcc, balanceInfo, err := CheckAccountStateProof(addr, block, t.Proof, t.ShardProof, shardHash, c.proofCheckPolicy == ProofCheckPolicyUnsafe)
if errors.Is(err, ErrNoAddrInProof) && t.State == nil {
return &tlb.Account{
IsActive: false,
}, nil
}
if err != nil {
return nil, fmt.Errorf("failed to check acc state proof: %w", err)
}
if t.State == nil {
return nil, fmt.Errorf("state must be presented")
}

if !bytes.Equal(shardAcc.Account.Hash(0), t.State.Hash()) {
return nil, fmt.Errorf("proof hash not match state account hash")
Expand Down