Merge branch 'mainsail-develop' into refactor/schedule-cache-blocks-c…

…ommand
ArdentHQ · Jan 27, 2025 · c948a08 · c948a08
2 parents 9ca9ef8 + 8f5f976
commit c948a08
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/app/ViewModels/Concerns/Transaction/HasPayload.php b/app/ViewModels/Concerns/Transaction/HasPayload.php
@@ -6,6 +6,7 @@
 
 use ArkEcosystem\Crypto\Enums\ContractAbiType;
 use ArkEcosystem\Crypto\Utils\AbiDecoder;
+use ArkEcosystem\Crypto\Utils\UnitConverter;
 
 trait HasPayload
 {
@@ -107,7 +108,7 @@ public function multiPaymentRecipients(): ?array
             if (isset($amounts[$index])) {
                 $recipients[] = [
                     'address' => $address,
-                    'amount'  => $amounts[$index],
+                    'amount'  => UnitConverter::formatUnits($amounts[$index], 'ark'),
                 ];
             }
         }

diff --git a/config/arkscan.php b/config/arkscan.php
@@ -49,7 +49,7 @@
             'currency'            => env('ARKSCAN_NETWORK_CURRENCY', 'DARK'),
             'currencySymbol'      => env('ARKSCAN_NETWORK_CURRENCY_SYMBOL', 'DѦ'),
             'confirmations'       => intval(env('ARKSCAN_NETWORK_CONFIRMATIONS', 51)),
-            'knownWallets'        => env('ARKSCAN_NETWORK_KNOWN_WALLETS', 'https://raw.githubusercontent.com/ArkEcosystem/common/master/devnet/known-wallets-extended.json'),
+            'knownWallets'        => env('ARKSCAN_NETWORK_KNOWN_WALLETS', 'https://raw.githubusercontent.com/ArkEcosystem/common/master/mainsail/devnet/known-wallets-extended.json'),
             'canBeExchanged'      => env('ARKSCAN_NETWORK_CAN_BE_EXCHANGED', false),
             'epoch'               => env('ARKSCAN_NETWORK_EPOCH', '2023-12-21T00:00:00.000Z'),
             'validatorCount'      => intval(env('ARKSCAN_NETWORK_VALIDATOR_COUNT', 53)),

diff --git a/tests/Unit/ViewModels/TransactionViewModelTest.php b/tests/Unit/ViewModels/TransactionViewModelTest.php
@@ -329,15 +329,15 @@
         expect($transaction->multiPaymentRecipients())->toEqual([
             '0' => [
                 'address' => '0xb693449AdDa7EFc015D87944EAE8b7C37EB1690A',
-                'amount'  => '100000000',
+                'amount'  => '1.0E-10',
             ],
             '1' => [
                 'address' => '0xb693449AdDa7EFc015D87944EAE8b7C37EB1690A',
-                'amount'  => '200000000',
+                'amount'  => '2.0E-10',
             ],
             '2' => [
                 'address' => '0xEd0C906b8fcCDe71A19322DFfe929c6e04460cFF',
-                'amount'  => '1234567',
+                'amount'  => '1.234567E-12',
             ],
         ]);
     });