fixes

enjin · Nov 16, 2023 · 4f6cc0d · 4f6cc0d
1 parent 4571664
commit 4f6cc0d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/src/Services/Processor/Substrate/Codec/Polkadart/Events/MultiTokens/Unreserved.php b/src/Services/Processor/Substrate/Codec/Polkadart/Events/MultiTokens/Unreserved.php
@@ -22,11 +22,11 @@ public static function fromChain(array $data): self
         $self->extrinsicIndex = Arr::get($data, 'phase.ApplyExtrinsic');
         $self->module = array_key_first(Arr::get($data, 'event'));
         $self->name = array_key_first(Arr::get($data, 'event.' . $self->module));
-        $self->collectionId = Arr::get($data, 'event.MultiTokens.Reserved.collection_id');
-        $self->tokenId = Arr::get($data, 'event.MultiTokens.Reserved.token_id');
-        $self->accountId = Arr::get($data, 'event.MultiTokens.Reserved.account_id');
-        $self->amount = Arr::get($data, 'event.MultiTokens.Reserved.amount');
-        $self->reserveId = Arr::get($data, 'event.MultiTokens.Reserved.reserve_id.Some');
+        $self->collectionId = Arr::get($data, 'event.MultiTokens.Unreserved.collection_id');
+        $self->tokenId = Arr::get($data, 'event.MultiTokens.Unreserved.token_id');
+        $self->accountId = Arr::get($data, 'event.MultiTokens.Unreserved.account_id');
+        $self->amount = Arr::get($data, 'event.MultiTokens.Unreserved.amount');
+        $self->reserveId = Arr::get($data, 'event.MultiTokens.Unreserved.reserve_id.Some');
 
         return $self;
     }

diff --git a/src/Services/Processor/Substrate/Events/Implementations/MultiTokens/Reserved.php b/src/Services/Processor/Substrate/Events/Implementations/MultiTokens/Reserved.php
@@ -38,15 +38,20 @@ public function run(PolkadartEvent $event, Block $block, Codec $codec): void
         $tokenAccount->decrement('balance', $event->amount);
         $tokenAccount->increment('reserved_balance', $event->amount);
 
-        TokenAccountNamedReserve::updateOrCreate(
-            [
+        $namedReserve = TokenAccountNamedReserve::firstWhere([
+            'token_account_id' => $tokenAccount->id,
+            'pallet' => PalletIdentifier::from(HexConverter::hexToString($event->reserveId))->name,
+        ]);
+
+        if ($namedReserve == null) {
+            TokenAccountNamedReserve::create([
                 'token_account_id' => $tokenAccount->id,
                 'pallet' => PalletIdentifier::from(HexConverter::hexToString($event->reserveId))->name,
-            ],
-            [
                 'amount' => $event->amount,
-            ]
-        );
+            ]);
+        } else {
+            $namedReserve->increment('amount', $event->amount);
+        }
 
         Log::info(sprintf(
             'Created named reserve of Collection %s (id: %s), Token #%s (id: %s) Account %s (id: %s) of amount %s to %s.',

diff --git a/src/Services/Processor/Substrate/Events/Implementations/MultiTokens/Unreserved.php b/src/Services/Processor/Substrate/Events/Implementations/MultiTokens/Unreserved.php
@@ -4,11 +4,12 @@
 
 use Enjin\BlockchainTools\HexConverter;
 use Enjin\Platform\Enums\Substrate\PalletIdentifier;
+use Enjin\Platform\Events\Substrate\MultiTokens\TokenUnreserved;
 use Enjin\Platform\Models\Laravel\Block;
 use Enjin\Platform\Models\Laravel\TokenAccountNamedReserve;
 use Enjin\Platform\Models\TokenAccount;
 use Enjin\Platform\Services\Processor\Substrate\Codec\Codec;
-use Enjin\Platform\Services\Processor\Substrate\Codec\Polkadart\Events\MultiTokens\Reserved as UnreservedPolkadart;
+use Enjin\Platform\Services\Processor\Substrate\Codec\Polkadart\Events\MultiTokens\Unreserved as UnreservedPolkadart;
 use Enjin\Platform\Services\Processor\Substrate\Codec\Polkadart\PolkadartEvent;
 use Enjin\Platform\Services\Processor\Substrate\Events\Implementations\Traits;
 use Enjin\Platform\Services\Processor\Substrate\Events\SubstrateEvent;