Merge pull request #14 from mrkh995/hotfix/NftItem-forwardpayload

Modified createTransferBody to add support for text comment as forwardpayload
olifanton · Jun 17, 2024 · e39b5ed · e39b5ed
2 parents b1e0671 + e63d10c
commit e39b5ed
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/Olifanton/Ton/Contracts/Nft/NftItem.php b/src/Olifanton/Ton/Contracts/Nft/NftItem.php
@@ -68,12 +68,18 @@ public static function createTransferBody(NftTransferOptions $options): Cell
                 ->writeAddress($options->newOwnerAddress)
                 ->writeAddress($options->responseAddress)
                 ->writeBit(false)
-                ->writeCoins($options->forwardAmount ?? BigInteger::zero())
-                ->writeBit(false);
-
-            if ($options->forwardPayload) {
-                $bodyBuilder->writeBytes($options->forwardPayload);
-            }
+                ->writeCoins($options->forwardAmount ?? BigInteger::zero());
+
+                if($options->forwardPayload){
+                    if($options->forwardPayload instanceof Cell){
+                        $bodyBuilder->writeMaybeRef($options->forwardPayload);
+                    }else{
+                        $bodyBuilder->writeBit(false)
+                        ->writeBytes($options->forwardPayload);
+                    }
+                }else {
+                    $bodyBuilder->writeBit(false);
+                }
 
             return $bodyBuilder->cell();
         // @codeCoverageIgnoreStart

diff --git a/src/Olifanton/Ton/Contracts/Nft/NftTransferOptions.php b/src/Olifanton/Ton/Contracts/Nft/NftTransferOptions.php
@@ -4,6 +4,7 @@
 
 use Brick\Math\BigInteger;
 use Olifanton\Interop\Address;
+use Olifanton\Interop\Boc\Cell;
 use Olifanton\TypedArrays\Uint8Array;
 
 class NftTransferOptions
@@ -12,7 +13,7 @@ public function __construct(
         public readonly Address $newOwnerAddress,
         public readonly ?Address $responseAddress = null,
         public readonly ?BigInteger $forwardAmount = null,
-        public readonly ?Uint8Array $forwardPayload = null,
+        public readonly null|Cell|Uint8Array $forwardPayload = null,
         public readonly int $queryId = 0,
     ) {}
 }