[PLA-2033] Removes old codecs from encoder (#263)

enjin · Oct 11, 2024 · b722699 · b722699
1 parent 0554afb
commit b722699
Show file tree

Hide file tree

Showing 30 changed files with 52 additions and 252 deletions.
diff --git a/src/GraphQL/Schemas/Primary/Substrate/Mutations/BatchMintMutation.php b/src/GraphQL/Schemas/Primary/Substrate/Mutations/BatchMintMutation.php
@@ -135,8 +135,7 @@ function ($recipient) use ($blockchainService, $walletService) {
         // TODO: With the v1010 upgrade we run into a bug with the php-scale-codec lib where it cannot
         //  Encode the transaction with `0x` the solution here is to use Batch and within each call append the 0's
         $continueOnFailure = true;
-        $method = isRunningLatest() ? $this->getMutationName() . 'V1010' : $this->getMutationName();
-        $encodedData = $serializationService->encode($continueOnFailure ? 'Batch' : $method, static::getEncodableParams(
+        $encodedData = $serializationService->encode($continueOnFailure ? 'Batch' : $this->getMutationName(), static::getEncodableParams(
             collectionId: $args['collectionId'],
             recipients: $recipients->toArray(),
             continueOnFailure: $continueOnFailure

diff --git a/src/GraphQL/Schemas/Primary/Substrate/Mutations/BatchSetAttributeMutation.php b/src/GraphQL/Schemas/Primary/Substrate/Mutations/BatchSetAttributeMutation.php
@@ -99,8 +99,7 @@ public function resolve(
         TransactionService $transactionService
     ): mixed {
         $continueOnFailure = $args['continueOnFailure'];
-        $method = isRunningLatest() ? $this->getMutationName() . 'V1010' : $this->getMutationName();
-        $encodedData = $serializationService->encode($continueOnFailure ? 'Batch' : $method, static::getEncodableParams(
+        $encodedData = $serializationService->encode($continueOnFailure ? 'Batch' : $this->getMutationName(), static::getEncodableParams(
             collectionId: $args['collectionId'],
             tokenId: $this->encodeTokenId($args),
             attributes: $args['attributes'],

diff --git a/src/GraphQL/Schemas/Primary/Substrate/Mutations/BatchTransferMutation.php b/src/GraphQL/Schemas/Primary/Substrate/Mutations/BatchTransferMutation.php
@@ -126,8 +126,7 @@ function ($recipient) use ($blockchainService, $walletService) {
         );
 
         $continueOnFailure = $args['continueOnFailure'];
-        $method = isRunningLatest() ? $this->getMutationName() . 'V1010' : $this->getMutationName();
-        $encodedData = $serializationService->encode($continueOnFailure ? 'Batch' : $method, static::getEncodableParams(
+        $encodedData = $serializationService->encode($continueOnFailure ? 'Batch' : $this->getMutationName(), static::getEncodableParams(
             collectionId: $args['collectionId'],
             recipients: $recipients->toArray(),
             continueOnFailure: $continueOnFailure
@@ -148,7 +147,7 @@ public static function getEncodableParams(...$params): array
 
         if ($continueOnFailure) {
             $encodedData = collect($recipients)->map(
-                fn ($recipient) => $serializationService->encode(isRunningLatest() ? 'TransferV1010' : 'TransferToken', [
+                fn ($recipient) => $serializationService->encode('Transfer', [
                     'recipient' => [
                         'Id' => HexConverter::unPrefix($recipient['accountId']),
                     ],

diff --git a/src/GraphQL/Schemas/Primary/Substrate/Mutations/BurnMutation.php b/src/GraphQL/Schemas/Primary/Substrate/Mutations/BurnMutation.php
@@ -94,10 +94,9 @@ public function resolve(
         TransactionService $transactionService,
     ): mixed {
         $args['params']['tokenId'] = $this->encodeTokenId($args['params']);
-        unset($args['params']['encodeTokenId']);
+        unset($args['params']['encodeTokenId'], $args['params']['keepAlive']);
 
-        $method = isRunningLatest() ? $this->getMutationName() . 'V1010' : $this->getMutationName();
-        $encodedData = $serializationService->encode($method, static::getEncodableParams(
+        $encodedData = $serializationService->encode($this->getMutationName(), static::getEncodableParams(
             collectionId: $args['collectionId'],
             burnParams: new BurnParams(...$args['params'])
         ));

diff --git a/src/GraphQL/Schemas/Primary/Substrate/Mutations/MutateTokenMutation.php b/src/GraphQL/Schemas/Primary/Substrate/Mutations/MutateTokenMutation.php
@@ -95,8 +95,7 @@ public function resolve(
         TransactionService $transactionService,
         Substrate $blockchainService
     ): mixed {
-        $method = isRunningLatest() ? $this->getMutationName() . 'V1010' : $this->getMutationName();
-        $encodedData = $serializationService->encode($method, static::getEncodableParams(
+        $encodedData = $serializationService->encode($this->getMutationName(), static::getEncodableParams(
             collectionId: $args['collectionId'],
             tokenId: $this->encodeTokenId($args),
             behavior: $blockchainService->getMutateTokenBehavior(Arr::get($args, 'mutation')),
@@ -122,20 +121,15 @@ public function validationErrorMessages(array $args = []): array
     public static function getEncodableParams(...$params): array
     {
         $behavior = Arr::get($params, 'behavior');
-        $extra = isRunningLatest() ? [
-            'anyoneCanInfuse' => null,
-            'name' => null,
-        ] : [
-            'metadata' => null,
-        ];
 
         return [
             'collectionId' => gmp_init(Arr::get($params, 'collectionId', 0)),
             'tokenId' => gmp_init(Arr::get($params, 'tokenId', 0)),
             'mutation' => [
                 'behavior' => is_array($behavior) ? ['NoMutation' => null] : ['SomeMutation' => $behavior?->toEncodable()],
                 'listingForbidden' => Arr::get($params, 'listingForbidden'),
-                ...$extra,
+                'anyoneCanInfuse' => null, // TODO: Add this when the mutation is changed
+                'name' => null, // TODO: Add this when the mutation is changed
             ],
         ];
     }

diff --git a/src/GraphQL/Schemas/Primary/Substrate/Mutations/OperatorTransferTokenMutation.php b/src/GraphQL/Schemas/Primary/Substrate/Mutations/OperatorTransferTokenMutation.php
@@ -121,7 +121,7 @@ public function resolve(
      */
     public function getMethodName(): string
     {
-        return isRunningLatest() ? 'TransferV1010' : 'Transfer';
+        return 'Transfer';
     }
 
     public static function getEncodableParams(...$params): array

diff --git a/src/GraphQL/Schemas/Primary/Substrate/Mutations/SetCollectionAttributeMutation.php b/src/GraphQL/Schemas/Primary/Substrate/Mutations/SetCollectionAttributeMutation.php
@@ -103,7 +103,7 @@ public function resolve(
      */
     public function getMethodName(): string
     {
-        return isRunningLatest() ? 'SetAttributeV1010' : 'SetAttribute';
+        return 'SetAttribute';
     }
 
     public static function getEncodableParams(...$params): array

diff --git a/src/GraphQL/Schemas/Primary/Substrate/Mutations/SetTokenAttributeMutation.php b/src/GraphQL/Schemas/Primary/Substrate/Mutations/SetTokenAttributeMutation.php
@@ -115,7 +115,7 @@ public function resolve(
      */
     public function getMethodName(): string
     {
-        return isRunningLatest() ? 'SetAttributeV1010' : 'SetAttribute';
+        return 'SetAttribute';
     }
 
     public static function getEncodableParams(...$params): array

diff --git a/src/GraphQL/Schemas/Primary/Substrate/Mutations/SimpleTransferTokenMutation.php b/src/GraphQL/Schemas/Primary/Substrate/Mutations/SimpleTransferTokenMutation.php
@@ -120,7 +120,7 @@ public function resolve(
      */
     public function getMethodName(): string
     {
-        return isRunningLatest() ? 'TransferV1010' : 'Transfer';
+        return 'Transfer';
     }
 
     public static function getEncodableParams(...$params): array

diff --git a/src/Models/Substrate/BurnParams.php b/src/Models/Substrate/BurnParams.php
@@ -12,7 +12,6 @@ class BurnParams
     public function __construct(
         public string $tokenId,
         public string $amount,
-        public ?bool $keepAlive = false,
         public ?bool $removeTokenStorage = false,
     ) {}
 
@@ -24,7 +23,6 @@ public static function fromEncodable(array $params): self
         return new self(
             tokenId: gmp_strval(Arr::get($params, 'tokenId')),
             amount: gmp_strval(Arr::get($params, 'amount')),
-            keepAlive: Arr::get($params, 'keepAlive'),
             removeTokenStorage: Arr::get($params, 'removeTokenStorage'),
         );
     }
@@ -37,7 +35,6 @@ public static function fromArray(array $params): self
         return new self(
             tokenId: Arr::get($params, 'tokenId'),
             amount: Arr::get($params, 'amount'),
-            keepAlive: Arr::get($params, 'keepAlive'),
             removeTokenStorage: Arr::get($params, 'removeTokenStorage')
         );
     }
@@ -47,23 +44,22 @@ public static function fromArray(array $params): self
      */
     public function toEncodable(): array
     {
-        return array_merge([
+        return [
             'tokenId' => gmp_init($this->tokenId),
             'amount' => gmp_init($this->amount),
             'removeTokenStorage' => $this->removeTokenStorage,
-        ], isRunningLatest() ? [] : ['keepAlive' => $this->keepAlive]);
+        ];
     }
 
     /**
      * Get the array representation.
      */
     public function toArray(): array
     {
-        return array_merge([
+        return [
             'tokenId' => $this->tokenId,
             'amount' => $this->amount,
-            'keepAlive' => $this->keepAlive,
             'removeTokenStorage' => $this->removeTokenStorage,
-        ], isRunningLatest() ? [] : ['keepAlive' => $this->keepAlive]);
+        ];
     }
 }
diff --git a/src/Models/Substrate/OperatorTransferParams.php b/src/Models/Substrate/OperatorTransferParams.php
@@ -14,7 +14,6 @@ public function __construct(
         public string $tokenId,
         public string $source,
         public string $amount,
-        public ?bool $keepAlive = false
     ) {}
 
     /**
@@ -26,7 +25,6 @@ public static function fromEncodable(array $params): self
             tokenId: gmp_strval(Arr::get($params, 'tokenId')),
             source: SS58Address::encode(Arr::get($params, 'source')),
             amount: gmp_strval(Arr::get($params, 'amount')),
-            keepAlive: Arr::get($params, 'keepAlive', false),
         );
     }
 
@@ -39,7 +37,6 @@ public static function fromArray(array $params): self
             tokenId: Arr::get($params, 'tokenId'),
             source: SS58Address::encode(Arr::get($params, 'source')),
             amount: Arr::get($params, 'amount'),
-            keepAlive: Arr::get($params, 'keepAlive', false),
         );
     }
 
@@ -48,16 +45,12 @@ public static function fromArray(array $params): self
      */
     public function toEncodable(): array
     {
-        $extra = isRunningLatest()
-            ? ['depositor' => null]
-            : ['keepAlive' => $this->keepAlive];
-
         return [
             'Operator' => [
                 'tokenId' => gmp_init($this->tokenId),
                 'source' => SS58Address::getPublicKey($this->source),
                 'amount' => gmp_init($this->amount),
-                ...$extra,
+                'depositor' => null,
             ],
         ];
     }
@@ -67,16 +60,11 @@ public function toEncodable(): array
      */
     public function toArray(): array
     {
-        isRunningLatest()
-            ? $extra['depositor'] = null
-            : $extra['keepAlive'] = $this->keepAlive;
-
         return [
             'Operator' => [
                 'tokenId' => $this->tokenId,
                 'source' => $this->source,
                 'amount' => $this->amount,
-                ...$extra,
             ],
         ];
     }

diff --git a/src/Models/Substrate/SimpleTransferParams.php b/src/Models/Substrate/SimpleTransferParams.php
@@ -12,7 +12,6 @@ class SimpleTransferParams
     public function __construct(
         public string $tokenId,
         public string $amount,
-        public ?bool $keepAlive = false
     ) {}
 
     /**
@@ -23,7 +22,6 @@ public static function fromEncodable(array $params): self
         return new self(
             tokenId: gmp_strval(Arr::get($params, 'tokenId')),
             amount: gmp_strval(Arr::get($params, 'amount')),
-            keepAlive: Arr::get($params, 'keepAlive', false),
         );
     }
 
@@ -35,7 +33,6 @@ public static function fromArray(array $params): self
         return new self(
             tokenId: Arr::get($params, 'tokenId'),
             amount: Arr::get($params, 'amount'),
-            keepAlive: Arr::get($params, 'keepAlive', false),
         );
     }
 
@@ -44,15 +41,11 @@ public static function fromArray(array $params): self
      */
     public function toEncodable(): array
     {
-        $extra = isRunningLatest()
-            ? ['depositor' => null]
-            : ['keepAlive' => $this->keepAlive];
-
         return [
             'Simple' => [
                 'tokenId' => gmp_init($this->tokenId),
                 'amount' => gmp_init($this->amount),
-                ...$extra,
+                'depositor' => null,
             ],
         ];
     }
@@ -62,15 +55,10 @@ public function toEncodable(): array
      */
     public function toArray(): array
     {
-        isRunningLatest()
-            ? $extra['depositor'] = null
-            : $extra['keepAlive'] = $this->keepAlive;
-
         return [
             'Simple' => [
                 'tokenId' => $this->tokenId,
                 'amount' => $this->amount,
-                ...$extra,
             ],
         ];
     }

diff --git a/src/Services/Blockchain/Implementations/Substrate.php b/src/Services/Blockchain/Implementations/Substrate.php
@@ -332,7 +332,6 @@ public function getOperatorTransferParams(array $args): OperatorTransferParams
             $this->encodeTokenId($args),
             $args['source'],
             $args['amount'],
-            $args['keepAlive'],
         ];
 
         return new OperatorTransferParams(...$data);
@@ -346,7 +345,6 @@ public function getSimpleTransferParams(array $args): SimpleTransferParams
         $data = [
             $this->encodeTokenId($args),
             $args['amount'],
-            $args['keepAlive'],
         ];
 
         return new SimpleTransferParams(...$data);

diff --git a/src/Services/Processor/Substrate/Codec/Decoder.php b/src/Services/Processor/Substrate/Codec/Decoder.php
@@ -85,7 +85,6 @@ public function burn(string $data): array
             'collectionId' => gmp_strval(Arr::get($decoded, 'collectionId')),
             'tokenId' => gmp_strval(Arr::get($decoded, 'params.tokenId')),
             'amount' => gmp_strval(Arr::get($decoded, 'params.amount')),
-            'keepAlive' => Arr::get($decoded, 'params.keepAlive'),
             'removeTokenStorage' => Arr::get($decoded, 'params.removeTokenStorage'),
         ];
     }

diff --git a/src/Services/Processor/Substrate/Codec/Encoder.php b/src/Services/Processor/Substrate/Codec/Encoder.php
@@ -33,26 +33,20 @@ class Encoder
         'ApproveToken' => 'MultiTokens.approve_token',
         'UnapproveToken' => 'MultiTokens.unapprove_token',
         'BatchSetAttribute' => 'MultiTokens.batch_set_attribute',
-        'BatchSetAttributeV1010' => 'MultiTokens.batch_set_attribute',
         'BatchTransfer' => 'MultiTokens.batch_transfer',
-        'BatchTransferV1010' => 'MultiTokens.batch_transfer',
         'Transfer' => 'MultiTokens.transfer',
-        'TransferV1010' => 'MultiTokens.transfer',
         'CreateCollection' => 'MultiTokens.create_collection',
         'DestroyCollection' => 'MultiTokens.destroy_collection',
         'MutateCollection' => 'MultiTokens.mutate_collection',
         'MutateToken' => 'MultiTokens.mutate_token',
-        'MutateTokenV1010' => 'MultiTokens.mutate_token',
         'Mint' => 'MultiTokens.mint',
         'BatchMint' => 'MultiTokens.batch_mint',
         'Burn' => 'MultiTokens.burn',
-        'BurnV1010' => 'MultiTokens.burn',
         'Infuse' => 'MultiTokens.infuse',
         'Freeze' => 'MultiTokens.freeze',
         'Thaw' => 'MultiTokens.thaw',
         'SetRoyalty' => 'MultiTokens.set_royalty',
         'SetAttribute' => 'MultiTokens.set_attribute',
-        'SetAttributeV1010' => 'MultiTokens.set_attribute',
         'RemoveAttribute' => 'MultiTokens.remove_attribute',
         'RemoveAllAttributes' => 'MultiTokens.remove_all_attributes',
         'AcceptCollectionTransfer' => 'MultiTokens.accept_collection_transfer',

diff --git a/src/Services/Processor/Substrate/Codec/Types/BatchSetAttribute.json b/src/Services/Processor/Substrate/Codec/Types/BatchSetAttribute.json
@@ -1,15 +1,9 @@
 {
-  "BatchSetAttribute": {
-    "callIndex": "(u8, u8)",
-    "collectionId": "Compact<u128>",
-    "tokenId": "Option<u128>",
-    "attributes": "Vec<Attribute>"
-  },
   "Attribute": {
     "key": "Bytes",
     "value": "Bytes"
   },
-  "BatchSetAttributeV1010": {
+  "BatchSetAttribute": {
     "callIndex": "(u8, u8)",
     "collectionId": "Compact<u128>",
     "tokenId": "Option<u128>",

diff --git a/src/Services/Processor/Substrate/Codec/Types/BatchTransfer.json b/src/Services/Processor/Substrate/Codec/Types/BatchTransfer.json
@@ -7,14 +7,5 @@
   "TransferRecipient": {
     "accountId": "AccountId",
     "params": "TransferParamsOf"
-  },
-  "BatchTransferV1010": {
-    "callIndex": "(u8, u8)",
-    "collectionId": "Compact<u128>",
-    "recipients": "Vec<TransferRecipientV1010>"
-  },
-  "TransferRecipientV1010": {
-    "accountId": "AccountId",
-    "params": "TransferParamsOfV1010"
   }
 }
diff --git a/src/Services/Processor/Substrate/Codec/Types/Burn.json b/src/Services/Processor/Substrate/Codec/Types/Burn.json
@@ -5,17 +5,6 @@
     "params": "BurnParamsOf"
   },
   "BurnParamsOf": {
-    "tokenId": "Compact<u128>",
-    "amount": "Compact<u128>",
-    "keepAlive": "bool",
-    "removeTokenStorage": "bool"
-  },
-  "BurnV1010": {
-    "callIndex": "(u8, u8)",
-    "collectionId": "Compact<u128>",
-    "params": "BurnParamsOfV1010"
-  },
-  "BurnParamsOfV1010": {
     "tokenId": "Compact<u128>",
     "amount": "Compact<u128>",
     "removeTokenStorage": "bool"