From cbe0d462afb172b35a035374d433e248354577a9 Mon Sep 17 00:00:00 2001
From: FFS <63802942+ffsolutions@users.noreply.github.com>
Date: Wed, 6 Jul 2022 13:36:53 -0300
Subject: [PATCH] Atomic Transfer Improvements

---
 sdk/_namespace_based/Algorand/kmd.php      | 9 ++++-----
 sdk/algorand.php                           | 8 ++++----
 sdk/codeigniter setup/app/Algorand/kmd.php | 9 ++++-----
 sdk/laravel setup/app/Algorand/kmd.php     | 9 ++++-----
 sdk/lumen setup/app/Algorand/kmd.php       | 9 ++++-----
 sdk/symfony setup/src/Algorand/kmd.php     | 9 ++++-----
 sdk/yii setup/Algorand/kmd.php             | 9 ++++-----
 7 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/sdk/_namespace_based/Algorand/kmd.php b/sdk/_namespace_based/Algorand/kmd.php
index 2cea912..f9e7afa 100644
--- a/sdk/_namespace_based/Algorand/kmd.php
+++ b/sdk/_namespace_based/Algorand/kmd.php
@@ -241,7 +241,7 @@ public function txn_encode($transaction,$opt_msgpack=false){
         if(!empty($out['txn']['grp'])) { $out['txn']['grp']=strval($out['txn']['grp']); }
         if(!empty($out['txn']['lv'])) { $out['txn']['lv']=intval($out['txn']['lv']); }
 
-        if(!empty($out['txn']['note'])) { $out['txn']['note']=utf8_encode(strval($out['txn']['note'])); }
+        if(!empty($out['txn']['note'])) { $out['txn']['note']=$msgpack->pBin(utf8_encode(strval($out['txn']['note']))); }
 
         if(!empty($out['txn']['gp'])) { $out['txn']['gp']=strval($out['txn']['gp']); }
         if(!empty($out['txn']['rekey'])) { $out['txn']['rekey']=b32::decode($out['txn']['rekey']); }
@@ -278,14 +278,13 @@ public function txn_encode($transaction,$opt_msgpack=false){
         if(!empty($out['txn']['apar']['dc'])) { $out['txn']['apar']['dc']=intval($out['txn']['apar']['dc']); }
         if(!empty($out['txn']['apar']['t'])) { $out['txn']['apar']['t']=intval($out['txn']['apar']['t']); }
 
-        //$out['txn']=array_filter($out['txn'], fn($val) => !is_null($val) AND $val !== "" AND $val !==0 AND $val !== false); // PHP 7.4 and later
-        $out['txn']=array_filter($out['txn'], function($val) { return !is_null($val) AND $val !== '' AND $val !==0 AND $val !== false; }); // PHP 7.2 and later
-
+        $out['txn']=array_filter($out['txn'], function($val) { return !is_null($val) AND $val !== '' AND $val !==0 AND $val !== false; }); 
 
         $out=$msgpack->p($out['txn']);
 
-        $out=str_replace("6e6f7465d9","6e6f7465c4",bin2hex($out));
+        $out=bin2hex($out);
         $out=hex2bin($out);
+        
         if($opt_msgpack==false){
             $out=base64_encode($out);
         }
diff --git a/sdk/algorand.php b/sdk/algorand.php
index d5eaf7c..cb0b269 100644
--- a/sdk/algorand.php
+++ b/sdk/algorand.php
@@ -463,7 +463,7 @@ public function txn_encode($transaction,$opt_msgpack=false){
         if(!empty($out['txn']['grp'])) { $out['txn']['grp']=strval($out['txn']['grp']); }
         if(!empty($out['txn']['lv'])) { $out['txn']['lv']=intval($out['txn']['lv']); }
 
-        if(!empty($out['txn']['note'])) { $out['txn']['note']=utf8_encode(strval($out['txn']['note'])); }
+        if(!empty($out['txn']['note'])) { $out['txn']['note']=$msgpack->pBin(utf8_encode(strval($out['txn']['note']))); }
 
         if(!empty($out['txn']['gp'])) { $out['txn']['gp']=strval($out['txn']['gp']); }
         if(!empty($out['txn']['rekey'])) { $out['txn']['rekey']=b32::decode($out['txn']['rekey']); }
@@ -500,13 +500,13 @@ public function txn_encode($transaction,$opt_msgpack=false){
         if(!empty($out['txn']['apar']['dc'])) { $out['txn']['apar']['dc']=intval($out['txn']['apar']['dc']); }
         if(!empty($out['txn']['apar']['t'])) { $out['txn']['apar']['t']=intval($out['txn']['apar']['t']); }
 
-        //$out['txn']=array_filter($out['txn'], fn($val) => !is_null($val) AND $val !== "" AND $val !==0 AND $val !== false); // PHP 7.4 and later
-        $out['txn']=array_filter($out['txn'], function($val) { return !is_null($val) AND $val !== '' AND $val !==0 AND $val !== false; }); // PHP 7.2 and later
+        $out['txn']=array_filter($out['txn'], function($val) { return !is_null($val) AND $val !== '' AND $val !==0 AND $val !== false; }); 
 
         $out=$msgpack->p($out['txn']);
 
-        $out=str_replace("6e6f7465d9","6e6f7465c4",bin2hex($out));
+        $out=bin2hex($out);
         $out=hex2bin($out);
+        
         if($opt_msgpack==false){
             $out=base64_encode($out);
         }
diff --git a/sdk/codeigniter setup/app/Algorand/kmd.php b/sdk/codeigniter setup/app/Algorand/kmd.php
index 2cea912..f9e7afa 100644
--- a/sdk/codeigniter setup/app/Algorand/kmd.php	
+++ b/sdk/codeigniter setup/app/Algorand/kmd.php	
@@ -241,7 +241,7 @@ public function txn_encode($transaction,$opt_msgpack=false){
         if(!empty($out['txn']['grp'])) { $out['txn']['grp']=strval($out['txn']['grp']); }
         if(!empty($out['txn']['lv'])) { $out['txn']['lv']=intval($out['txn']['lv']); }
 
-        if(!empty($out['txn']['note'])) { $out['txn']['note']=utf8_encode(strval($out['txn']['note'])); }
+        if(!empty($out['txn']['note'])) { $out['txn']['note']=$msgpack->pBin(utf8_encode(strval($out['txn']['note']))); }
 
         if(!empty($out['txn']['gp'])) { $out['txn']['gp']=strval($out['txn']['gp']); }
         if(!empty($out['txn']['rekey'])) { $out['txn']['rekey']=b32::decode($out['txn']['rekey']); }
@@ -278,14 +278,13 @@ public function txn_encode($transaction,$opt_msgpack=false){
         if(!empty($out['txn']['apar']['dc'])) { $out['txn']['apar']['dc']=intval($out['txn']['apar']['dc']); }
         if(!empty($out['txn']['apar']['t'])) { $out['txn']['apar']['t']=intval($out['txn']['apar']['t']); }
 
-        //$out['txn']=array_filter($out['txn'], fn($val) => !is_null($val) AND $val !== "" AND $val !==0 AND $val !== false); // PHP 7.4 and later
-        $out['txn']=array_filter($out['txn'], function($val) { return !is_null($val) AND $val !== '' AND $val !==0 AND $val !== false; }); // PHP 7.2 and later
-
+        $out['txn']=array_filter($out['txn'], function($val) { return !is_null($val) AND $val !== '' AND $val !==0 AND $val !== false; }); 
 
         $out=$msgpack->p($out['txn']);
 
-        $out=str_replace("6e6f7465d9","6e6f7465c4",bin2hex($out));
+        $out=bin2hex($out);
         $out=hex2bin($out);
+        
         if($opt_msgpack==false){
             $out=base64_encode($out);
         }
diff --git a/sdk/laravel setup/app/Algorand/kmd.php b/sdk/laravel setup/app/Algorand/kmd.php
index 2cea912..f9e7afa 100644
--- a/sdk/laravel setup/app/Algorand/kmd.php	
+++ b/sdk/laravel setup/app/Algorand/kmd.php	
@@ -241,7 +241,7 @@ public function txn_encode($transaction,$opt_msgpack=false){
         if(!empty($out['txn']['grp'])) { $out['txn']['grp']=strval($out['txn']['grp']); }
         if(!empty($out['txn']['lv'])) { $out['txn']['lv']=intval($out['txn']['lv']); }
 
-        if(!empty($out['txn']['note'])) { $out['txn']['note']=utf8_encode(strval($out['txn']['note'])); }
+        if(!empty($out['txn']['note'])) { $out['txn']['note']=$msgpack->pBin(utf8_encode(strval($out['txn']['note']))); }
 
         if(!empty($out['txn']['gp'])) { $out['txn']['gp']=strval($out['txn']['gp']); }
         if(!empty($out['txn']['rekey'])) { $out['txn']['rekey']=b32::decode($out['txn']['rekey']); }
@@ -278,14 +278,13 @@ public function txn_encode($transaction,$opt_msgpack=false){
         if(!empty($out['txn']['apar']['dc'])) { $out['txn']['apar']['dc']=intval($out['txn']['apar']['dc']); }
         if(!empty($out['txn']['apar']['t'])) { $out['txn']['apar']['t']=intval($out['txn']['apar']['t']); }
 
-        //$out['txn']=array_filter($out['txn'], fn($val) => !is_null($val) AND $val !== "" AND $val !==0 AND $val !== false); // PHP 7.4 and later
-        $out['txn']=array_filter($out['txn'], function($val) { return !is_null($val) AND $val !== '' AND $val !==0 AND $val !== false; }); // PHP 7.2 and later
-
+        $out['txn']=array_filter($out['txn'], function($val) { return !is_null($val) AND $val !== '' AND $val !==0 AND $val !== false; }); 
 
         $out=$msgpack->p($out['txn']);
 
-        $out=str_replace("6e6f7465d9","6e6f7465c4",bin2hex($out));
+        $out=bin2hex($out);
         $out=hex2bin($out);
+        
         if($opt_msgpack==false){
             $out=base64_encode($out);
         }
diff --git a/sdk/lumen setup/app/Algorand/kmd.php b/sdk/lumen setup/app/Algorand/kmd.php
index 2cea912..f9e7afa 100644
--- a/sdk/lumen setup/app/Algorand/kmd.php	
+++ b/sdk/lumen setup/app/Algorand/kmd.php	
@@ -241,7 +241,7 @@ public function txn_encode($transaction,$opt_msgpack=false){
         if(!empty($out['txn']['grp'])) { $out['txn']['grp']=strval($out['txn']['grp']); }
         if(!empty($out['txn']['lv'])) { $out['txn']['lv']=intval($out['txn']['lv']); }
 
-        if(!empty($out['txn']['note'])) { $out['txn']['note']=utf8_encode(strval($out['txn']['note'])); }
+        if(!empty($out['txn']['note'])) { $out['txn']['note']=$msgpack->pBin(utf8_encode(strval($out['txn']['note']))); }
 
         if(!empty($out['txn']['gp'])) { $out['txn']['gp']=strval($out['txn']['gp']); }
         if(!empty($out['txn']['rekey'])) { $out['txn']['rekey']=b32::decode($out['txn']['rekey']); }
@@ -278,14 +278,13 @@ public function txn_encode($transaction,$opt_msgpack=false){
         if(!empty($out['txn']['apar']['dc'])) { $out['txn']['apar']['dc']=intval($out['txn']['apar']['dc']); }
         if(!empty($out['txn']['apar']['t'])) { $out['txn']['apar']['t']=intval($out['txn']['apar']['t']); }
 
-        //$out['txn']=array_filter($out['txn'], fn($val) => !is_null($val) AND $val !== "" AND $val !==0 AND $val !== false); // PHP 7.4 and later
-        $out['txn']=array_filter($out['txn'], function($val) { return !is_null($val) AND $val !== '' AND $val !==0 AND $val !== false; }); // PHP 7.2 and later
-
+        $out['txn']=array_filter($out['txn'], function($val) { return !is_null($val) AND $val !== '' AND $val !==0 AND $val !== false; }); 
 
         $out=$msgpack->p($out['txn']);
 
-        $out=str_replace("6e6f7465d9","6e6f7465c4",bin2hex($out));
+        $out=bin2hex($out);
         $out=hex2bin($out);
+        
         if($opt_msgpack==false){
             $out=base64_encode($out);
         }
diff --git a/sdk/symfony setup/src/Algorand/kmd.php b/sdk/symfony setup/src/Algorand/kmd.php
index 2cea912..f9e7afa 100644
--- a/sdk/symfony setup/src/Algorand/kmd.php	
+++ b/sdk/symfony setup/src/Algorand/kmd.php	
@@ -241,7 +241,7 @@ public function txn_encode($transaction,$opt_msgpack=false){
         if(!empty($out['txn']['grp'])) { $out['txn']['grp']=strval($out['txn']['grp']); }
         if(!empty($out['txn']['lv'])) { $out['txn']['lv']=intval($out['txn']['lv']); }
 
-        if(!empty($out['txn']['note'])) { $out['txn']['note']=utf8_encode(strval($out['txn']['note'])); }
+        if(!empty($out['txn']['note'])) { $out['txn']['note']=$msgpack->pBin(utf8_encode(strval($out['txn']['note']))); }
 
         if(!empty($out['txn']['gp'])) { $out['txn']['gp']=strval($out['txn']['gp']); }
         if(!empty($out['txn']['rekey'])) { $out['txn']['rekey']=b32::decode($out['txn']['rekey']); }
@@ -278,14 +278,13 @@ public function txn_encode($transaction,$opt_msgpack=false){
         if(!empty($out['txn']['apar']['dc'])) { $out['txn']['apar']['dc']=intval($out['txn']['apar']['dc']); }
         if(!empty($out['txn']['apar']['t'])) { $out['txn']['apar']['t']=intval($out['txn']['apar']['t']); }
 
-        //$out['txn']=array_filter($out['txn'], fn($val) => !is_null($val) AND $val !== "" AND $val !==0 AND $val !== false); // PHP 7.4 and later
-        $out['txn']=array_filter($out['txn'], function($val) { return !is_null($val) AND $val !== '' AND $val !==0 AND $val !== false; }); // PHP 7.2 and later
-
+        $out['txn']=array_filter($out['txn'], function($val) { return !is_null($val) AND $val !== '' AND $val !==0 AND $val !== false; }); 
 
         $out=$msgpack->p($out['txn']);
 
-        $out=str_replace("6e6f7465d9","6e6f7465c4",bin2hex($out));
+        $out=bin2hex($out);
         $out=hex2bin($out);
+        
         if($opt_msgpack==false){
             $out=base64_encode($out);
         }
diff --git a/sdk/yii setup/Algorand/kmd.php b/sdk/yii setup/Algorand/kmd.php
index 2cea912..f9e7afa 100644
--- a/sdk/yii setup/Algorand/kmd.php	
+++ b/sdk/yii setup/Algorand/kmd.php	
@@ -241,7 +241,7 @@ public function txn_encode($transaction,$opt_msgpack=false){
         if(!empty($out['txn']['grp'])) { $out['txn']['grp']=strval($out['txn']['grp']); }
         if(!empty($out['txn']['lv'])) { $out['txn']['lv']=intval($out['txn']['lv']); }
 
-        if(!empty($out['txn']['note'])) { $out['txn']['note']=utf8_encode(strval($out['txn']['note'])); }
+        if(!empty($out['txn']['note'])) { $out['txn']['note']=$msgpack->pBin(utf8_encode(strval($out['txn']['note']))); }
 
         if(!empty($out['txn']['gp'])) { $out['txn']['gp']=strval($out['txn']['gp']); }
         if(!empty($out['txn']['rekey'])) { $out['txn']['rekey']=b32::decode($out['txn']['rekey']); }
@@ -278,14 +278,13 @@ public function txn_encode($transaction,$opt_msgpack=false){
         if(!empty($out['txn']['apar']['dc'])) { $out['txn']['apar']['dc']=intval($out['txn']['apar']['dc']); }
         if(!empty($out['txn']['apar']['t'])) { $out['txn']['apar']['t']=intval($out['txn']['apar']['t']); }
 
-        //$out['txn']=array_filter($out['txn'], fn($val) => !is_null($val) AND $val !== "" AND $val !==0 AND $val !== false); // PHP 7.4 and later
-        $out['txn']=array_filter($out['txn'], function($val) { return !is_null($val) AND $val !== '' AND $val !==0 AND $val !== false; }); // PHP 7.2 and later
-
+        $out['txn']=array_filter($out['txn'], function($val) { return !is_null($val) AND $val !== '' AND $val !==0 AND $val !== false; }); 
 
         $out=$msgpack->p($out['txn']);
 
-        $out=str_replace("6e6f7465d9","6e6f7465c4",bin2hex($out));
+        $out=bin2hex($out);
         $out=hex2bin($out);
+        
         if($opt_msgpack==false){
             $out=base64_encode($out);
         }