From a53eb90f0d6c54d1f0ddec286ed76c429bf1a63e Mon Sep 17 00:00:00 2001 From: Alfonso Bribiesca Date: Thu, 23 Jan 2025 17:57:14 -0600 Subject: [PATCH 1/2] fix: convert multipayment amount (#1163) --- app/ViewModels/Concerns/Transaction/HasPayload.php | 3 ++- tests/Unit/ViewModels/TransactionViewModelTest.php | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/ViewModels/Concerns/Transaction/HasPayload.php b/app/ViewModels/Concerns/Transaction/HasPayload.php index 476e32c35..8b7eb8687 100644 --- 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/tests/Unit/ViewModels/TransactionViewModelTest.php b/tests/Unit/ViewModels/TransactionViewModelTest.php index 928758d3c..6b4413c36 100644 --- 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', ], ]); }); From 8f5f9763a88bc720bdc038a53321a8345dc717dc Mon Sep 17 00:00:00 2001 From: Alex Barnsley <8069294+alexbarnsley@users.noreply.github.com> Date: Fri, 24 Jan 2025 00:02:57 +0000 Subject: [PATCH 2/2] refactor: update known wallets url (#1167) --- config/arkscan.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/arkscan.php b/config/arkscan.php index 698eeefd4..fb7765e04 100644 --- 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)),