isToken must not be null

packages/subgraph/src/mappings/resolver.ts

@@ -45,17 +45,22 @@ export function handleRoleRevoked(event: RoleRevoked): void {
 function getOrInitResolverEntry(id: string, target: Address, block: ethereum.Block): ResolverEntry {
     let resolverEntry = ResolverEntry.load(id);
 
+    const isListed = target.notEqual(ZERO_ADDRESS);
+    const isToken = Token.load(target.toHex()) != null;
+
     if (resolverEntry == null) {
         resolverEntry = new ResolverEntry(id);
         resolverEntry.createdAtBlockNumber = block.number;
         resolverEntry.createdAtTimestamp = block.timestamp;
         resolverEntry.targetAddress = target;
+        // on initialization, we are unlikely to set this to zero address
+        // if we do, this gets fixed in subsequent set events
+        resolverEntry.isToken = isToken;
     }
-    const isListed = target.notEqual(ZERO_ADDRESS);
 
     // we only update this if the target is not equal to the zero address
     if (isListed) {
-        resolverEntry.isToken = Token.load(target.toHex()) != null;
+        resolverEntry.isToken = isToken;
     }
     resolverEntry.updatedAtBlockNumber = block.number;
     resolverEntry.updatedAtTimestamp = block.timestamp;