Merge pull request #816 from TokenScript/staging

Staging

Author: nicktaras

CHANGELOG.md

@@ -4,24 +4,25 @@ Patch release to support the upgrade of attestations.
 
 ### Upgrade Steps
 
-- Update NPM package to version 3.0.1
+- Update NPM package to version 3.0.2
 
 ### Breaking Changes
 
 [none]
 
 ### New Features
 
-- Ability to delete existing attestations
+[none]
 
 ### Bug Fixes
 
-- Added support for upgrading attestations for live projects (method added via TicketStorage deleteTicketByDecodedTokenOrId)
+- attestationWindowConfig check to the existence of window before usage (issue found applicable to full stack web applications)
+- updated list of attestation schema id's to be ignored for off chain attestation managment (ensuring readability of valid attestations)
 
 ### Performance Improvements
 
 [none]
 
 **Full Change log**:
 
-https://github.com/TokenScript/token-negotiator/compare/v3.0.0...v3.0.1
+https://github.com/TokenScript/token-negotiator/compare/v3.0.1...v3.0.2

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenscript/token-negotiator",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Token-negotiator a token attestation bridge between web 2.0 and 3.0.",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",

package.json

@@ -13,9 +13,9 @@ export const defaultConfig = {
 	whitelistDialogHeight: '350px',
 }
 
-export const attestationWindowConfig = {
-	max_width: window.innerWidth < 700 ? '400px' : '450px',
-	min_height: window.innerHeight < 600 ? '600px' : '650px',
+const attestationWindowConfig = {
+	max_width: typeof window !== 'undefined' && window.innerWidth < 700 ? '400px' : '450px',
+	min_height: typeof window !== 'undefined' && window.innerHeight < 600 ? '600px' : '650px',
 }
 
 export class Outlet extends LocalOutlet {

src/outlet/index.ts

@@ -87,6 +87,14 @@ export const DEFAULT_EAS_SCHEMA: TicketSchema = {
 	],
 }
 
+export const DEFAULT_SCHEMA_UIDS = [
+	'0x0000000000000000000000000000000000000000000000000000000000000000',
+	// string eventId,string ticketId,uint8 ticketClass,bytes commitment
+	'0x7f6fb09beb1886d0b223e9f15242961198dd360021b2c9f75ac879c0f786cafd',
+	// string devconId,string ticketIdString,uint8 ticketClass,bytes commitment
+	'0x0630f3342772bf31b669bdbc05af0e9e986cf16458f292dfd3b57564b3dc3247',
+]
+
 export class TicketStorage {
 	private ticketCollections: TicketStorageSchema = {}
 
@@ -332,13 +340,7 @@ export class TicketStorage {
 
 		let idFields: string[] | undefined
 
-		if (
-			schemaUid !== '0x0000000000000000000000000000000000000000000000000000000000000000' &&
-			// string eventId,string ticketId,uint8 ticketClass,bytes commitment
-			schemaUid !== '0x7f6fb09beb1886d0b223e9f15242961198dd360021b2c9f75ac879c0f786cafd' &&
-			// string devconId,string ticketIdString,uint8 ticketClass,bytes commitment
-			schemaUid !== '0x0630f3342772bf31b669bdbc05af0e9e986cf16458f292dfd3b57564b3dc3247'
-		) {
+		if (DEFAULT_SCHEMA_UIDS.indexOf(schemaUid) === -1) {
 			let issuerConfig
 
 			// Once we have decoded the URL, we have a schema ID

src/outlet/ticketStorage.ts

@@ -3,6 +3,7 @@ import { KeyPair } from '@tokenscript/attestation/dist/libs/KeyPair'
 import { sha256 } from 'ethers/lib/utils'
 import { OffChainTokenConfig } from '../client/interface'
 import { OutletIssuerInterface } from '../outlet/interfaces'
+import { DEFAULT_SCHEMA_UIDS } from '../outlet/ticketStorage'
 
 export interface IssuerHashMap {
 	[collectionId: string]: string[]
@@ -242,12 +243,7 @@ export const createIssuerHashArray = (issuer: OffChainTokenConfig | OutletIssuer
 // output: 32 byte hash
 export const createOffChainCollectionHash = (key: KeyPair, eventId: string, schemaUid?: string) => {
 	// Only include custom schemaUids in the hash
-	const schemaPart =
-		schemaUid &&
-		schemaUid !== '0x0000000000000000000000000000000000000000000000000000000000000000' &&
-		schemaUid !== '0x7f6fb09beb1886d0b223e9f15242961198dd360021b2c9f75ac879c0f786cafd'
-			? '-' + schemaUid
-			: ''
+	const schemaPart = schemaUid && DEFAULT_SCHEMA_UIDS.indexOf(schemaUid) === -1 ? '-' + schemaUid : ''
 
 	const encoder = new TextEncoder()
 	return sha256(encoder.encode(key.getPublicKeyAsHexStr() + '-' + eventId + schemaPart))

src/utils/index.ts

@@ -1,2 +1,2 @@
 // modified by build process.
-export const VERSION = '3.0.1'
+export const VERSION = '3.0.2'