Merge pull request #171 from bsv-blockchain/fix/atomic-beef

Fix atomic beef

Author: shruggr

CHANGELOG.md

@@ -3,9 +3,9 @@
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Table of Contents
-
-- [1.1.25 - 2025-05-09](#1124---2025-05-09)
-- [1.1.24 - 2025-04-24](#1123---2025-04-29)
+- [1.1.26 - 2025-05-14](#1126---2025-05-14)
+- [1.1.25 - 2025-05-09](#1125---2025-05-09)
+- [1.1.24 - 2025-04-24](#1124---2025-04-29)
 - [1.1.23 - 2025-04-23](#1123---2025-04-23)
 - [1.1.22 - 2025-03-14](#1122---2025-03-14)
 - [1.1.21 - 2025-03-12](#1121---2025-03-12)
@@ -32,6 +32,10 @@ All notable changes to this project will be documented in this file. The format
 - [1.1.0 - 2024-08-19](#110---2024-08-19)
 - [1.0.0 - 2024-06-06](#100---2024-06-06)
 
+## [1.1.26] - 2025-05-14
+  ### Updated
+  - Support AtomicBeef in NewBeefFromBytes
+
 ## [1.1.25] - 2025-05-09
   ### Fix
   - nill pointer

transaction/beef.go

@@ -103,8 +103,6 @@ func readBeefTx(reader *bytes.Reader, BUMPs []*MerklePath) (*map[string]*BeefTx,
 				sourceTxid := input.SourceTXID.String()
 				if sourceObj, ok := txs[sourceTxid]; ok {
 					input.SourceTransaction = sourceObj.Transaction
-				} else if beefTx.Transaction.MerklePath == nil && beefTx.KnownTxID == nil {
-					return nil, fmt.Errorf("reference to unknown txid in bump: %s", sourceTxid)
 				}
 			}
 
@@ -117,8 +115,12 @@ func readBeefTx(reader *bytes.Reader, BUMPs []*MerklePath) (*map[string]*BeefTx,
 }
 
 func NewBeefFromBytes(beef []byte) (*Beef, error) {
-	reader := bytes.NewReader(beef)
-
+	var reader *bytes.Reader
+	if binary.LittleEndian.Uint32(beef[:4]) == ATOMIC_BEEF {
+		reader = bytes.NewReader(beef[36:])
+	} else {
+		reader = bytes.NewReader(beef)
+	}
 	version, err := readVersion(reader)
 	if err != nil {
 		return nil, err

transaction/beef_test.go

@@ -96,9 +96,19 @@ func TestNewBEEFFromBytes(t *testing.T) {
 	require.Len(t, beef.BUMPs, 3, "BUMPs length does not match")
 	require.Len(t, beef.Transactions, 3, "Transactions length does not match")
 
+	tx := beef.FindTransaction("b1fc0f44ba629dbdffab9e34fcc4faf9dbde3560a7365c55c26fe4daab052aac")
+	require.NotNil(t, tx, "Transaction not found in BEEF data")
+
+	atomic, err := tx.AtomicBEEF(false)
+	require.NoError(t, err, "AtomicBEEF method failed")
+
+	_, err = NewTransactionFromBEEF(atomic)
+	require.NoError(t, err, "NewTransactionFromBEEF method failed")
+
 	binary.LittleEndian.PutUint32(beefBytes[0:4], 0xdeadbeef)
 	_, err = NewTransactionFromBEEF(beefBytes)
 	require.Error(t, err, "use NewBeefFromBytes to parse anything which isn't V1 BEEF or AtomicBEEF")
+
 }
 
 func TestBeefTransactionFinding(t *testing.T) {