Merge pull request #331 from kodadot/main

🔖  Stick v13

.github/workflows/subsquid.yml

@@ -23,4 +23,4 @@ jobs:
           sqd auth -k ${{ secrets.DEPLOYMENT_KEY }}
       - name: deploy subsquid
         id: deploy
-        run: sqd deploy -o kodadot -u -m ${{ env.VERSION }}.yaml .
+        run: sqd deploy -o kodadot --allow-update --no-interactive --no-stream-logs -m ${{ env.VERSION }}.yaml .

speck.yaml

@@ -1,6 +1,6 @@
 manifestVersion: subsquid.io/v0.1
 name: speck
-version: 14
+version: 15
 description: 'SubSquid indexer for Uniques and Assets on Statemint'
 build: 
 deploy:

squid.yaml

@@ -1,6 +1,6 @@
 manifestVersion: subsquid.io/v0.1
 name: stick
-version: 12
+version: 13
 description: 'SubSquid indexer for Uniques and Assets on Statemine'
 build: 
 deploy:

src/mappings/nfts/createSwap.ts

@@ -35,7 +35,7 @@ export async function handleCreateSwap(context: Context): Promise<void> {
   // the nft that is being swapped
   const nft = await get(context.store, NE, id)
   const considered = await get(context.store, CE, event.consideration.collectionId)
-  const desired = isNFT(event.consideration) ? await get(context.store, NE, tokenIdOf(event.consideration as any)) : undefined
+  const desired = isNFT(event.consideration) ? await get(context.store, NE, tokenIdOf(event.consideration as any)) : null
 
   final.blockNumber = BigInt(event.blockNumber)
   final.createdAt = event.timestamp
@@ -44,9 +44,9 @@ export async function handleCreateSwap(context: Context): Promise<void> {
   final.considered = considered
   final.desired = desired
   final.expiration = deadline
-  final.price = event.price
-  if ('surcharge' in final) {
-    final.surcharge = event.surcharge
+  final.price = event.price || null
+  if (!offer) {
+    (final as Swap).surcharge = event.surcharge || null
   }
   final.status = final.blockNumber >= deadline ? TradeStatus.EXPIRED : TradeStatus.ACTIVE
   final.updatedAt = event.timestamp

src/mappings/utils/types.ts

@@ -18,6 +18,7 @@ import { Attribute } from '../../model/generated/_attribute'
 import { Interaction } from '../../model'
 import { SetMetadata } from '../nfts/types'
 import { COLLECTION_OFFER } from '../../environment'
+import { type Attribute as HyperAttribute, attributeFrom as hyperAttributeFrom } from '@kodadot1/hyperdata'
 
 export type BaseCall = {
   caller: string
@@ -99,12 +100,12 @@ export function eventFrom<T>(
   }
 }
 
-export function attributeFrom(attribute: MetadataAttribute): Attribute {
+export function attributeFrom(attribute: HyperAttribute): Attribute {
   return new Attribute(
     {},
     {
-      display: attribute.display_type ? String(attribute.display_type) : null,
-      trait: String(attribute.trait_type),
+      display: attribute.display ? String(attribute.display) : null,
+      trait: attribute.trait ? String(attribute.trait) : null,
       value: String(attribute.value),
     }
   )