From 35e189225bac122a8b67a0f2c249576b96d05e54 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 16 Aug 2023 14:14:54 +1000
Subject: [PATCH 01/46] wip socios

---
 index.html                            | 200 ++++++++++++++------------
 src/client/index.ts                   |  26 +++-
 src/client/interface.ts               |   2 +
 src/client/views/select-wallet.ts     |   5 +
 src/client/views/utils/wallet-info.ts |   9 ++
 src/utils/support/isSupported.ts      |   4 +
 src/wallet/Web3WalletProvider.ts      |  34 ++++-
 webpack.config.js                     |   2 +-
 8 files changed, 180 insertions(+), 102 deletions(-)

diff --git a/index.html b/index.html
index c3cb9154..85913545 100644
--- a/index.html
+++ b/index.html
@@ -17,83 +17,93 @@
     <button onclick="reloadIssuers()">Reload</button>
     <div class="overlay-tn"></div>
     <script>
-      var theme = "dark";
+      var theme = "light";
       function init() {
         window.negotiator = new negotiator.Client({
           type: "active",
           issuers: [
             {
-              hideToggle: true,
-              noTokenMsg:
-                "<p>If you hold a Devcon ticket, please visit your magicLink email again and open the link in this browser.</p><p>You may reload this page after and try again.</p>",
-              onChain: false,
-              tokenName: "devcon6",
-              collectionID: "devcon6",
-              title: "Devcon VI Ticket Attestation",
-              image: "https://devcon-vi.attest.tickets/img/nft_bg.png",
-              tokenOrigin: "https://devcon-vi.attest.tickets/outlet.html",
-              attestationOrigin: "https://test.attestation.id/",
-              tokenUrlName: "ticket",
-              cryptoVerify: "https://form.smarttokenlabs.com",
-              tokenSecretName: "secret",
-              tokenIdName: "mail",
-              unsignedTokenDataName: "ticket",
-              whitelistDialogRenderer: (permissionTxt, acceptBtn, denyBtn) => {
-                return `
-		<div class="tn-auth-box">
-			<div class="tn-auth-heading">
-				<img alt="devcon" src="img/FB_OG_Image.svg" style="width: 150px;" />
-			</div>
-			<div class="tn-auth-content">
-				<p>${permissionTxt}</p>
-				${acceptBtn}
-				${denyBtn}
-			</div>
-		</div>
-	`;
-              },
-              signedTokenWhitelist: [
-                "https://devcon-vi.attest.tickets/",
-                "https://dev.loc",
-                "https://devconnect.loc/",
-                "https://devconnect.antopolbus.rv.ua/",
-                "https://perks.antopolbus.rv.ua/",
-                "https://stage-perks.smarttokenlabs.com/",
-                "http://localhost:5000/",
-
-                "https://hashkey.smarttokenlabs.com/",
-                "https://fayre-devcon.webflow.io/",
-                "https://fenbushi-devcon.webflow.io/",
-                "https://metasearch-devcon.webflow.io/",
-                "https://conspicuis-devcon.webflow.io/",
-                "https://devcon-vi.brandextender.io/",
-                "https://www.edcon.io/",
-              ],
-              itemStorageKey: "devconnectTokens",
-              base64senderPublicKeys: {
-                4: "MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAEAGJAHCiHbrCNAY9fAMdom4dGD6v/KkTIgRCkwLCjXFTkXWGrCEXHaZ8kWwdqlu0oYCrNQ2vdlqOl0s26/LzO8A==|MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAE-N-jGYo1OuO77XItd3zT-oIhZEVC44uqOhtJkmBsBNDTp3Seu_vmuLB-b4whNeFNBuJTsT7AHUiUe3JOwCcegA==",
-              },
-              base64attestorPubKey:
-                "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
-            },
-            {
-              collectionID: "devcon",
-              onChain: false,
-              title: "Devcon",
-              tokenIdName: "id",
-              image:
-                "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg",
-              tokenOrigin: "http://localhost:3002/",
-              attestationOrigin: "https://test.attestation.id/",
-              base64senderPublicKeys: {
-                6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
-                55: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
-              },
-              base64attestorPubKey:
-                "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
-              ticketIssuersUrlWebsitePrivateKey:
-                "MIICSwIBADCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBBIIBVTCCAVECAQEEIM/T+SzcXcdtcNIqo6ck0nJTYzKL5ywYBFNSpI7R8AuBoIHjMIHgAgEBMCwGByqGSM49AQECIQD////////////////////////////////////+///8LzBEBCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcEQQR5vmZ++dy7rFWgYpXOhwsHApv82y3OKNlZ8oFbFvgXmEg62ncmo8RlXaT7/A4RCKj9F7RIpoVUGZxH0I/7ENS4AiEA/////////////////////rqu3OavSKA7v9JejNA2QUECAQGhRANCAARjMR62qoIK9pHk17MyHHIU42Ix+Vl6Q2gTmIF72vNpinBpyoBkTkV0pnI1jdrLlAjJC0I91DZWQhVhddMCK65c",
+              onChain: true,
+              oauth2: true,
+              oauth2ConsumerKey: "V6SYZtfR45fanvAPHWOQS50qfsYa",
+              fungile: true,
+              chain: "socios",
+              blockchain: "socios",
+              collectionID: "Socios",
+              redirect_uri: "",
+              partner_tag: "",
             },
+            //           {
+            //             hideToggle: true,
+            //             noTokenMsg:
+            //               "<p>If you hold a Devcon ticket, please visit your magicLink email again and open the link in this browser.</p><p>You may reload this page after and try again.</p>",
+            //             onChain: false,
+            //             tokenName: "devcon6",
+            //             collectionID: "devcon6",
+            //             title: "Devcon VI Ticket Attestation",
+            //             image: "https://devcon-vi.attest.tickets/img/nft_bg.png",
+            //             tokenOrigin: "https://devcon-vi.attest.tickets/outlet.html",
+            //             attestationOrigin: "https://test.attestation.id/",
+            //             tokenUrlName: "ticket",
+            //             cryptoVerify: "https://form.smarttokenlabs.com",
+            //             tokenSecretName: "secret",
+            //             tokenIdName: "mail",
+            //             unsignedTokenDataName: "ticket",
+            //             whitelistDialogRenderer: (permissionTxt, acceptBtn, denyBtn) => {
+            //               return `
+            // 	<div class="tn-auth-box">
+            // 		<div class="tn-auth-heading">
+            // 			<img alt="devcon" src="img/FB_OG_Image.svg" style="width: 150px;" />
+            // 		</div>
+            // 		<div class="tn-auth-content">
+            // 			<p>${permissionTxt}</p>
+            // 			${acceptBtn}
+            // 			${denyBtn}
+            // 		</div>
+            // 	</div>
+            // `;
+            //             },
+            //             signedTokenWhitelist: [
+            //               "https://devcon-vi.attest.tickets/",
+            //               "https://dev.loc",
+            //               "https://devconnect.loc/",
+            //               "https://devconnect.antopolbus.rv.ua/",
+            //               "https://perks.antopolbus.rv.ua/",
+            //               "https://stage-perks.smarttokenlabs.com/",
+            //               "http://localhost:5000/",
+            //               "https://hashkey.smarttokenlabs.com/",
+            //               "https://fayre-devcon.webflow.io/",
+            //               "https://fenbushi-devcon.webflow.io/",
+            //               "https://metasearch-devcon.webflow.io/",
+            //               "https://conspicuis-devcon.webflow.io/",
+            //               "https://devcon-vi.brandextender.io/",
+            //               "https://www.edcon.io/",
+            //             ],
+            //             itemStorageKey: "devconnectTokens",
+            //             base64senderPublicKeys: {
+            //               4: "MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAEAGJAHCiHbrCNAY9fAMdom4dGD6v/KkTIgRCkwLCjXFTkXWGrCEXHaZ8kWwdqlu0oYCrNQ2vdlqOl0s26/LzO8A==|MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAE-N-jGYo1OuO77XItd3zT-oIhZEVC44uqOhtJkmBsBNDTp3Seu_vmuLB-b4whNeFNBuJTsT7AHUiUe3JOwCcegA==",
+            //             },
+            //             base64attestorPubKey:
+            //               "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
+            //           },
+            //           {
+            //             collectionID: "devcon",
+            //             onChain: false,
+            //             title: "Devcon",
+            //             tokenIdName: "id",
+            //             image:
+            //               "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg",
+            //             tokenOrigin: "http://localhost:3002/",
+            //             attestationOrigin: "https://test.attestation.id/",
+            //             base64senderPublicKeys: {
+            //               6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
+            //               55: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
+            //             },
+            //             base64attestorPubKey:
+            //               "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
+            //             ticketIssuersUrlWebsitePrivateKey:
+            //               "MIICSwIBADCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBBIIBVTCCAVECAQEEIM/T+SzcXcdtcNIqo6ck0nJTYzKL5ywYBFNSpI7R8AuBoIHjMIHgAgEBMCwGByqGSM49AQECIQD////////////////////////////////////+///8LzBEBCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcEQQR5vmZ++dy7rFWgYpXOhwsHApv82y3OKNlZ8oFbFvgXmEg62ncmo8RlXaT7/A4RCKj9F7RIpoVUGZxH0I/7ENS4AiEA/////////////////////rqu3OavSKA7v9JejNA2QUECAQGhRANCAARjMR62qoIK9pHk17MyHHIU42Ix+Vl6Q2gTmIF72vNpinBpyoBkTkV0pnI1jdrLlAjJC0I91DZWQhVhddMCK65c",
+            //           },
             // {
             //   collectionID: "devcon",
             //   onChain: false,
@@ -184,30 +194,30 @@
             //   chain: "mainnet",
             //   blockchain: "solana",
             // },
-            {
-              onChain: true,
-              collectionID: "expansion-punks",
-              contract: "0x0d0167a823c6619d430b1a96ad85b888bcf97c37",
-              chain: "eth",
-              blockchain: "evm",
-            },
-            {
-              onChain: true,
-              collectionID: "fantom-collection-test",
-              contract: "0x94e22c14118353651636f9af43cd0a5a08b93da3",
-              chain: "fantom",
-              blockchain: "evm",
-            },
-            {
-              hideToggle: true,
-              noTokenMsg:
-                "<p>If you have a token please:</p><p>1. Open your magic link inside this browser.<br/>2. Refresh this page.</p>",
-              onChain: true,
-              collectionID: "bsc-collection-test",
-              contract: "0xF5db804101d8600c26598A1Ba465166c33CdAA4b",
-              chain: "bsc",
-              blockchain: "evm",
-            },
+            // {
+            //   onChain: true,
+            //   collectionID: "expansion-punks",
+            //   contract: "0x0d0167a823c6619d430b1a96ad85b888bcf97c37",
+            //   chain: "eth",
+            //   blockchain: "evm",
+            // },
+            // {
+            //   onChain: true,
+            //   collectionID: "fantom-collection-test",
+            //   contract: "0x94e22c14118353651636f9af43cd0a5a08b93da3",
+            //   chain: "fantom",
+            //   blockchain: "evm",
+            // },
+            // {
+            //   hideToggle: true,
+            //   noTokenMsg:
+            //     "<p>If you have a token please:</p><p>1. Open your magic link inside this browser.<br/>2. Refresh this page.</p>",
+            //   onChain: true,
+            //   collectionID: "bsc-collection-test",
+            //   contract: "0xF5db804101d8600c26598A1Ba465166c33CdAA4b",
+            //   chain: "bsc",
+            //   blockchain: "evm",
+            // },
             // {
             //   onChain: true,
             //   collectionID: "tt",
diff --git a/src/client/index.ts b/src/client/index.ts
index 9c75ccb0..ace3cc16 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -289,13 +289,13 @@ export class Client {
 	}
 
 	// TODO: Move to token store OR select-wallet view - this method is very similar to getCurrentBlockchains()
-	public hasIssuerForBlockchain(blockchain: 'evm' | 'solana' | 'flow' | 'ultra') {
+	public hasIssuerForBlockchain(blockchain: 'evm' | 'solana' | 'flow' | 'ultra' | 'socios') {
 		return (
 			this.config.issuers.filter((issuer: OnChainTokenConfig) => {
 				if (blockchain === 'evm' && !issuer.onChain) return true
+				if (blockchain === 'socios' && !issuer.oauth2 && issuer.oauth2ConsumerKey) return false
 				if (blockchain === 'solana' && typeof window.solana === 'undefined') return false
 				if (blockchain === 'ultra' && typeof window.ultra === 'undefined') return false
-
 				return (issuer.blockchain ? issuer.blockchain.toLowerCase() : 'evm') === blockchain
 			}).length > 0
 		)
@@ -619,8 +619,12 @@ export class Client {
 			let issuer = issuers[issuerKey] as OnChainIssuer
 
 			try {
-				const tokens = await this.loadOnChainTokens(issuer)
-
+				let tokens
+				if (issuers[issuerKey].oauth2) {
+					tokens = await this.loadOnChainTokensViaOauth2(issuer)
+				} else {
+					tokens = await this.loadOnChainTokens(issuer)
+				}
 				this.tokenStore.setTokens(issuerKey, tokens)
 			} catch (err) {
 				logger(2, err)
@@ -668,9 +672,13 @@ export class Client {
 
 		let tokens
 
-		if (config.onChain === true) {
+		if (config.oauth2 && config.onChain === true) {
+			tokens = await this.loadOnChainTokensViaOauth2(config)
+		} else if (!config.oauth2 && config.onChain === true) {
 			tokens = await this.loadOnChainTokens(config)
 		} else {
+			// TODO //
+			// @ts-ignore
 			tokens = await this.loadOutletTokens(config)
 		}
 
@@ -683,6 +691,14 @@ export class Client {
 		return tokens
 	}
 
+	private async loadOnChainTokensViaOauth2(issuer: OnChainIssuer): Promise<any[]> {
+		// TODO implement logic here to attempt to load the tokens with Socios config
+		// when access token is in local storage.
+		// const accessToken = getAccessToken
+		console.log('CLIENT - loadOnChainTokensViaOauth2')
+		return []
+	}
+
 	private async loadOnChainTokens(issuer: OnChainIssuer): Promise<any[]> {
 		let walletProvider = await this.getWalletProvider()
 
diff --git a/src/client/interface.ts b/src/client/interface.ts
index 2b029477..694236b4 100644
--- a/src/client/interface.ts
+++ b/src/client/interface.ts
@@ -50,6 +50,8 @@ export interface IssuerConfigInterface {
 	noTokenMsg?: string
 	hideToggle?: boolean
 	fungible?: boolean
+	oauth2?: boolean
+	oauth2ConsumerKey?: string
 }
 
 export type Issuer = OffChainTokenConfig | SolanaIssuerConfig | OnChainTokenConfig | UltraIssuerConfig
diff --git a/src/client/views/select-wallet.ts b/src/client/views/select-wallet.ts
index 6937c663..0e4142bc 100644
--- a/src/client/views/select-wallet.ts
+++ b/src/client/views/select-wallet.ts
@@ -41,6 +41,11 @@ export class SelectWallet extends AbstractView {
 			}
 		}
 
+		if (this.client.hasIssuerForBlockchain('socios')) {
+			const socios = getWalletInfo(SupportedWalletProviders.Socios)
+			walletButtons += this.getWalletButtonHtml(socios)
+		}
+
 		if (this.client.hasIssuerForBlockchain('solana')) {
 			const phantom = getWalletInfo(SupportedWalletProviders.Phantom)
 			walletButtons += this.getWalletButtonHtml(phantom)
diff --git a/src/client/views/utils/wallet-info.ts b/src/client/views/utils/wallet-info.ts
index 83ca173d..00c3127b 100644
--- a/src/client/views/utils/wallet-info.ts
+++ b/src/client/views/utils/wallet-info.ts
@@ -8,6 +8,9 @@ export interface WalletInfo {
 	imgSmall?: string
 }
 
+const sociosSVG =
+	'<svg width="100%" height="100%" viewBox="0 0 62 62" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><g transform="matrix(0.0415754,0,0,0.0415754,-15.4175,-33.0879)"><path d="M855.511,1399.23C842.106,1390.76 828.834,1382.08 815.695,1373.21C802.543,1364.34 789.537,1355.25 776.677,1345.98C763.804,1336.71 751.091,1327.25 738.511,1317.59C725.93,1307.94 713.496,1298.08 701.221,1288.06C653.014,1240.06 668.653,1086.04 668.746,1083.28C667.922,1074.88 668.733,1066.39 671.14,1058.3C673.534,1050.18 677.483,1042.63 682.763,1036.03C688.042,1029.42 694.545,1023.91 701.913,1019.78C709.284,1015.65 717.386,1012.98 725.771,1011.92C789.802,995.883 854.723,983.627 920.195,975.22C985.664,966.815 1051.57,962.281 1117.59,961.629C1183.59,960.991 1249.57,964.236 1315.2,971.35C1380.83,978.478 1445.98,989.463 1510.31,1004.25C1585,1019.52 1611.53,1032.94 1615.46,1120.96C1617.37,1163.75 1618.05,1206.59 1617.51,1249.42C1616.97,1292.26 1615.2,1335.07 1612.21,1377.81C1610.4,1394.67 1604.11,1472.32 1533.09,1418.33C1515.92,1405.3 1489.13,1394.26 1493.1,1357.51C1496.56,1325.29 1497.31,1253.81 1497.86,1208.89C1497.94,1202.72 1497.39,1196.56 1496.24,1190.5C1495.07,1184.45 1493.3,1178.52 1490.96,1172.81C1488.6,1167.11 1485.68,1161.66 1482.25,1156.53C1478.79,1151.42 1474.84,1146.66 1470.45,1142.33C1465.8,1138.79 1460.93,1135.56 1455.86,1132.66C1450.8,1129.75 1445.54,1127.18 1440.14,1124.96C1434.74,1122.73 1429.2,1120.86 1423.55,1119.36C1417.91,1117.86 1412.16,1116.73 1406.38,1115.97C1261.7,1077.09 997.872,1071.53 844.846,1119.89C830.417,1124.46 770.188,1135.12 783.845,1260.77C784.696,1272.16 786.518,1283.47 789.284,1294.56C792.051,1305.64 795.761,1316.48 800.375,1326.93C804.99,1337.39 810.482,1347.43 816.799,1356.95C823.129,1366.48 830.244,1375.44 838.09,1383.75C839.42,1385.16 840.79,1386.56 842.186,1387.91C843.569,1389.27 845.005,1390.59 846.455,1391.88C847.904,1393.17 849.394,1394.43 850.897,1395.65C852.413,1396.88 853.942,1398.07 855.511,1399.23ZM1443.32,1795.77C1449.48,1782.68 1453.1,1768.54 1453.97,1754.1C1455.77,1724.98 1446.36,1696.25 1427.68,1673.83C1418.43,1662.72 1407.14,1653.46 1394.43,1646.55C1366.6,1627.14 1332.9,1605.81 1305.11,1586.41C1305.11,1586.41 1411.74,1650.04 1343.06,1735.54C1309.66,1777.08 1176.5,1892.3 1126.43,1887.58C1028.45,1878.35 813.328,1699.22 753.099,1655.28C750.53,1653.33 747.375,1652.3 744.149,1652.37C740.918,1652.42 737.806,1653.57 735.306,1655.61C732.805,1657.66 731.077,1660.48 730.372,1663.63C729.68,1666.79 730.066,1670.08 731.462,1673C750.865,1709.65 773.083,1744.74 797.915,1777.95C822.75,1811.16 850.12,1842.41 879.781,1871.4C909.437,1900.39 941.3,1927.04 975.092,1951.1C1008.87,1975.15 1044.46,1996.56 1081.55,2015.13C1090.27,2019.36 1099.57,2022.31 1109.14,2023.89C1118.71,2025.46 1128.46,2025.63 1138.08,2024.41C1147.71,2023.2 1157.11,2020.58 1165.98,2016.67C1174.85,2012.75 1183.11,2007.57 1190.5,2001.28C1213.58,1986.84 1236.2,1971.69 1258.34,1955.86C1280.48,1940.02 1302.13,1923.5 1323.26,1906.33C1344.38,1889.16 1364.97,1871.34 1384.99,1852.9C1405.02,1834.45 1424.48,1815.41 1443.32,1795.77Z" style="fill:rgb(6,28,44);fill-rule:nonzero;"/></g><g transform="matrix(0.0415754,0,0,0.0415754,-15.4175,-33.0879)"><path d="M1076.45,1343.35C1064.64,1356.86 1059.2,1374.82 1061.52,1392.61C1062.66,1401.41 1065.67,1409.87 1070.32,1417.42C1074.99,1424.98 1081.2,1431.45 1088.56,1436.43C1170.97,1493.45 1320.03,1596.7 1393.25,1647.65C1405.75,1654.64 1416.84,1663.89 1425.98,1674.91C1435.13,1685.92 1442.16,1698.53 1446.74,1712.09C1451.33,1725.65 1453.37,1739.95 1452.78,1754.25C1452.19,1768.56 1448.97,1782.63 1443.28,1795.77C1450.32,1787.59 1457.2,1779.28 1463.93,1770.85C1470.66,1762.41 1477.23,1753.86 1483.63,1745.18C1490.04,1736.5 1496.29,1727.71 1502.37,1718.8C1508.44,1709.88 1514.35,1700.85 1520.09,1691.72C1552.45,1638.7 1538.06,1589.11 1462.82,1539.89L1165.02,1332.46C1158.31,1327.82 1150.81,1324.44 1142.89,1322.49C1134.98,1320.53 1126.76,1320.04 1118.66,1321.04C1110.56,1322.03 1102.72,1324.49 1095.5,1328.31C1088.28,1332.12 1081.83,1337.22 1076.45,1343.35ZM1081.08,1637.18C1085.79,1630.67 1089.17,1623.3 1091.03,1615.48C1092.88,1607.66 1093.17,1599.55 1091.89,1591.61C1089.3,1575.59 1080.43,1561.25 1067.25,1551.78C993.949,1499.01 858.091,1401.25 788.872,1351.7C705.73,1291.22 677.138,1191.89 668.746,1082.02C667.017,1104.74 665.701,1127.49 664.81,1150.26C663.919,1173.01 663.427,1195.79 663.36,1218.57C663.237,1264.14 664.763,1309.7 667.935,1355.16C674.305,1427.49 723.829,1464.81 782.755,1506.99L990.106,1656.59C997.473,1660.87 1005.57,1663.75 1013.99,1665.1C1022.41,1666.44 1031,1666.21 1039.34,1664.43C1047.67,1662.65 1055.62,1659.35 1062.76,1654.7C1069.88,1650.04 1076.11,1644.1 1081.08,1637.18Z" style="fill:rgb(29,51,68);fill-rule:nonzero;"/></g></svg>'
+
 const phantomSVG =
 	'<svg width="62px" height="62px" viewBox="-30 -20 180 180" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><title>Phantom logo</title><path d="M57.137,22.8c23.339,0.075 42.264,18.847 42.563,42.1l10.1,0c3.8,0 6.8,3 6.8,6.8c0,19.661 -32.669,36.532 -54.77,36.6l-0.13,0c-23.6,0 -47.4,-19.1 -47.4,-42.7c0,-1.6 0.1,-3.1 0.2,-4.6c2.3,-21.6 20.5,-38.2 42.5,-38.2l0.137,0Z" style="fill:url(#_Linear1);fill-rule:nonzero;"/><path d="M64,0c35.323,0 64,28.677 64,64c0,35.323 -28.677,64 -64,64c-35.323,0 -64,-28.677 -64,-64c0,-35.323 28.677,-64 64,-64Zm-7,22.8l1.366,0.021l1.23,0.057l0.528,0.035c14.242,1.029 26.545,9.033 33.507,20.608l0.521,0.891l0.499,0.902l0.478,0.915l0.455,0.928l0.434,0.939l0.411,0.952l0.388,0.963l0.365,0.974l0.342,0.985l0.394,1.246l0.332,1.166l0.282,1.114l0.265,1.179l0.224,1.148l0.198,1.19l0.147,1.053l0.12,1.062l0.095,1.068l0.067,1.077l0.042,1.083l0.01,0.544c0,0 10.1,0 10.1,0c3.8,0 6.8,3 6.8,6.8l-0.018,0.788l-0.054,0.818l-0.089,0.79l-0.125,0.802l-0.184,0.903l-0.226,0.897l-0.27,0.891l-0.31,0.885l-0.351,0.879l-0.391,0.872l-0.429,0.865l-0.51,0.933l-0.504,0.844l-0.538,0.836l-0.572,0.828l-0.605,0.818l-0.636,0.809l-0.667,0.799l-0.697,0.79l-0.726,0.779l-0.754,0.769l-0.78,0.758l-0.806,0.747l-0.831,0.736c-2.552,2.209 -5.436,4.262 -8.532,6.119l-0.553,0.328l-0.517,0.301l-0.521,0.298l-0.525,0.294l-0.527,0.29l-0.532,0.287c-6.807,3.636 -14.382,6.343 -21.59,7.752l-1.154,0.215l-0.862,0.146c-1.959,0.32 -3.883,0.539 -5.747,0.65l-1.464,0.065l-1.173,0.019l-0.13,-0c-23.6,-0 -47.4,-19.1 -47.4,-42.7c0,-1.6 0.1,-3.1 0.2,-4.6c2.3,-21.6 20.5,-38.2 42.5,-38.2Zm-17.3,34.1l0,9.1c0,3.1 -2.5,5.6 -5.6,5.6c-3.1,-0 -5.6,-2.5 -5.6,-5.6l0,-9.1c0,-3.1 2.5,-5.6 5.6,-5.6c3.1,-0 5.6,2.5 5.6,5.6Zm19.7,-0l0,9.1c0,3.1 -2.5,5.6 -5.6,5.6c-3.1,-0 -5.6,-2.5 -5.6,-5.6l0,-9.1c0,-3.1 2.5,-5.6 5.6,-5.6c3.1,-0 5.6,2.5 5.6,5.6Z" style="fill:url(#_Linear2);"/><defs><linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(5.23303e-15,85.4619,-85.4619,5.23303e-15,65.46,22.76)"><stop offset="0" style="stop-color:#fefeff;stop-opacity:1"/><stop offset="1" style="stop-color:#dfd8fc;stop-opacity:1"/></linearGradient><linearGradient id="_Linear2" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(7.83774e-15,128,-128,7.83774e-15,64,0)"><stop offset="0" style="stop-color:#534ab1;stop-opacity:1"/><stop offset="1" style="stop-color:#551bf8;stop-opacity:1"/></linearGradient></defs></svg>'
 
@@ -188,6 +191,12 @@ export function getWalletInfo(providerType: SupportedWalletProviders): WalletInf
 				label: 'SafeConnect',
 				imgBig: safeConnectSVG,
 			}
+		case SupportedWalletProviders.Socios:
+			return {
+				name: providerType,
+				label: 'Socios',
+				imgBig: sociosSVG,
+			}
 		case SupportedWalletProviders.Ultra:
 			return {
 				name: providerType,
diff --git a/src/utils/support/isSupported.ts b/src/utils/support/isSupported.ts
index 76e5742b..4709d32a 100644
--- a/src/utils/support/isSupported.ts
+++ b/src/utils/support/isSupported.ts
@@ -52,6 +52,10 @@ export const validateBlockchain = (blockchain: string) => {
 		return 'solana'
 	}
 
+	if (blockchain === 'socios') {
+		return 'socios'
+	}
+
 	if (blockchain === 'evm') {
 		return 'evm'
 	}
diff --git a/src/wallet/Web3WalletProvider.ts b/src/wallet/Web3WalletProvider.ts
index 4817a6f7..44bad924 100644
--- a/src/wallet/Web3WalletProvider.ts
+++ b/src/wallet/Web3WalletProvider.ts
@@ -2,7 +2,7 @@ import { ethers } from 'ethers'
 import { logger, strToHexStr, strToUtfBytes } from '../utils'
 import { SafeConnectOptions } from './SafeConnectProvider'
 import { Client } from '../client'
-import { SupportedBlockchainsParam, WalletOptionsInterface, SignatureSupportedBlockchainsParamList } from '../client/interface'
+import { SupportedBlockchainsParam, WalletOptionsInterface, SignatureSupportedBlockchainsParamList, Issuer } from '../client/interface'
 import { DEFAULT_RPC_MAP } from '../core/constants'
 
 interface WalletConnectionState {
@@ -33,6 +33,7 @@ export enum SupportedWalletProviders {
 	Ultra = 'Ultra',
 	SafeConnect = 'SafeConnect',
 	AlphaWallet = 'AlphaWallet',
+	Socios = 'Socios',
 }
 
 export class Web3WalletProvider {
@@ -449,6 +450,37 @@ export class Web3WalletProvider {
 		return this.registerEvmProvider(provider, 'Torus')
 	}
 
+	async Socios(checkConnectionOnly: boolean) {
+		logger(2, 'connect Socios')
+
+		let clientKey
+
+		for (const issuer of this.client.config.issuers) {
+			if (issuer.oauth2ConsumerKey) {
+				clientKey = issuer.oauth2ConsumerKey
+				continue
+			}
+		}
+
+		if (clientKey) {
+			try {
+				const redirectURI = window.location.href
+				const partnerTag = 'smarttokenlabs'
+				const clientId = 'token-negotiator'
+				const query = `https://partner.socios.com/oauth2/authorize?response_type=code&client_id=${clientId}&redirect_uri=${redirectURI}&partner_tag=${partnerTag}?`
+				const response = await fetch(query, { method: 'GET', redirect: 'follow' })
+				const ok = response.status >= 200 && response.status <= 299
+				if (!ok) {
+					console.warn('token api request failed: ', query)
+					return
+				} else throw new Error(`HTTP error! status: ${response.status}`)
+			} catch (msg: any) {
+				throw new Error(`HTTP error.`)
+			}
+		}
+		// throw new Error('Lets connect Socios.')
+	}
+
 	async Phantom(checkConnectionOnly: boolean) {
 		logger(2, 'connect Phantom')
 
diff --git a/webpack.config.js b/webpack.config.js
index ab49251c..d8231663 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -3,7 +3,7 @@ const webpack = require("webpack");
 const TerserPlugin = require("terser-webpack-plugin");
 
 module.exports = {
-  mode: "production",
+  mode: "development",
   target: "web",
   entry: "./src/index.ts",
   plugins: [

From c04c0577281432e1ff7ae75b95275152c2d26bc0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Aug 2023 03:25:49 +0000
Subject: [PATCH 02/46] Bump sass from 1.62.1 to 1.66.1

Bumps [sass](https://github.com/sass/dart-sass) from 1.62.1 to 1.66.1.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.62.1...1.66.1)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0e3ebdaf..a46a3106 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16925,9 +16925,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.62.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.62.1.tgz",
-      "integrity": "sha512-NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.66.1.tgz",
+      "integrity": "sha512-50c+zTsZOJVgFfTgwwEzkjA3/QACgdNsKueWPyAR0mRINIvLAStVQBbPg14iuqEQ74NPDbXzJARJ/O4SI1zftA==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -33025,9 +33025,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.62.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.62.1.tgz",
-      "integrity": "sha512-NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.66.1.tgz",
+      "integrity": "sha512-50c+zTsZOJVgFfTgwwEzkjA3/QACgdNsKueWPyAR0mRINIvLAStVQBbPg14iuqEQ74NPDbXzJARJ/O4SI1zftA==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",

From 03e87ed7d7b697eb40b036f3aefacde40d16e95e Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Mon, 21 Aug 2023 14:27:23 +1000
Subject: [PATCH 03/46] wip

---
 index.html                       | 27 ++++++++++++++++++++---
 src/client/index.ts              |  2 +-
 src/client/interface.ts          |  6 ++++-
 src/index.ts                     |  1 +
 src/server/index.ts              | 14 ++++++++++++
 src/server/socios.ts             | 15 +++++++++++++
 src/wallet/Web3WalletProvider.ts | 38 +++++++++++++++++++++++---------
 7 files changed, 88 insertions(+), 15 deletions(-)
 create mode 100644 src/server/index.ts
 create mode 100644 src/server/socios.ts

diff --git a/index.html b/index.html
index 85913545..cfb43048 100644
--- a/index.html
+++ b/index.html
@@ -19,19 +19,40 @@
     <script>
       var theme = "light";
       function init() {
+        window.negotiator = new negotiator.Server({
+          issuers: {
+            socios: {
+              type: "oauth2",
+              consumerKey: "V6SYZtfR45fanvAPHWOQS50qfsYa",
+              consumerSecret: "...",
+              partnerTag: "smarttokenlabs",
+              redirectURI: "http://my.server.com/bar",
+            },
+          },
+        });
+
         window.negotiator = new negotiator.Client({
           type: "active",
           issuers: [
             {
               onChain: true,
               oauth2: true,
-              oauth2ConsumerKey: "V6SYZtfR45fanvAPHWOQS50qfsYa",
               fungile: true,
               chain: "socios",
               blockchain: "socios",
               collectionID: "Socios",
-              redirect_uri: "",
-              partner_tag: "",
+              endpoints: {
+                login: {
+                  path: "/socios/login",
+                  reqiredParams: {
+                    consumerKey: "V6SYZtfR45fanvAPHWOQS50qfsYa",
+                  },
+                },
+                balance: {
+                  path: "/socios/getTokenBalance",
+                  reqiredParams: {},
+                },
+              },
             },
             //           {
             //             hideToggle: true,
diff --git a/src/client/index.ts b/src/client/index.ts
index ace3cc16..ebe914e9 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -293,7 +293,7 @@ export class Client {
 		return (
 			this.config.issuers.filter((issuer: OnChainTokenConfig) => {
 				if (blockchain === 'evm' && !issuer.onChain) return true
-				if (blockchain === 'socios' && !issuer.oauth2 && issuer.oauth2ConsumerKey) return false
+				if (blockchain === 'socios' && !issuer.oauth2 && !issuer.consumerKey) return false
 				if (blockchain === 'solana' && typeof window.solana === 'undefined') return false
 				if (blockchain === 'ultra' && typeof window.ultra === 'undefined') return false
 				return (issuer.blockchain ? issuer.blockchain.toLowerCase() : 'evm') === blockchain
diff --git a/src/client/interface.ts b/src/client/interface.ts
index 694236b4..6314c9a0 100644
--- a/src/client/interface.ts
+++ b/src/client/interface.ts
@@ -19,6 +19,7 @@ export interface OffChainTokenConfig extends IssuerConfigInterface {
 }
 
 export interface OnChainTokenConfig extends IssuerConfigInterface {
+	clientID: boolean
 	onChain: true
 	contract: string
 	chain: string
@@ -51,7 +52,10 @@ export interface IssuerConfigInterface {
 	hideToggle?: boolean
 	fungible?: boolean
 	oauth2?: boolean
-	oauth2ConsumerKey?: string
+	consumerKey?: string
+	redirectURI?: string
+	partnerTag?: string
+	serverEndPoint?: string
 }
 
 export type Issuer = OffChainTokenConfig | SolanaIssuerConfig | OnChainTokenConfig | UltraIssuerConfig
diff --git a/src/index.ts b/src/index.ts
index 0f379180..ddc0562a 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,4 +1,5 @@
 export { Client } from './client/index'
+export { Server } from './server/index'
 export { AbstractView, type ViewInterface } from './client/views/view-interface'
 export { Outlet } from './outlet/index'
 export { Start } from './client/views/start'
diff --git a/src/server/index.ts b/src/server/index.ts
new file mode 100644
index 00000000..a10d73a7
--- /dev/null
+++ b/src/server/index.ts
@@ -0,0 +1,14 @@
+export class Server {
+	public socios: any
+	public tokenConfig: any
+	constructor(public _tokenConfig: any) {
+		this.tokenConfig = _tokenConfig
+		this.initSocios()
+	}
+	async initSocios() {
+		if (this.tokenConfig.issuers.socios) {
+			const { Socios } = await import('./socios')
+			this.socios = new Socios(this.tokenConfig)
+		}
+	}
+}
diff --git a/src/server/socios.ts b/src/server/socios.ts
new file mode 100644
index 00000000..666e1524
--- /dev/null
+++ b/src/server/socios.ts
@@ -0,0 +1,15 @@
+export class Socios {
+	constructor(private tokenConfig: any) {
+		//
+	}
+	// public async login() {
+	// const query = `https://partner.socios.com/oauth2/authorize?response_type=code&client_id=${clientId}&redirect_uri=${redirectURI}&partner_tag=${partnerTag}?`
+	// }
+	// public async logout() {}
+	// public async getWalletInstance() {}
+	// public async getFungilbleTokenBalance() {}
+	// public async getNonFungilbleTokens() {}
+	// public async signMessage() {}
+}
+
+//
diff --git a/src/wallet/Web3WalletProvider.ts b/src/wallet/Web3WalletProvider.ts
index 44bad924..ba25964e 100644
--- a/src/wallet/Web3WalletProvider.ts
+++ b/src/wallet/Web3WalletProvider.ts
@@ -453,31 +453,49 @@ export class Web3WalletProvider {
 	async Socios(checkConnectionOnly: boolean) {
 		logger(2, 'connect Socios')
 
-		let clientKey
+		// if tn-oauth-wallet-connections: {} return connection
+
+		let params = { consumerKey: undefined }
+		let serverEndPoint
 
 		for (const issuer of this.client.config.issuers) {
-			if (issuer.oauth2ConsumerKey) {
-				clientKey = issuer.oauth2ConsumerKey
-				continue
+			// @ts-ignore
+			if (issuer.consumerKey && issuer.api.endpoints.login.path) {
+				// TODO check all reqiredParams exist
+				params.consumerKey = issuer.consumerKey
+				// @ts-ignore
+				serverEndPoint = issuer.api.endpoints.login.path
+				break
 			}
 		}
 
-		if (clientKey) {
+		if (params.consumerKey) {
 			try {
-				const redirectURI = window.location.href
-				const partnerTag = 'smarttokenlabs'
-				const clientId = 'token-negotiator'
-				const query = `https://partner.socios.com/oauth2/authorize?response_type=code&client_id=${clientId}&redirect_uri=${redirectURI}&partner_tag=${partnerTag}?`
+				const query = `${serverEndPoint}?${new URLSearchParams(params)}`
 				const response = await fetch(query, { method: 'GET', redirect: 'follow' })
 				const ok = response.status >= 200 && response.status <= 299
 				if (!ok) {
-					console.warn('token api request failed: ', query)
+					// store a property e.g. tn-oauth-wallet-connections: {}
 					return
 				} else throw new Error(`HTTP error! status: ${response.status}`)
 			} catch (msg: any) {
 				throw new Error(`HTTP error.`)
 			}
 		}
+
+		// if (clientId && redirectURI && partnerTag) {
+		// 	try {
+		// 		const query = `https://partner.socios.com/oauth2/authorize?response_type=code&client_id=${clientId}&redirect_uri=${redirectURI}&partner_tag=${partnerTag}?`
+		// 		const response = await fetch(query, { method: 'GET', redirect: 'follow' })
+		// 		const ok = response.status >= 200 && response.status <= 299
+		// 		if (!ok) {
+		// 			console.warn('token api request failed: ', query)
+		// 			return
+		// 		} else throw new Error(`HTTP error! status: ${response.status}`)
+		// 	} catch (msg: any) {
+		// 		throw new Error(`HTTP error.`)
+		// 	}
+		// }
 		// throw new Error('Lets connect Socios.')
 	}
 

From 15ac30a3fe4ca98b347b4d765fe73c4fa6040b98 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Tue, 22 Aug 2023 16:55:04 +1000
Subject: [PATCH 04/46] wip socios

---
 index.html                         | 46 ++++++++++++----------------
 src/client/index.ts                |  2 +-
 src/server/index.ts                | 14 ---------
 src/server/socios.ts               | 15 ---------
 src/wallet/Web3WalletProvider.ts   | 49 ++++++++----------------------
 src/wallet/__test__/wallet.spec.ts | 44 +++++++++++++++------------
 6 files changed, 58 insertions(+), 112 deletions(-)
 delete mode 100644 src/server/index.ts
 delete mode 100644 src/server/socios.ts

diff --git a/index.html b/index.html
index cfb43048..283b2063 100644
--- a/index.html
+++ b/index.html
@@ -19,18 +19,6 @@
     <script>
       var theme = "light";
       function init() {
-        window.negotiator = new negotiator.Server({
-          issuers: {
-            socios: {
-              type: "oauth2",
-              consumerKey: "V6SYZtfR45fanvAPHWOQS50qfsYa",
-              consumerSecret: "...",
-              partnerTag: "smarttokenlabs",
-              redirectURI: "http://my.server.com/bar",
-            },
-          },
-        });
-
         window.negotiator = new negotiator.Client({
           type: "active",
           issuers: [
@@ -42,14 +30,20 @@
               blockchain: "socios",
               collectionID: "Socios",
               endpoints: {
-                login: {
-                  path: "/socios/login",
-                  reqiredParams: {
-                    consumerKey: "V6SYZtfR45fanvAPHWOQS50qfsYa",
-                  },
+                userLogin: {
+                  path: "/user-login",
+                  reqiredParams: {},
+                },
+                userBalance: {
+                  path: "/user-balance",
+                  reqiredParams: {},
                 },
-                balance: {
-                  path: "/socios/getTokenBalance",
+                userNfts: {
+                  path: "/user-nfts",
+                  reqiredParams: {},
+                },
+                userLogout: {
+                  path: "/user-logout",
                   reqiredParams: {},
                 },
               },
@@ -399,13 +393,13 @@
             chain: "mainnet",
             blockchain: "solana",
           },
-          {
-            onChain: true,
-            collectionID: "expansion-punks",
-            contract: "0x0d0167a823c6619d430b1a96ad85b888bcf97c37",
-            chain: "eth",
-            blockchain: "evm",
-          },
+          // {
+          //   onChain: true,
+          //   collectionID: "expansion-punks",
+          //   contract: "0x0d0167a823c6619d430b1a96ad85b888bcf97c37",
+          //   chain: "eth",
+          //   blockchain: "evm",
+          // },
           {
             onChain: true,
             collectionID: "fantom-collection-test",
diff --git a/src/client/index.ts b/src/client/index.ts
index ebe914e9..0182e702 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -293,7 +293,7 @@ export class Client {
 		return (
 			this.config.issuers.filter((issuer: OnChainTokenConfig) => {
 				if (blockchain === 'evm' && !issuer.onChain) return true
-				if (blockchain === 'socios' && !issuer.oauth2 && !issuer.consumerKey) return false
+				if (blockchain === 'socios' && !issuer.oauth2) return false
 				if (blockchain === 'solana' && typeof window.solana === 'undefined') return false
 				if (blockchain === 'ultra' && typeof window.ultra === 'undefined') return false
 				return (issuer.blockchain ? issuer.blockchain.toLowerCase() : 'evm') === blockchain
diff --git a/src/server/index.ts b/src/server/index.ts
deleted file mode 100644
index a10d73a7..00000000
--- a/src/server/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export class Server {
-	public socios: any
-	public tokenConfig: any
-	constructor(public _tokenConfig: any) {
-		this.tokenConfig = _tokenConfig
-		this.initSocios()
-	}
-	async initSocios() {
-		if (this.tokenConfig.issuers.socios) {
-			const { Socios } = await import('./socios')
-			this.socios = new Socios(this.tokenConfig)
-		}
-	}
-}
diff --git a/src/server/socios.ts b/src/server/socios.ts
deleted file mode 100644
index 666e1524..00000000
--- a/src/server/socios.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export class Socios {
-	constructor(private tokenConfig: any) {
-		//
-	}
-	// public async login() {
-	// const query = `https://partner.socios.com/oauth2/authorize?response_type=code&client_id=${clientId}&redirect_uri=${redirectURI}&partner_tag=${partnerTag}?`
-	// }
-	// public async logout() {}
-	// public async getWalletInstance() {}
-	// public async getFungilbleTokenBalance() {}
-	// public async getNonFungilbleTokens() {}
-	// public async signMessage() {}
-}
-
-//
diff --git a/src/wallet/Web3WalletProvider.ts b/src/wallet/Web3WalletProvider.ts
index ba25964e..c14e814b 100644
--- a/src/wallet/Web3WalletProvider.ts
+++ b/src/wallet/Web3WalletProvider.ts
@@ -452,51 +452,28 @@ export class Web3WalletProvider {
 
 	async Socios(checkConnectionOnly: boolean) {
 		logger(2, 'connect Socios')
-
 		// if tn-oauth-wallet-connections: {} return connection
-
-		let params = { consumerKey: undefined }
 		let serverEndPoint
-
+		let params = {}
 		for (const issuer of this.client.config.issuers) {
 			// @ts-ignore
-			if (issuer.consumerKey && issuer.api.endpoints.login.path) {
-				// TODO check all reqiredParams exist
-				params.consumerKey = issuer.consumerKey
+			if (issuer.endpoints.login.path) {
 				// @ts-ignore
-				serverEndPoint = issuer.api.endpoints.login.path
+				serverEndPoint = issuer.endpoints.login.path
 				break
 			}
 		}
-
-		if (params.consumerKey) {
-			try {
-				const query = `${serverEndPoint}?${new URLSearchParams(params)}`
-				const response = await fetch(query, { method: 'GET', redirect: 'follow' })
-				const ok = response.status >= 200 && response.status <= 299
-				if (!ok) {
-					// store a property e.g. tn-oauth-wallet-connections: {}
-					return
-				} else throw new Error(`HTTP error! status: ${response.status}`)
-			} catch (msg: any) {
-				throw new Error(`HTTP error.`)
-			}
+		try {
+			const query = `${serverEndPoint}?${new URLSearchParams(params)}`
+			const response = await fetch(query, { method: 'GET', redirect: 'follow' })
+			const ok = response.status >= 200 && response.status <= 299
+			if (!ok) {
+				// store a property e.g. tn-oauth-wallet-connections: {}
+				return
+			} else throw new Error(`HTTP error! status: ${response.status}`)
+		} catch (msg: any) {
+			throw new Error(`HTTP error.`)
 		}
-
-		// if (clientId && redirectURI && partnerTag) {
-		// 	try {
-		// 		const query = `https://partner.socios.com/oauth2/authorize?response_type=code&client_id=${clientId}&redirect_uri=${redirectURI}&partner_tag=${partnerTag}?`
-		// 		const response = await fetch(query, { method: 'GET', redirect: 'follow' })
-		// 		const ok = response.status >= 200 && response.status <= 299
-		// 		if (!ok) {
-		// 			console.warn('token api request failed: ', query)
-		// 			return
-		// 		} else throw new Error(`HTTP error! status: ${response.status}`)
-		// 	} catch (msg: any) {
-		// 		throw new Error(`HTTP error.`)
-		// 	}
-		// }
-		// throw new Error('Lets connect Socios.')
 	}
 
 	async Phantom(checkConnectionOnly: boolean) {
diff --git a/src/wallet/__test__/wallet.spec.ts b/src/wallet/__test__/wallet.spec.ts
index 0f6af4be..72837e47 100644
--- a/src/wallet/__test__/wallet.spec.ts
+++ b/src/wallet/__test__/wallet.spec.ts
@@ -7,29 +7,33 @@ import { Client } from '../../client/index'
 import { SafeConnectOptions, SafeConnectProvider } from '../SafeConnectProvider'
 import { Web3WalletProvider } from '../Web3WalletProvider'
 
+// TODO DEBUG:
+// '"0x88b48f654c30e99bc2e4a1559b4dcf1ad93fa656"' is not assignable to type '"eosio.nft.
+// When issuers are uncommented.
+
 let tokenNegotiatorClient = new Client({
 	type: 'active',
 	issuers: [
-		{
-			collectionID: 'rinkeby-punk',
-			onChain: true,
-			contract: '0x88b48f654c30e99bc2e4a1559b4dcf1ad93fa656',
-			chain: 'rinkeby',
-			openSeaSlug: 'rinkeby-punk',
-		},
-		{
-			collectionID: 'expansion-punk',
-			onChain: true,
-			contract: '0x0d0167a823c6619d430b1a96ad85b888bcf97c37',
-			chain: 'eth',
-		},
-		{
-			collectionID: 'women-tribe',
-			onChain: true,
-			contract: '0x88b48f654c30e99bc2e4a1559b4dcf1ad93fa656',
-			chain: 'rinkeby',
-			openSeaSlug: 'stl-rnd-women-tribe-nfts',
-		},
+		// {
+		// 	collectionID: 'punk',
+		// 	onChain: true,
+		// 	contract: '0x88b48f654c30e99bc2e4a1559b4dcf1ad93fa656',
+		// 	chain: 'mainnet',
+		// 	openSeaSlug: 'punk',
+		// },
+		// {
+		// 	collectionID: 'expansion-punk',
+		// 	onChain: true,
+		// 	contract: '0x0d0167a823c6619d430b1a96ad85b888bcf97c37',
+		// 	chain: 'eth',
+		// },
+		// {
+		// 	collectionID: 'women-tribe',
+		// 	onChain: true,
+		// 	contract: '0x88b48f654c30e99bc2e4a1559b4dcf1ad93fa656',
+		// 	chain: 'mainnet',
+		// 	openSeaSlug: 'stl-rnd-women-tribe-nfts',
+		// },
 	],
 })
 

From 3a1741e5544493d7f39941bf07a62d8006b87d9d Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Mon, 28 Aug 2023 10:41:25 +1000
Subject: [PATCH 05/46] socios wip

---
 index.html                         | 292 +++--------------------------
 src/client/index.ts                |  66 ++++++-
 src/client/interface.ts            |  53 +++++-
 src/client/tokenStore.ts           |   4 +
 src/client/views/select-issuers.ts |   2 +
 src/client/views/select-wallet.ts  |  11 +-
 src/index.ts                       |   1 -
 src/wallet/Web3WalletProvider.ts   | 106 ++++++++---
 src/wallet/__test__/wallet.spec.ts |  44 ++---
 9 files changed, 239 insertions(+), 340 deletions(-)

diff --git a/index.html b/index.html
index 283b2063..03728eee 100644
--- a/index.html
+++ b/index.html
@@ -5,7 +5,6 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Document</title>
-
     <script
       type="text/javascript"
       src="./token-negotiator-dist/negotiator.js"
@@ -24,276 +23,35 @@
           issuers: [
             {
               onChain: true,
-              oauth2: true,
               fungile: true,
               chain: "socios",
-              blockchain: "socios",
-              collectionID: "Socios",
-              endpoints: {
-                userLogin: {
-                  path: "/user-login",
-                  reqiredParams: {},
-                },
-                userBalance: {
-                  path: "/user-balance",
-                  reqiredParams: {},
-                },
-                userNfts: {
-                  path: "/user-nfts",
-                  reqiredParams: {},
+              blockchain: "chiliz",
+              collectionID: "socios",
+              oAuth2options: {
+                consumerKey: "PBK9Mx_ffFRUPHW9BLTxnGHRdywa",
+                redirectURI: "http://localhost:5000/user-login-callback",
+                partnerTag: "smarttokenlabs",
+                returnToApplicationURL: "/",
+                endpoints: {
+                  userAccessToken: {
+                    path: '/user-access-token',
+                    params: {}
+                  },
+                  userBalance: {
+                    path: "/user-balance",
+                    params: {}
+                  },
+                  userNfts: {
+                    path: "/user-nfts",
+                    params: {}
+                  },
+                  userLogout: {
+                    path: "/user-logout",
+                    params: {}
+                  },
                 },
-                userLogout: {
-                  path: "/user-logout",
-                  reqiredParams: {},
-                },
-              },
+              }, 
             },
-            //           {
-            //             hideToggle: true,
-            //             noTokenMsg:
-            //               "<p>If you hold a Devcon ticket, please visit your magicLink email again and open the link in this browser.</p><p>You may reload this page after and try again.</p>",
-            //             onChain: false,
-            //             tokenName: "devcon6",
-            //             collectionID: "devcon6",
-            //             title: "Devcon VI Ticket Attestation",
-            //             image: "https://devcon-vi.attest.tickets/img/nft_bg.png",
-            //             tokenOrigin: "https://devcon-vi.attest.tickets/outlet.html",
-            //             attestationOrigin: "https://test.attestation.id/",
-            //             tokenUrlName: "ticket",
-            //             cryptoVerify: "https://form.smarttokenlabs.com",
-            //             tokenSecretName: "secret",
-            //             tokenIdName: "mail",
-            //             unsignedTokenDataName: "ticket",
-            //             whitelistDialogRenderer: (permissionTxt, acceptBtn, denyBtn) => {
-            //               return `
-            // 	<div class="tn-auth-box">
-            // 		<div class="tn-auth-heading">
-            // 			<img alt="devcon" src="img/FB_OG_Image.svg" style="width: 150px;" />
-            // 		</div>
-            // 		<div class="tn-auth-content">
-            // 			<p>${permissionTxt}</p>
-            // 			${acceptBtn}
-            // 			${denyBtn}
-            // 		</div>
-            // 	</div>
-            // `;
-            //             },
-            //             signedTokenWhitelist: [
-            //               "https://devcon-vi.attest.tickets/",
-            //               "https://dev.loc",
-            //               "https://devconnect.loc/",
-            //               "https://devconnect.antopolbus.rv.ua/",
-            //               "https://perks.antopolbus.rv.ua/",
-            //               "https://stage-perks.smarttokenlabs.com/",
-            //               "http://localhost:5000/",
-            //               "https://hashkey.smarttokenlabs.com/",
-            //               "https://fayre-devcon.webflow.io/",
-            //               "https://fenbushi-devcon.webflow.io/",
-            //               "https://metasearch-devcon.webflow.io/",
-            //               "https://conspicuis-devcon.webflow.io/",
-            //               "https://devcon-vi.brandextender.io/",
-            //               "https://www.edcon.io/",
-            //             ],
-            //             itemStorageKey: "devconnectTokens",
-            //             base64senderPublicKeys: {
-            //               4: "MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAEAGJAHCiHbrCNAY9fAMdom4dGD6v/KkTIgRCkwLCjXFTkXWGrCEXHaZ8kWwdqlu0oYCrNQ2vdlqOl0s26/LzO8A==|MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAE-N-jGYo1OuO77XItd3zT-oIhZEVC44uqOhtJkmBsBNDTp3Seu_vmuLB-b4whNeFNBuJTsT7AHUiUe3JOwCcegA==",
-            //             },
-            //             base64attestorPubKey:
-            //               "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
-            //           },
-            //           {
-            //             collectionID: "devcon",
-            //             onChain: false,
-            //             title: "Devcon",
-            //             tokenIdName: "id",
-            //             image:
-            //               "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg",
-            //             tokenOrigin: "http://localhost:3002/",
-            //             attestationOrigin: "https://test.attestation.id/",
-            //             base64senderPublicKeys: {
-            //               6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
-            //               55: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
-            //             },
-            //             base64attestorPubKey:
-            //               "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
-            //             ticketIssuersUrlWebsitePrivateKey:
-            //               "MIICSwIBADCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBBIIBVTCCAVECAQEEIM/T+SzcXcdtcNIqo6ck0nJTYzKL5ywYBFNSpI7R8AuBoIHjMIHgAgEBMCwGByqGSM49AQECIQD////////////////////////////////////+///8LzBEBCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcEQQR5vmZ++dy7rFWgYpXOhwsHApv82y3OKNlZ8oFbFvgXmEg62ncmo8RlXaT7/A4RCKj9F7RIpoVUGZxH0I/7ENS4AiEA/////////////////////rqu3OavSKA7v9JejNA2QUECAQGhRANCAARjMR62qoIK9pHk17MyHHIU42Ix+Vl6Q2gTmIF72vNpinBpyoBkTkV0pnI1jdrLlAjJC0I91DZWQhVhddMCK65c",
-            //           },
-            // {
-            //   collectionID: "devcon",
-            //   onChain: false,
-            //   title: "Devcon",
-            //   image:
-            //     "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg",
-            //   tokenOrigin: "http://localhost:3002/",
-            //   attestationOrigin: "https://test.attestation.id/",
-            //   base64senderPublicKeys: {
-            //     6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
-            //   },
-            //   base64attestorPubKey:
-            //     "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
-            //   ticketIssuersUrlWebsitePrivateKey:
-            //     "MIICSwIBADCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBBIIBVTCCAVECAQEEIM/T+SzcXcdtcNIqo6ck0nJTYzKL5ywYBFNSpI7R8AuBoIHjMIHgAgEBMCwGByqGSM49AQECIQD////////////////////////////////////+///8LzBEBCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcEQQR5vmZ++dy7rFWgYpXOhwsHApv82y3OKNlZ8oFbFvgXmEg62ncmo8RlXaT7/A4RCKj9F7RIpoVUGZxH0I/7ENS4AiEA/////////////////////rqu3OavSKA7v9JejNA2QUECAQGhRANCAARjMR62qoIK9pHk17MyHHIU42Ix+Vl6Q2gTmIF72vNpinBpyoBkTkV0pnI1jdrLlAjJC0I91DZWQhVhddMCK65c",
-            // },
-            // {
-            //   collectionID: "edcon",
-            //   onChain: false,
-            //   title: "Edcon",
-            //   image:
-            //     "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRMSMZD26jgBM_da7b_0NfT7JZgyDk7rdk6o4iAVh4E12dV9LK-h0thJ_SdRWWptz1EYlk&usqp=CAU",
-            //   tokenOrigin: "http://localhost:3002/",
-            //   attestationOrigin: "https://test.attestation.id/",
-            //   base64senderPublicKeys: {
-            //     6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABAjUvEi8UYyC+0rSFu+IwRBos/DEC6YMJV+eCnoYOC4nZU7uayKDJmBxVnmTOSwaM4+gufLbeqqxuovyF5gI3TQ=",
-            //   },
-            //   base64attestorPubKey:
-            //     "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
-            // },
-            // {
-            //   collectionID: "devconnect",
-            //   onChain: false,
-            //   title: "Devconnect",
-            //   image:
-            //     "https://pbs.twimg.com/profile_images/1653427962350370816/GiJ0Wh-h_400x400.jpg",
-            //   tokenOrigin: "http://localhost:3002/",
-            //   attestationOrigin: "https://test.attestation.id/",
-            //   base64senderPublicKeys: {
-            //     7: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABAjUvEi8UYyC+0rSFu+IwRBos/DEC6YMJV+eCnoYOC4nZU7uayKDJmBxVnmTOSwaM4+gufLbeqqxuovyF5gI3TQ=",
-            //   },
-            //   base64attestorPubKey:
-            //     "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
-            // },
-            // {
-            // hideToggle : false,
-            // noTokenMsg: "<p>If you have a token please:</p><p>1. Open your magic link inside this browser.<br/>2. Refresh this page.</p>",
-            // collectionID: 'devcon',
-            // title: "Devcon",
-            // onChain: false,
-            // tokenOrigin: "http://localhost:3002/",
-            // attestationOrigin: "https://attestation.id/",
-            // unEndPoint: "https://crypto-verify.herokuapp.com/use-devcon-ticket",
-            // image: "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg",
-            // base64senderPublicKeys:
-            //     {
-            //         "AttestationDAO" : 'MFYwEAYHKoZIzj0CAQYFK...'
-            //     },
-            // base64attestorPubKey: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ="
-            // },
-            // {
-            //   collectionID: "crypto-cowboy-country",
-            //   tokenProgram: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
-            //   collectionAddress:
-            //     "bf0aae3dd0078a9feb975f1e3242ddcb7774d551c7fd2a3f07a89c827ed606b2",
-            //   updateAuthority: "CCCUzWanUNegjGby11DjujDvPaNN68jd9Rimwk2MZzqZ",
-            //   onChain: true,
-            //   symbol: "CCC",
-            //   chain: "mainnet",
-            //   blockchain: "solana",
-            // },
-            // {
-            //   collectionID: "penthouse-panther-club",
-            //   collectionAddress: "ff846ef2eed57e5367cf8826e63f4d53fe28d28aa67417accb6e4b48cbd19136",
-            //   updateAuthority: "92oYPmrr1BHznizuZmpKZ3MFRadMFYRTCxo9Pf34mZKX",
-            //   tokenProgram: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
-            //   onChain: true,
-            //   symbol: "PPC",
-            //   chain: "mainnet",
-            //   blockchain: "solana",
-            // },
-            // {
-            //   hideToggle : false,
-            //   collectionID: "pixel",
-            //   collectionAddress: "166424b16c4c7f40eb852f9eb2d0d6869a9ed7ac54a8e6afbd516676bfbbeb19",
-            //   onChain: true,
-            //   symbol: "PIXEL",
-            //   chain: "mainnet",
-            //   blockchain: "solana",
-            // },
-            // {
-            //   onChain: true,
-            //   collectionID: "expansion-punks",
-            //   contract: "0x0d0167a823c6619d430b1a96ad85b888bcf97c37",
-            //   chain: "eth",
-            //   blockchain: "evm",
-            // },
-            // {
-            //   onChain: true,
-            //   collectionID: "fantom-collection-test",
-            //   contract: "0x94e22c14118353651636f9af43cd0a5a08b93da3",
-            //   chain: "fantom",
-            //   blockchain: "evm",
-            // },
-            // {
-            //   hideToggle: true,
-            //   noTokenMsg:
-            //     "<p>If you have a token please:</p><p>1. Open your magic link inside this browser.<br/>2. Refresh this page.</p>",
-            //   onChain: true,
-            //   collectionID: "bsc-collection-test",
-            //   contract: "0xF5db804101d8600c26598A1Ba465166c33CdAA4b",
-            //   chain: "bsc",
-            //   blockchain: "evm",
-            // },
-            // {
-            //   onChain: true,
-            //   collectionID: "tt",
-            //   contract: '0x76be3b62873462d2142405439777e971754e8e77',
-            //   chain: 'eth',
-            //   blockchain: "evm",
-            // },
-            // { onChain: true, collectionID: "Perion", contract: '0x96af92ae2d822a0f191455ceca4d4e7ee227668e', chain: 'mumbai', blockchain: "evm" },
-            // { collectionID: 'COOLCATS-#2426-14', onChain: true, contract: '0x3C7e352481F4b2fdEc1e642a3f0018661c77513D', chain: 'eth', openSeaSlug: 'devcon-vi-suit-up-collection' },
-            // { collectionID: 'Town-Hall', onChain: true, contract: '0x81b30ff521D1fEB67EDE32db726D95714eb00637', chain: 'Optimism' },
-            // {
-            //   collectionID: "Blusteak Kangaroo #64",
-            //   onChain: true,
-            //   contract: "0xa996F7F3BC647EebC98C684aB0A302c9b85d2FA1",
-            //   chain: "Avalanche",
-            // },
-            // {
-            //   collectionID: "Alone Pirate",
-            //   onChain: true,
-            //   contract: "0x36535ec384B94342558e37282527b5052587af6A",
-            //   chain: "Arbitrum",
-            // },
-            // {
-            // 	collectionID: "NBA",
-            // 	onChain: true,
-            // 	contract: "A.0b2a3299cc857e29.TopShot",
-            // 	chain: "mainnet",
-            // 	blockchain: "flow",
-            // },
-            // {
-            //   onChain: true,
-            //   erc: 20,
-            //   fungible: true,
-            //   collectionID: "polygon",
-            //   contract: '0x52459834ca561cb55411699e9c2143683bcf865f',
-            //   chain: 'matic',
-            //   blockchain: "evm",
-            //   // Add fungible as a boolean
-            //   // symbol: 'USX'
-            // },
-            // {
-            //   contract: "0x107065a122f92636a1358a70a0efe0f1a080a7e5",
-            //   onChain: true,
-            //   fungible: true,
-            //   collectionID: "USX",
-            //   chain: "matic",
-            // },
-            // {
-            //   contract: "0x429f49faec3d568ef83ec803e02df78e25d5ee7d",
-            //   onChain: true,
-            //   fungible: true,
-            //   collectionID: "Ella",
-            //   chain: "matic",
-            // },
-            // {
-            //   contract: "0xaaa5b9e6c589642f98a1cda99b9d024b8407285a",
-            //   onChain: true,
-            //   fungible: true,
-            //   collectionID: "TITAN",
-            //   chain: "matic",
-            // },
           ],
           uiOptions: {
             openingHeading:
diff --git a/src/client/index.ts b/src/client/index.ts
index 7c3ba5fd..f8016a13 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -20,6 +20,7 @@ import {
 	OutletTokenResult,
 	MultiTokenInterface,
 	TokenNegotiatorEventsArgs,
+	Oauth2IssuerConfig,
 } from './interface'
 import { SignedUNChallenge } from './auth/signedUNChallenge'
 import { TicketZKProof } from './auth/ticketZKProof'
@@ -160,10 +161,49 @@ export class Client {
 		if (this.urlParams) {
 			return this.urlParams.get(URLNS + itemKey)
 		}
-
 		return null
 	}
 
+	// TODO see if we can reduce the need of this function.
+	// Where in the callback.html the AccessToken is derived and sent to this view.
+	// DISNEY MODE - where the token + wallet storage is automatically managed by TKN.
+	public async getAccessToken(collectionID: string, protocol = 'oauth2') {
+		const issuerConfig = this.tokenStore.getIssuerConfig(collectionID) as OnChainTokenConfig | Oauth2IssuerConfig
+		if (protocol.toLocaleLowerCase() === 'oauth2') {
+			if (issuerConfig.blockchain.toLocaleLowerCase() === 'chiliz') {
+				const oAuthConfig = issuerConfig as Oauth2IssuerConfig
+				const params = new URLSearchParams(location.search)
+				const code = params.get('code')
+				if (code !== null) {
+					fetch(`${oAuthConfig.oAuth2options.endpoints.userAccessToken.path}?code=${code}`)
+						.then((response) => response.json())
+						.then(async (data) => {
+							if (data.error) {
+								errorHandler(data.error, 'error', null, null, true, true)
+							} else {
+								await this.getWalletProvider()
+								// TODO use types to ensure it's not typed incorrectly
+								this.web3WalletProvider.registerNewOauth2WalletAddress(
+									'socios', // address
+									'socios', // chain id
+									'Socios', // provider
+									'chiliz', // blockchain
+									null,
+								)
+								sessionStorage.setItem('tn-socios', JSON.stringify(data))
+								if (oAuthConfig.oAuth2options.returnToApplicationURL) {
+									window.location.href = oAuthConfig.oAuth2options.returnToApplicationURL
+								}
+							}
+						})
+						.catch((error) => {
+							console.error('Error:', error)
+						})
+				}
+			}
+		}
+	}
+
 	public async readProofCallback() {
 		if (!this.getDataFromQuery) return false
 		let action = this.getDataFromQuery('action')
@@ -289,11 +329,11 @@ export class Client {
 	}
 
 	// TODO: Move to token store OR select-wallet view - this method is very similar to getCurrentBlockchains()
-	public hasIssuerForBlockchain(blockchain: 'evm' | 'solana' | 'flow' | 'ultra' | 'socios') {
+	public hasIssuerForBlockchain(blockchain: 'evm' | 'solana' | 'flow' | 'ultra' | 'chiliz') {
 		return (
 			this.config.issuers.filter((issuer: OnChainTokenConfig) => {
 				if (blockchain === 'evm' && !issuer.onChain) return true
-				if (blockchain === 'socios' && !issuer.oauth2) return false
+				if (blockchain === 'chiliz' && !issuer.oAuth2options) return false
 				if (blockchain === 'solana' && typeof window.solana === 'undefined') return false
 				if (blockchain === 'ultra' && typeof window.ultra === 'undefined') return false
 				return (issuer.blockchain ? issuer.blockchain.toLowerCase() : 'evm') === blockchain
@@ -620,7 +660,7 @@ export class Client {
 
 			try {
 				let tokens
-				if (issuers[issuerKey].oauth2) {
+				if (issuers[issuerKey].oAuth2options) {
 					tokens = await this.loadOnChainTokensViaOauth2(issuer)
 				} else {
 					tokens = await this.loadOnChainTokens(issuer)
@@ -672,9 +712,9 @@ export class Client {
 
 		let tokens
 
-		if (config.oauth2 && config.onChain === true) {
+		if (config.oAuth2options && config.onChain === true) {
 			tokens = await this.loadOnChainTokensViaOauth2(config)
-		} else if (!config.oauth2 && config.onChain === true) {
+		} else if (!config.oAuth2options && config.onChain === true) {
 			tokens = await this.loadOnChainTokens(config)
 		} else {
 			// TODO //
@@ -692,10 +732,16 @@ export class Client {
 	}
 
 	private async loadOnChainTokensViaOauth2(issuer: OnChainIssuer): Promise<any[]> {
-		// TODO implement logic here to attempt to load the tokens with Socios config
-		// when access token is in local storage.
-		// const accessToken = getAccessToken
-		console.log('CLIENT - loadOnChainTokensViaOauth2')
+		// tn-socios
+
+		let tokens
+
+		if (issuer.fungible) {
+			// tokens = await getFungibleTokenBalances(issuer, accessToken)
+		} else {
+			// tokens = await getNftTokens(issuer, accessToken)
+		}
+
 		return []
 	}
 
diff --git a/src/client/interface.ts b/src/client/interface.ts
index 6314c9a0..b5a19c72 100644
--- a/src/client/interface.ts
+++ b/src/client/interface.ts
@@ -6,8 +6,16 @@ import { WalletConnection } from '../wallet/Web3WalletProvider'
 import { DecodedToken } from '../outlet/ticketStorage'
 import { EasSchemaConfig } from '../outlet/interfaces'
 
-export type SupportedBlockchainsParam = 'evm' | 'flow' | 'solana' | 'ultra'
-export const SignatureSupportedBlockchainsParamList = ['evm', 'flow', 'solana', 'ultra']
+export enum SupportedBlockchainsEnum {
+	EVM = 'evm',
+	SOLANA = 'solana',
+	CHILIZ = 'chiliz',
+	FLOW = 'flow',
+	ULTRA = 'ultra',
+}
+
+export type SupportedBlockchainsParam = 'evm' | 'flow' | 'solana' | 'ultra' | 'chiliz'
+export const SignatureSupportedBlockchainsParamList = ['evm', 'flow', 'solana', 'ultra', 'chiliz']
 
 export interface OffChainTokenConfig extends IssuerConfigInterface {
 	onChain: false
@@ -16,15 +24,16 @@ export interface OffChainTokenConfig extends IssuerConfigInterface {
 	base64senderPublicKeys: { [key: string]: string }
 	base64attestorPubKey: string // TODO: Remove - only required in outlet
 	eas?: EasSchemaConfig
+	oAuth2options?: any
 }
 
 export interface OnChainTokenConfig extends IssuerConfigInterface {
-	clientID: boolean
-	onChain: true
+	onChain: boolean
 	contract: string
 	chain: string
 	openSeaSlug?: string
 	blockchain?: SupportedBlockchainsParam
+	oAuth2options?: any
 }
 
 export interface UltraIssuerConfig extends OnChainTokenConfig {
@@ -41,6 +50,38 @@ export interface SolanaIssuerConfig extends OnChainTokenConfig {
 	updateAuthority?: string
 }
 
+export interface Oauth2IssuerConfig {
+	collectionID: string
+	onChain: boolean
+	contract: string
+	chain: string
+	blockchain?: SupportedBlockchainsParam
+	oAuth2options: {
+		consumerKey: string
+		redirectURI: string
+		partnerTag: string
+		returnToApplicationURL?: string
+		endpoints: {
+			userAccessToken: {
+				path: string
+				params?: object
+			}
+			userBalance: {
+				path: string
+				params?: object
+			}
+			userNfts: {
+				path: string
+				params?: object
+			}
+			userLogout: {
+				path: string
+				params?: object
+			}
+		}
+	}
+}
+
 export interface IssuerConfigInterface {
 	collectionID: string
 	onChain: boolean
@@ -51,14 +92,14 @@ export interface IssuerConfigInterface {
 	noTokenMsg?: string
 	hideToggle?: boolean
 	fungible?: boolean
-	oauth2?: boolean
 	consumerKey?: string
 	redirectURI?: string
 	partnerTag?: string
 	serverEndPoint?: string
+	oAuth2options?: string
 }
 
-export type Issuer = OffChainTokenConfig | SolanaIssuerConfig | OnChainTokenConfig | UltraIssuerConfig
+export type Issuer = OffChainTokenConfig | SolanaIssuerConfig | OnChainTokenConfig | UltraIssuerConfig | Oauth2IssuerConfig
 export type OnChainIssuer = SolanaIssuerConfig | OnChainTokenConfig | UltraIssuerConfig
 export interface NegotiationInterface {
 	type: 'active' | 'passive'
diff --git a/src/client/tokenStore.ts b/src/client/tokenStore.ts
index ffa8aa5b..d7d0a24a 100644
--- a/src/client/tokenStore.ts
+++ b/src/client/tokenStore.ts
@@ -120,6 +120,10 @@ export class TokenStore {
 		return current
 	}
 
+	public getIssuerConfig(collectionId: string) {
+		return this.tokenLookup[collectionId]
+	}
+
 	public getCurrentBlockchains() {
 		const blockChains = []
 
diff --git a/src/client/views/select-issuers.ts b/src/client/views/select-issuers.ts
index 808e9e4d..d5e5f526 100644
--- a/src/client/views/select-issuers.ts
+++ b/src/client/views/select-issuers.ts
@@ -170,6 +170,8 @@ export class SelectIssuers extends AbstractView {
 	issuerConnectMarkup(title: string, image: string | undefined, issuer: string, tokens: any[], data: Issuer) {
 		let buttonText = ''
 
+		// TODO ensure fungilbe exists on type
+		// @ts-ignore
 		if (tokens?.length) buttonText = data?.fungible ? 'Balance found' : `${tokens.length} token${tokens.length > 1 ? 's' : ''} available`
 
 		return `
diff --git a/src/client/views/select-wallet.ts b/src/client/views/select-wallet.ts
index 0e4142bc..9db21fa3 100644
--- a/src/client/views/select-wallet.ts
+++ b/src/client/views/select-wallet.ts
@@ -4,6 +4,7 @@ import { UIUpdateEventType } from '../index'
 import { getWalletInfo, WalletInfo } from './utils/wallet-info'
 import { SupportedWalletProviders } from '../../wallet/Web3WalletProvider'
 import { getBrowserData } from '../../utils/support/getBrowserData'
+import { SupportedBlockchainsEnum } from './../interface';
 
 export class SelectWallet extends AbstractView {
 	init() {
@@ -13,7 +14,7 @@ export class SelectWallet extends AbstractView {
 	render() {
 		let walletButtons = ''
 
-		if (this.client.hasIssuerForBlockchain('evm')) {
+		if (this.client.hasIssuerForBlockchain(SupportedBlockchainsEnum.EVM)) {
 			if (this.client.safeConnectAvailable()) {
 				const safeConnect = getWalletInfo(SupportedWalletProviders.SafeConnect)
 				walletButtons += this.getWalletButtonHtml(safeConnect)
@@ -41,22 +42,22 @@ export class SelectWallet extends AbstractView {
 			}
 		}
 
-		if (this.client.hasIssuerForBlockchain('socios')) {
+		if (this.client.hasIssuerForBlockchain(SupportedBlockchainsEnum.CHILIZ)) {
 			const socios = getWalletInfo(SupportedWalletProviders.Socios)
 			walletButtons += this.getWalletButtonHtml(socios)
 		}
 
-		if (this.client.hasIssuerForBlockchain('solana')) {
+		if (this.client.hasIssuerForBlockchain(SupportedBlockchainsEnum.SOLANA)) {
 			const phantom = getWalletInfo(SupportedWalletProviders.Phantom)
 			walletButtons += this.getWalletButtonHtml(phantom)
 		}
 
-		if (this.client.hasIssuerForBlockchain('flow')) {
+		if (this.client.hasIssuerForBlockchain(SupportedBlockchainsEnum.FLOW)) {
 			const flow = getWalletInfo(SupportedWalletProviders.Flow)
 			walletButtons += this.getWalletButtonHtml(flow)
 		}
 
-		if (this.client.hasIssuerForBlockchain('ultra')) {
+		if (this.client.hasIssuerForBlockchain(SupportedBlockchainsEnum.ULTRA)) {
 			const ultra = getWalletInfo(SupportedWalletProviders.Ultra)
 			walletButtons += this.getWalletButtonHtml(ultra)
 		}
diff --git a/src/index.ts b/src/index.ts
index ddc0562a..0f379180 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,5 +1,4 @@
 export { Client } from './client/index'
-export { Server } from './server/index'
 export { AbstractView, type ViewInterface } from './client/views/view-interface'
 export { Outlet } from './outlet/index'
 export { Start } from './client/views/start'
diff --git a/src/wallet/Web3WalletProvider.ts b/src/wallet/Web3WalletProvider.ts
index c14e814b..d942ba87 100644
--- a/src/wallet/Web3WalletProvider.ts
+++ b/src/wallet/Web3WalletProvider.ts
@@ -2,11 +2,18 @@ import { ethers } from 'ethers'
 import { logger, strToHexStr, strToUtfBytes } from '../utils'
 import { SafeConnectOptions } from './SafeConnectProvider'
 import { Client } from '../client'
-import { SupportedBlockchainsParam, WalletOptionsInterface, SignatureSupportedBlockchainsParamList, Issuer } from '../client/interface'
+import {
+	SupportedBlockchainsParam,
+	WalletOptionsInterface,
+	SignatureSupportedBlockchainsParamList,
+	OffChainTokenConfig,
+	OnChainTokenConfig,
+} from '../client/interface'
 import { DEFAULT_RPC_MAP } from '../core/constants'
+import { Oauth2IssuerConfig } from './../client/interface'
 
 interface WalletConnectionState {
-	[index: string]: WalletConnection
+	[index: string]: WalletConnection | WalletConnectionOauth2
 }
 
 interface WalletMeta {
@@ -23,6 +30,15 @@ export interface WalletConnection {
 	meta?: WalletMeta
 }
 
+export interface WalletConnectionOauth2 {
+	address: string
+	chainId: number | string
+	blockchain: SupportedBlockchainsParam // TODO make this an OAuth list
+	provider: string
+	providerType: string
+	meta?: any
+}
+
 export enum SupportedWalletProviders {
 	MetaMask = 'MetaMask',
 	WalletConnectV2 = 'WalletConnectV2',
@@ -53,18 +69,30 @@ export class Web3WalletProvider {
 		for (let address in this.connections) {
 			let con = this.connections[address.toLowerCase()]
 
-			savedConnections[address] = {
-				address: con.address,
-				chainId: con.chainId,
-				providerType: con.providerType,
-				blockchain: con.blockchain,
+			const oAuth2 = con as WalletConnectionOauth2
+
+			if (oAuth2?.providerType === 'oauth2') {
+				savedConnections[address] = {
+					address: oAuth2.address,
+					chainId: oAuth2.chainId,
+					blockchain: oAuth2.blockchain,
+					providerType: oAuth2.providerType,
+					provider: oAuth2.provider,
+				}
+			} else {
+				savedConnections[address] = {
+					address: con.address,
+					chainId: con.chainId,
+					providerType: con.providerType,
+					blockchain: con.blockchain,
+				}
 			}
 		}
 
 		localStorage.setItem(Web3WalletProvider.LOCAL_STORAGE_KEY, JSON.stringify(savedConnections))
 	}
 
-	emitSavedConnection(address: string): WalletConnection | null {
+	emitSavedConnection(address: string): WalletConnection | WalletConnectionOauth2 | null {
 		if (Object.keys(this.connections).length && address) {
 			this.client.eventSender('connected-wallet', this.connections[address.toLowerCase()])
 			return this.connections[address.toLowerCase()]
@@ -132,6 +160,7 @@ export class Web3WalletProvider {
 			let connection = state[address]
 
 			try {
+				// TODO on Monday add support for oAuth flows
 				await this.connectWith(connection.providerType, true)
 			} catch (e) {
 				delete state[address]
@@ -217,8 +246,8 @@ export class Web3WalletProvider {
 		return Object.values(this.connections).filter((connection) => connection.blockchain === blockchain)
 	}
 
-	getSingleSignatureCompatibleConnection(): WalletConnection | false {
-		let connection: WalletConnection | false = false
+	getSingleSignatureCompatibleConnection(): WalletConnection | WalletConnectionOauth2 | false {
+		let connection: WalletConnection | WalletConnectionOauth2 | false = false
 		SignatureSupportedBlockchainsParamList.forEach((bc) => {
 			let connections = Object.values(this.connections).filter((connection) => connection.blockchain === bc)
 			if (connections.length) connection = connections[0]
@@ -234,6 +263,8 @@ export class Web3WalletProvider {
 		blockchain: SupportedBlockchainsParam,
 		walletMeta: WalletMeta = [] as WalletMeta,
 	) {
+		// TODO confirm the intention of the ethers param.
+		// should be blockchain according to params.
 		this.connections[address.toLowerCase()] = { address, chainId, providerType, provider, blockchain, ethers, meta: walletMeta }
 		switch (blockchain) {
 			case 'solana':
@@ -259,6 +290,19 @@ export class Web3WalletProvider {
 		}
 	}
 
+	public registerNewOauth2WalletAddress(address, chainId, oAuth2Provider, blockchain: SupportedBlockchainsParam, meta: object) {
+		this.connections[address] = {
+			address: address,
+			chainId: chainId,
+			providerType: 'oauth2', // TODO make this a type to ensure it's not typed incorrectly
+			provider: oAuth2Provider,
+			blockchain: blockchain,
+			meta,
+		}
+		this.saveConnections()
+		this.emitSavedConnection(address)
+	}
+
 	private async registerEvmProvider(provider: ethers.providers.Web3Provider, providerName: string) {
 		const accounts = await provider.listAccounts()
 		const chainId = (await provider.detectNetwork()).chainId
@@ -452,27 +496,35 @@ export class Web3WalletProvider {
 
 	async Socios(checkConnectionOnly: boolean) {
 		logger(2, 'connect Socios')
-		// if tn-oauth-wallet-connections: {} return connection
-		let serverEndPoint
-		let params = {}
+
+		let client_id
+		let redirect_uri
+		let partner_tag
 		for (const issuer of this.client.config.issuers) {
-			// @ts-ignore
-			if (issuer.endpoints.login.path) {
-				// @ts-ignore
-				serverEndPoint = issuer.endpoints.login.path
+			const oauthIssuer = issuer as Oauth2IssuerConfig
+			if (oauthIssuer.oAuth2options.consumerKey) {
+				client_id = oauthIssuer.oAuth2options.consumerKey
+				redirect_uri = oauthIssuer.oAuth2options.redirectURI
+				partner_tag = oauthIssuer.oAuth2options.partnerTag
 				break
 			}
 		}
-		try {
-			const query = `${serverEndPoint}?${new URLSearchParams(params)}`
-			const response = await fetch(query, { method: 'GET', redirect: 'follow' })
-			const ok = response.status >= 200 && response.status <= 299
-			if (!ok) {
-				// store a property e.g. tn-oauth-wallet-connections: {}
-				return
-			} else throw new Error(`HTTP error! status: ${response.status}`)
-		} catch (msg: any) {
-			throw new Error(`HTTP error.`)
+
+		// if there is an access token and TODO not expired.
+		if (sessionStorage.getItem('tn-socios')) {
+			this.registerNewOauth2WalletAddress(
+				'socios', // address
+				'socios', // chain id
+				'Socios', // provider
+				'chiliz', // blockchain
+				null,
+			)
+			return 'Socios'
+		} else {
+			// @ts-ignore
+			this.client.ui.showLoaderDelayed(['<h4>Connecting to Socios...</h4>'], 600, true)
+			window.location.href = `https://partner.socios.com/oauth2/authorize?response_type=code&client_id=${client_id}&redirect_uri=${redirect_uri}&partner_tag=${partner_tag}`
+			return new Promise((resolve) => setTimeout(resolve, 10000))
 		}
 	}
 
diff --git a/src/wallet/__test__/wallet.spec.ts b/src/wallet/__test__/wallet.spec.ts
index 72837e47..0f6af4be 100644
--- a/src/wallet/__test__/wallet.spec.ts
+++ b/src/wallet/__test__/wallet.spec.ts
@@ -7,33 +7,29 @@ import { Client } from '../../client/index'
 import { SafeConnectOptions, SafeConnectProvider } from '../SafeConnectProvider'
 import { Web3WalletProvider } from '../Web3WalletProvider'
 
-// TODO DEBUG:
-// '"0x88b48f654c30e99bc2e4a1559b4dcf1ad93fa656"' is not assignable to type '"eosio.nft.
-// When issuers are uncommented.
-
 let tokenNegotiatorClient = new Client({
 	type: 'active',
 	issuers: [
-		// {
-		// 	collectionID: 'punk',
-		// 	onChain: true,
-		// 	contract: '0x88b48f654c30e99bc2e4a1559b4dcf1ad93fa656',
-		// 	chain: 'mainnet',
-		// 	openSeaSlug: 'punk',
-		// },
-		// {
-		// 	collectionID: 'expansion-punk',
-		// 	onChain: true,
-		// 	contract: '0x0d0167a823c6619d430b1a96ad85b888bcf97c37',
-		// 	chain: 'eth',
-		// },
-		// {
-		// 	collectionID: 'women-tribe',
-		// 	onChain: true,
-		// 	contract: '0x88b48f654c30e99bc2e4a1559b4dcf1ad93fa656',
-		// 	chain: 'mainnet',
-		// 	openSeaSlug: 'stl-rnd-women-tribe-nfts',
-		// },
+		{
+			collectionID: 'rinkeby-punk',
+			onChain: true,
+			contract: '0x88b48f654c30e99bc2e4a1559b4dcf1ad93fa656',
+			chain: 'rinkeby',
+			openSeaSlug: 'rinkeby-punk',
+		},
+		{
+			collectionID: 'expansion-punk',
+			onChain: true,
+			contract: '0x0d0167a823c6619d430b1a96ad85b888bcf97c37',
+			chain: 'eth',
+		},
+		{
+			collectionID: 'women-tribe',
+			onChain: true,
+			contract: '0x88b48f654c30e99bc2e4a1559b4dcf1ad93fa656',
+			chain: 'rinkeby',
+			openSeaSlug: 'stl-rnd-women-tribe-nfts',
+		},
 	],
 })
 

From 6d0f746faaff3fa297ef4554dcc3318ab78d0606 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Aug 2023 03:23:40 +0000
Subject: [PATCH 06/46] Bump typescript from 4.9.4 to 5.2.2

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.9.4 to 5.2.2.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.9.4...v5.2.2)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 16 ++++++++--------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0e3ebdaf..a66e493f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -64,7 +64,7 @@
         "tn2_2": "npm:@tokenscript/token-negotiator@2.2.0",
         "ts-jest": "^28.0.2",
         "ts-loader": "^9.2.6",
-        "typescript": "^4.6.4",
+        "typescript": "^5.2.2",
         "url": "^0.11.0",
         "webpack": "^5.72.0",
         "webpack-cli": "^4.9.2"
@@ -18830,15 +18830,15 @@
       }
     },
     "node_modules/typescript": {
-      "version": "4.9.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
-      "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==",
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
+      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": ">=4.2.0"
+        "node": ">=14.17"
       }
     },
     "node_modules/typical": {
@@ -34438,9 +34438,9 @@
       }
     },
     "typescript": {
-      "version": "4.9.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
-      "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg=="
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
+      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w=="
     },
     "typical": {
       "version": "4.0.0",
diff --git a/package.json b/package.json
index 772b74c5..b6bb9cdd 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "tn2_2": "npm:@tokenscript/token-negotiator@2.2.0",
     "ts-jest": "^28.0.2",
     "ts-loader": "^9.2.6",
-    "typescript": "^4.6.4",
+    "typescript": "^5.2.2",
     "url": "^0.11.0",
     "webpack": "^5.72.0",
     "webpack-cli": "^4.9.2"

From ab89fb239b5feb070371b2fffcbc1cebe1bc96b5 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Tue, 29 Aug 2023 12:49:01 +1000
Subject: [PATCH 07/46] wip socios

---
 index.html                               | 20 ++++----
 src/client/index.ts                      | 62 +++++-------------------
 src/client/interface.ts                  |  8 +--
 src/client/views/select-issuers.ts       |  1 +
 src/utils/index.ts                       |  6 +++
 src/utils/token/fungibleTokenProvider.ts |  6 +++
 src/utils/token/nftProvider.ts           | 28 +++++++++++
 src/wallet/Web3WalletProvider.ts         | 11 +++--
 8 files changed, 70 insertions(+), 72 deletions(-)

diff --git a/index.html b/index.html
index 03728eee..8f229032 100644
--- a/index.html
+++ b/index.html
@@ -27,26 +27,26 @@
               chain: "socios",
               blockchain: "chiliz",
               collectionID: "socios",
+              smartContract: "0x3506424f91fd33084466f402d5d97f05f8e3b4af",
+              symbol: "CHZ",
               oAuth2options: {
                 consumerKey: "PBK9Mx_ffFRUPHW9BLTxnGHRdywa",
-                redirectURI: "http://localhost:5000/user-login-callback",
                 partnerTag: "smarttokenlabs",
-                returnToApplicationURL: "/",
                 endpoints: {
-                  userAccessToken: {
-                    path: '/user-access-token',
+                  redirectURI: {
+                    path: "http://localhost:5000/user-login-callback",
                     params: {}
                   },
-                  userBalance: {
-                    path: "/user-balance",
+                  userLogout: {
+                    path: "http://localhost:5000/user-logout",
                     params: {}
                   },
-                  userNfts: {
-                    path: "/user-nfts",
+                  userSignature: {
+                    path: 'http://localhost:5000/user-signature',
                     params: {}
                   },
-                  userLogout: {
-                    path: "/user-logout",
+                  userBalance: {
+                    path: 'http://localhost:5000/user-balance',
                     params: {}
                   },
                 },
diff --git a/src/client/index.ts b/src/client/index.ts
index f8016a13..5de8759e 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -20,7 +20,6 @@ import {
 	OutletTokenResult,
 	MultiTokenInterface,
 	TokenNegotiatorEventsArgs,
-	Oauth2IssuerConfig,
 } from './interface'
 import { SignedUNChallenge } from './auth/signedUNChallenge'
 import { TicketZKProof } from './auth/ticketZKProof'
@@ -31,7 +30,7 @@ import Web3WalletProvider from '../wallet/Web3WalletProvider'
 import { LocalOutlet } from '../outlet/localOutlet'
 import { shouldUseRedirectMode } from '../utils/support/getBrowserData'
 import { VERSION } from '../version'
-import { getFungibleTokenBalances, getFungibleTokensMeta } from '../utils/token/fungibleTokenProvider'
+import { getFungibleTokenBalances, getFungibleTokensMeta, getFungibleTokenBalancesViaOauth } from '../utils/token/fungibleTokenProvider'
 import { URLNS } from '../core/messaging'
 import { DecodedToken, TokenType } from '../outlet/ticketStorage'
 import { MultiTokenAuthRequest, MultiTokenAuthResult, OutletIssuerInterface, ProofResult } from '../outlet/interfaces'
@@ -164,46 +163,6 @@ export class Client {
 		return null
 	}
 
-	// TODO see if we can reduce the need of this function.
-	// Where in the callback.html the AccessToken is derived and sent to this view.
-	// DISNEY MODE - where the token + wallet storage is automatically managed by TKN.
-	public async getAccessToken(collectionID: string, protocol = 'oauth2') {
-		const issuerConfig = this.tokenStore.getIssuerConfig(collectionID) as OnChainTokenConfig | Oauth2IssuerConfig
-		if (protocol.toLocaleLowerCase() === 'oauth2') {
-			if (issuerConfig.blockchain.toLocaleLowerCase() === 'chiliz') {
-				const oAuthConfig = issuerConfig as Oauth2IssuerConfig
-				const params = new URLSearchParams(location.search)
-				const code = params.get('code')
-				if (code !== null) {
-					fetch(`${oAuthConfig.oAuth2options.endpoints.userAccessToken.path}?code=${code}`)
-						.then((response) => response.json())
-						.then(async (data) => {
-							if (data.error) {
-								errorHandler(data.error, 'error', null, null, true, true)
-							} else {
-								await this.getWalletProvider()
-								// TODO use types to ensure it's not typed incorrectly
-								this.web3WalletProvider.registerNewOauth2WalletAddress(
-									'socios', // address
-									'socios', // chain id
-									'Socios', // provider
-									'chiliz', // blockchain
-									null,
-								)
-								sessionStorage.setItem('tn-socios', JSON.stringify(data))
-								if (oAuthConfig.oAuth2options.returnToApplicationURL) {
-									window.location.href = oAuthConfig.oAuth2options.returnToApplicationURL
-								}
-							}
-						})
-						.catch((error) => {
-							console.error('Error:', error)
-						})
-				}
-			}
-		}
-	}
-
 	public async readProofCallback() {
 		if (!this.getDataFromQuery) return false
 		let action = this.getDataFromQuery('action')
@@ -731,18 +690,19 @@ export class Client {
 		return tokens
 	}
 
-	private async loadOnChainTokensViaOauth2(issuer: OnChainIssuer): Promise<any[]> {
-		// tn-socios
-
-		let tokens
-
-		if (issuer.fungible) {
-			// tokens = await getFungibleTokenBalances(issuer, accessToken)
+	private async loadOnChainTokensViaOauth2(issuerConfig: OnChainIssuer): Promise<any[]> {
+		let tokens = []
+		if (issuerConfig.fungible === true) {
+			tokens = (await getFungibleTokenBalancesViaOauth(issuerConfig)) as any
 		} else {
+			// add more logic to identify which collection they seek.
 			// tokens = await getNftTokens(issuer, accessToken)
 		}
-
-		return []
+		tokens.forEach((token) => {
+			token.walletAddress = issuerConfig.collectionID
+		})
+		this.tokenStore.setTokens(issuerConfig.collectionID, tokens)
+		return tokens
 	}
 
 	private async loadOnChainTokens(issuer: OnChainIssuer): Promise<any[]> {
diff --git a/src/client/interface.ts b/src/client/interface.ts
index b5a19c72..ca4303a3 100644
--- a/src/client/interface.ts
+++ b/src/client/interface.ts
@@ -62,15 +62,11 @@ export interface Oauth2IssuerConfig {
 		partnerTag: string
 		returnToApplicationURL?: string
 		endpoints: {
-			userAccessToken: {
+			redirectURI: {
 				path: string
 				params?: object
 			}
-			userBalance: {
-				path: string
-				params?: object
-			}
-			userNfts: {
+			userAccessToken: {
 				path: string
 				params?: object
 			}
diff --git a/src/client/views/select-issuers.ts b/src/client/views/select-issuers.ts
index d5e5f526..26275645 100644
--- a/src/client/views/select-issuers.ts
+++ b/src/client/views/select-issuers.ts
@@ -286,6 +286,7 @@ export class SelectIssuers extends AbstractView {
 		tokenBtn.style.display = 'block'
 		let issuers = this.client.getTokenStore().getCurrentIssuers()
 
+		// TODO check if this should say 'Balance not found'.
 		tokenBtn.innerHTML =
 			tokens.length && issuers[issuer].fungible ? 'Balance found' : `${tokens.length} token${tokens.length > 1 ? 's' : ''} available`
 		tokenBtn.setAttribute('aria-label', `Navigate to select from ${tokens.length} of your ${issuer} tokens`)
diff --git a/src/utils/index.ts b/src/utils/index.ts
index d9e12a10..a0e018a4 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -278,3 +278,9 @@ export const isCookieExpired = (cookieName: string) => {
 	}
 	return true // Cookie is not found, considered expired
 }
+
+export const getCookieByName = (cookieName: string) => {
+	const value = `; ${document.cookie}`
+	const parts = value.split(`; ${cookieName}=`)
+	if (parts.length === 2) return parts.pop().split(';').shift()
+}
diff --git a/src/utils/token/fungibleTokenProvider.ts b/src/utils/token/fungibleTokenProvider.ts
index c5f2c556..e2366a52 100644
--- a/src/utils/token/fungibleTokenProvider.ts
+++ b/src/utils/token/fungibleTokenProvider.ts
@@ -12,9 +12,15 @@ export const getFungibleTokenBalances = async (issuer: OnChainIssuer, owner: str
 	if (ipfsBaseUrl) query += `&ipfsBaseUrl=${ipfsBaseUrl}`
 
 	return tokenRequest(query, true)
+	
+}
+
+export const getFungibleTokenBalancesViaOauth = (issuer: any) => {
+	// TOKEN DISCOVERY API REQUEST HERE.
 }
 
 export const getFungibleTokensMeta = async (issuer: OnChainIssuer, ipfsBaseUrl?: string) => {
+	
 	const { contract, chain } = issuer
 
 	let query = `${BASE_TOKEN_DISCOVERY_URL}/get-fungible-token?collectionAddress=${contract}&chain=${chain}&blockchain=${
diff --git a/src/utils/token/nftProvider.ts b/src/utils/token/nftProvider.ts
index 0e088f67..d23b53bc 100644
--- a/src/utils/token/nftProvider.ts
+++ b/src/utils/token/nftProvider.ts
@@ -7,6 +7,23 @@ import { JsonRpc } from 'eosjs'
 
 export const BASE_TOKEN_DISCOVERY_URL = 'https://api.token-discovery.tokenscript.org'
 
+// blockchain
+// "chiliz"
+// chain
+// "socios"
+// collectionID
+// "socios"
+// fungile
+// true
+// oAuth2options
+// {consumerKey: 'PBK9Mx_ffFRUPHW9BLTxnGHRdywa', partnerTag: 'smarttokenlabs', endpoints: {…}}
+// onChain
+// true
+// symbol
+// "CHZ"
+// timestamp
+// 1693270793004
+
 export const getNftCollection = async (issuer: OnChainIssuer, ipfsBaseUrl?: string) => {
 	let query: string
 
@@ -15,6 +32,8 @@ export const getNftCollection = async (issuer: OnChainIssuer, ipfsBaseUrl?: stri
 		return { title: `Ultra NFT factory "${issuer['factoryId']}"` }
 	} else if ('blockchain' in issuer && issuer.blockchain === 'solana') {
 		query = getSolanaNftCollectionUrl(issuer as SolanaIssuerConfig, ipfsBaseUrl)
+	} else if ('blockchain' in issuer && issuer.blockchain === 'chiliz') {
+		query = getChilizNftCollectionUrl(issuer)
 	} else if ('blockchain' in issuer && issuer.blockchain === 'flow') {
 		query = getFlowNftCollectionUrl(issuer)
 	} else {
@@ -24,6 +43,9 @@ export const getNftCollection = async (issuer: OnChainIssuer, ipfsBaseUrl?: stri
 	return tokenRequest(query, true)
 }
 
+// TODO - update function names to TokenCollection e.g. getEvmTokenCollectionURL
+// Where they can be NFT of FT's.
+
 export const getEvmNftCollectionUrl = (issuer: OnChainTokenConfig, ipfsBaseUrl: string) => {
 	const { contract, chain, openSeaSlug } = issuer
 	let query = `${BASE_TOKEN_DISCOVERY_URL}/get-token-collection?smartContract=${contract}&chain=${chain}&blockchain=evm`
@@ -32,6 +54,12 @@ export const getEvmNftCollectionUrl = (issuer: OnChainTokenConfig, ipfsBaseUrl:
 	return query
 }
 
+export const getChilizNftCollectionUrl = (issuer: OnChainTokenConfig) => {
+	const { contract, chain } = issuer
+	let query = `${BASE_TOKEN_DISCOVERY_URL}/get-token-collection?smartContract=${contract}&chain=${chain}&blockchain=chiliz`
+	return query
+}
+
 // TODO add ultra TOKEN_DISCOVERY service
 
 export const getSolanaNftCollectionUrl = (issuer: SolanaIssuerConfig, ipfsBaseUrl: string) => {
diff --git a/src/wallet/Web3WalletProvider.ts b/src/wallet/Web3WalletProvider.ts
index d942ba87..6728e39a 100644
--- a/src/wallet/Web3WalletProvider.ts
+++ b/src/wallet/Web3WalletProvider.ts
@@ -1,5 +1,5 @@
 import { ethers } from 'ethers'
-import { logger, strToHexStr, strToUtfBytes } from '../utils'
+import { logger, strToHexStr, strToUtfBytes, getCookieByName } from '../utils'
 import { SafeConnectOptions } from './SafeConnectProvider'
 import { Client } from '../client'
 import {
@@ -500,20 +500,21 @@ export class Web3WalletProvider {
 		let client_id
 		let redirect_uri
 		let partner_tag
+		let collectionID
 		for (const issuer of this.client.config.issuers) {
 			const oauthIssuer = issuer as Oauth2IssuerConfig
 			if (oauthIssuer.oAuth2options.consumerKey) {
 				client_id = oauthIssuer.oAuth2options.consumerKey
-				redirect_uri = oauthIssuer.oAuth2options.redirectURI
+				redirect_uri = oauthIssuer.oAuth2options.endpoints.redirectURI.path
 				partner_tag = oauthIssuer.oAuth2options.partnerTag
+				collectionID = oauthIssuer.collectionID
 				break
 			}
 		}
 
-		// if there is an access token and TODO not expired.
-		if (sessionStorage.getItem('tn-socios')) {
+		if (getCookieByName(`tn-oauth2-ref-${collectionID}`)) {
 			this.registerNewOauth2WalletAddress(
-				'socios', // address
+				'socios', // address id
 				'socios', // chain id
 				'Socios', // provider
 				'chiliz', // blockchain

From 3e39bcd1787859e6df1141efee2e7de69dbfeb62 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Tue, 5 Sep 2023 11:17:43 +1000
Subject: [PATCH 08/46] working progress to fully integrate socios oauth2
 provider flow

---
 index.html                               | 13 +++--
 src/client/index.ts                      | 57 +++++++++-----------
 src/client/interface.ts                  |  6 +--
 src/client/views/select-issuers.ts       |  4 +-
 src/client/views/select-wallet.ts        |  2 +-
 src/client/views/token-list.ts           |  4 +-
 src/utils/index.ts                       | 43 +++++++++++----
 src/utils/token/fungibleTokenProvider.ts | 22 ++++----
 src/utils/token/nftProvider.ts           | 37 ++++---------
 src/wallet/Web3WalletProvider.ts         | 67 +++++++++++-------------
 10 files changed, 124 insertions(+), 131 deletions(-)

diff --git a/index.html b/index.html
index 8f229032..dc5fc0e1 100644
--- a/index.html
+++ b/index.html
@@ -23,12 +23,11 @@
           issuers: [
             {
               onChain: true,
-              fungile: true,
-              chain: "socios",
-              blockchain: "chiliz",
+              fungible: true,
+              chain: "eth",
+              blockchain: "evm",
               collectionID: "socios",
-              smartContract: "0x3506424f91fd33084466f402d5d97f05f8e3b4af",
-              symbol: "CHZ",
+              contract: "0x3506424F91fD33084466F402d5D97f05F8e3b4AF",
               oAuth2options: {
                 consumerKey: "PBK9Mx_ffFRUPHW9BLTxnGHRdywa",
                 partnerTag: "smarttokenlabs",
@@ -49,6 +48,10 @@
                     path: 'http://localhost:5000/user-balance',
                     params: {}
                   },
+                  userNfts: {
+                    path: 'http://localhost:5000/user-nfts',
+                    params: {}
+                  },
                 },
               }, 
             },
diff --git a/src/client/index.ts b/src/client/index.ts
index 5de8759e..f44f4b76 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -11,6 +11,7 @@ import {
 } from '../utils'
 import { getNftCollection, getNftTokens } from '../utils/token/nftProvider'
 import { TokenStore } from './tokenStore'
+import { isCookieExpired } from './../utils'
 import {
 	OffChainTokenConfig,
 	OnChainTokenConfig,
@@ -30,7 +31,7 @@ import Web3WalletProvider from '../wallet/Web3WalletProvider'
 import { LocalOutlet } from '../outlet/localOutlet'
 import { shouldUseRedirectMode } from '../utils/support/getBrowserData'
 import { VERSION } from '../version'
-import { getFungibleTokenBalances, getFungibleTokensMeta, getFungibleTokenBalancesViaOauth } from '../utils/token/fungibleTokenProvider'
+import { getFungibleTokenBalances, getFungibleTokensMeta } from '../utils/token/fungibleTokenProvider'
 import { URLNS } from '../core/messaging'
 import { DecodedToken, TokenType } from '../outlet/ticketStorage'
 import { MultiTokenAuthRequest, MultiTokenAuthResult, OutletIssuerInterface, ProofResult } from '../outlet/interfaces'
@@ -136,6 +137,11 @@ export class Client {
 		// this.registerOutletProofEventListener()
 	}
 
+	async testSig() {
+		let res = await fetch('http://localhost:5000/user-signature?message=hola', {})
+		console.log(res)
+	}
+
 	handleRecievedRedirectMessages() {
 		const issuer = this.getDataFromQuery('issuer')
 		const error = this.getDataFromQuery('error')
@@ -288,20 +294,21 @@ export class Client {
 	}
 
 	// TODO: Move to token store OR select-wallet view - this method is very similar to getCurrentBlockchains()
-	public hasIssuerForBlockchain(blockchain: 'evm' | 'solana' | 'flow' | 'ultra' | 'chiliz') {
+	public hasIssuerForBlockchain(blockchain: 'evm' | 'solana' | 'flow' | 'ultra', useOauth = false) {
 		return (
 			this.config.issuers.filter((issuer: OnChainTokenConfig) => {
-				if (blockchain === 'evm' && !issuer.onChain) return true
-				if (blockchain === 'chiliz' && !issuer.oAuth2options) return false
+				if (blockchain === 'evm' && !issuer.onChain && !useOauth) return true
+				if (issuer.oAuth2options && useOauth) return true
 				if (blockchain === 'solana' && typeof window.solana === 'undefined') return false
 				if (blockchain === 'ultra' && typeof window.ultra === 'undefined') return false
-				return (issuer.blockchain ? issuer.blockchain.toLowerCase() : 'evm') === blockchain
+				return !issuer.oAuth2options && (issuer.blockchain ? issuer.blockchain.toLowerCase() : 'evm') === blockchain
 			}).length > 0
 		)
 	}
 
 	public async getWalletProvider() {
 		if (!this.web3WalletProvider) {
+			// TODO - this is already installed in the file header.
 			const { Web3WalletProvider } = await import('./../wallet/Web3WalletProvider')
 			this.web3WalletProvider = new Web3WalletProvider(this, this.config.walletOptions, this.config.safeConnectOptions)
 		}
@@ -619,11 +626,7 @@ export class Client {
 
 			try {
 				let tokens
-				if (issuers[issuerKey].oAuth2options) {
-					tokens = await this.loadOnChainTokensViaOauth2(issuer)
-				} else {
-					tokens = await this.loadOnChainTokens(issuer)
-				}
+				tokens = await this.loadOnChainTokens(issuer)
 				this.tokenStore.setTokens(issuerKey, tokens)
 			} catch (err) {
 				logger(2, err)
@@ -668,12 +671,8 @@ export class Client {
 	async connectTokenIssuer(issuer: string): Promise<unknown[] | void> {
 		const config = this.tokenStore.getCurrentIssuers()[issuer]
 		if (!config) errorHandler('Undefined token issuer', 'error', null, null, true, true)
-
 		let tokens
-
-		if (config.oAuth2options && config.onChain === true) {
-			tokens = await this.loadOnChainTokensViaOauth2(config)
-		} else if (!config.oAuth2options && config.onChain === true) {
+		if (config.onChain === true) {
 			tokens = await this.loadOnChainTokens(config)
 		} else {
 			// TODO //
@@ -690,36 +689,21 @@ export class Client {
 		return tokens
 	}
 
-	private async loadOnChainTokensViaOauth2(issuerConfig: OnChainIssuer): Promise<any[]> {
-		let tokens = []
-		if (issuerConfig.fungible === true) {
-			tokens = (await getFungibleTokenBalancesViaOauth(issuerConfig)) as any
-		} else {
-			// add more logic to identify which collection they seek.
-			// tokens = await getNftTokens(issuer, accessToken)
-		}
-		tokens.forEach((token) => {
-			token.walletAddress = issuerConfig.collectionID
-		})
-		this.tokenStore.setTokens(issuerConfig.collectionID, tokens)
-		return tokens
-	}
-
 	private async loadOnChainTokens(issuer: OnChainIssuer): Promise<any[]> {
 		let walletProvider = await this.getWalletProvider()
 
 		// TODO: Collect tokens from all addresses for this blockchain
 		const walletAddress = walletProvider.getConnectedWalletAddresses(issuer.blockchain)?.[0]
 
-		requiredParams(walletAddress, 'wallet address is missing.')
+		if (!issuer.oAuth2options) requiredParams(walletAddress, 'wallet address is missing.')
 
 		// TODO: Allow API to return tokens for multiple addresses
 		let tokens
 
 		if (issuer.fungible) {
-			tokens = await getFungibleTokenBalances(issuer, walletAddress)
+			tokens = await getFungibleTokenBalances(issuer, walletAddress, null, this.ui)
 		} else {
-			tokens = await getNftTokens(issuer, walletAddress)
+			tokens = await getNftTokens(issuer, walletAddress, null, this.ui)
 		}
 
 		tokens.map((token) => {
@@ -914,6 +898,13 @@ export class Client {
 		else return this.authenticateToken(authRequest as AuthenticateInterface)
 	}
 
+	// TEST method to debug issue with Socios signature API.
+	// TODO Integrate this into authentication flow.
+	async testSociosSignatureAPI(message: string) {
+		const response = await fetch(`http://localhost:5000/user-signature?message=${message}`)
+		return response
+	}
+
 	async authenticateToken(authRequest: AuthenticateInterface) {
 		await this.checkUserAgentSupport('authentication')
 
diff --git a/src/client/interface.ts b/src/client/interface.ts
index ca4303a3..eb0e18c8 100644
--- a/src/client/interface.ts
+++ b/src/client/interface.ts
@@ -9,13 +9,12 @@ import { EasSchemaConfig } from '../outlet/interfaces'
 export enum SupportedBlockchainsEnum {
 	EVM = 'evm',
 	SOLANA = 'solana',
-	CHILIZ = 'chiliz',
 	FLOW = 'flow',
 	ULTRA = 'ultra',
 }
 
-export type SupportedBlockchainsParam = 'evm' | 'flow' | 'solana' | 'ultra' | 'chiliz'
-export const SignatureSupportedBlockchainsParamList = ['evm', 'flow', 'solana', 'ultra', 'chiliz']
+export type SupportedBlockchainsParam = 'evm' | 'flow' | 'solana' | 'ultra'
+export const SignatureSupportedBlockchainsParamList = ['evm', 'flow', 'solana', 'ultra']
 
 export interface OffChainTokenConfig extends IssuerConfigInterface {
 	onChain: false
@@ -85,6 +84,7 @@ export interface IssuerConfigInterface {
 	image?: string
 	symbol?: string
 	decimals?: number
+	shortCode?: string
 	noTokenMsg?: string
 	hideToggle?: boolean
 	fungible?: boolean
diff --git a/src/client/views/select-issuers.ts b/src/client/views/select-issuers.ts
index 26275645..af22177c 100644
--- a/src/client/views/select-issuers.ts
+++ b/src/client/views/select-issuers.ts
@@ -347,8 +347,8 @@ export class SelectIssuers extends AbstractView {
 					title: t.title,
 					image: t.image ?? config.image,
 					fungible: config.fungible,
-					decimals: config.decimals,
-					symbol: config.symbol,
+					decimals: t.decimals ?? config.decimals,
+					symbol: t.symbol ?? config.symbol,
 					balance: t.balance,
 					toggleState: isSelected,
 					hideToggle: config?.hideToggle,
diff --git a/src/client/views/select-wallet.ts b/src/client/views/select-wallet.ts
index 9db21fa3..0e6179f0 100644
--- a/src/client/views/select-wallet.ts
+++ b/src/client/views/select-wallet.ts
@@ -42,7 +42,7 @@ export class SelectWallet extends AbstractView {
 			}
 		}
 
-		if (this.client.hasIssuerForBlockchain(SupportedBlockchainsEnum.CHILIZ)) {
+		if (this.client.hasIssuerForBlockchain(SupportedBlockchainsEnum.EVM, true)) {
 			const socios = getWalletInfo(SupportedWalletProviders.Socios)
 			walletButtons += this.getWalletButtonHtml(socios)
 		}
diff --git a/src/client/views/token-list.ts b/src/client/views/token-list.ts
index 356bd9de..d0920093 100644
--- a/src/client/views/token-list.ts
+++ b/src/client/views/token-list.ts
@@ -146,8 +146,8 @@ export class TokenList extends AbstractView {
 				? '#' + (index.length > 15 ? index.substring(0, 5) + '...' + index.substring(index.length - 5, index.length) : index)
 				: ''
 		} else {
-			const balanceTxt = ethers.utils.formatUnits(balance, decimals)
-
+			const balanceTxt = ethers.utils.parseUnits(balance, decimals).toString()
+			// const balanceTxt = ethers.utils.formatUnits(balanceParsed, decimals)
 			detail = balanceTxt + ' ' + symbol
 			abrieviated = (balanceTxt.length > 15 ? balanceTxt.substring(0, 12) + '... ' : balanceTxt) + ' ' + symbol
 		}
diff --git a/src/utils/index.ts b/src/utils/index.ts
index a0e018a4..bbb9def7 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -263,20 +263,39 @@ export const createCookie = (name: string, value: any, seconds: number) => {
 	document.cookie = name + '=' + value + expires + '; path=/'
 }
 
-export const isCookieExpired = (cookieName: string) => {
-	let cookies = document.cookie.split('; ')
-	for (let i = 0; i < cookies.length; i++) {
-		let cookie = cookies[i].split('=')
-		if (cookie[0] === cookieName) {
-			let expiration = cookie[1]
-			if (expiration === 'true') {
-				return false // Cookie is not expired
+export const isCookieMaxAgeExpired = (cookieName) => {
+	const cookies = document.cookie.split(';')
+	for (const cookie of cookies) {
+		const [name, value] = cookie.trim().split('=')
+		if (name === cookieName) {
+			// This cookie exists, check if it has expired
+			const cookieData = decodeURIComponent(value)
+			const expirationDate = new Date(cookieData)
+			if (expirationDate > new Date()) {
+				// The cookie is still valid
+				return false
 			} else {
-				return true // Cookie is expired
+				// The cookie has expired, you can optionally remove it
+				// document.cookie = `${cookieName}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;`;
+				return true
 			}
 		}
 	}
-	return true // Cookie is not found, considered expired
+	// The cookie with the given name was not found
+	return true
+}
+
+export const isCookieExpired = (cookieName: string) => {
+	const cookies = document.cookie.split(';')
+	for (const cookie of cookies) {
+		const [name, value] = cookie.trim().split('=')
+		if (name === cookieName) {
+			const expirationDate = new Date(value)
+			const currentDate = new Date()
+			return currentDate > expirationDate
+		}
+	}
+	return true // Cookie not found, assume expired.
 }
 
 export const getCookieByName = (cookieName: string) => {
@@ -284,3 +303,7 @@ export const getCookieByName = (cookieName: string) => {
 	const parts = value.split(`; ${cookieName}=`)
 	if (parts.length === 2) return parts.pop().split(';').shift()
 }
+
+export const deleteCookieByName = (cookieName) => {
+	document.cookie = `${cookieName}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;`
+}
diff --git a/src/utils/token/fungibleTokenProvider.ts b/src/utils/token/fungibleTokenProvider.ts
index e2366a52..ab83a0c0 100644
--- a/src/utils/token/fungibleTokenProvider.ts
+++ b/src/utils/token/fungibleTokenProvider.ts
@@ -1,22 +1,21 @@
 import { tokenRequest } from './../index'
 import { OnChainIssuer } from '../../client/interface'
 import { BASE_TOKEN_DISCOVERY_URL } from './nftProvider'
+import { isCookieExpired } from './../../utils/index'
 
-export const getFungibleTokenBalances = async (issuer: OnChainIssuer, owner: string, ipfsBaseUrl?: string) => {
+export const getFungibleTokenBalances = async (issuer: OnChainIssuer, owner: string, ipfsBaseUrl?: string, ui?: any) => {
 	const { contract, chain } = issuer
-
-	let query = `${BASE_TOKEN_DISCOVERY_URL}/get-owner-fungible-tokens?collectionAddress=${contract}&owner=${owner}&chain=${chain}&blockchain=${
-		issuer.blockchain ?? 'evm'
-	}`
+	let query = `${BASE_TOKEN_DISCOVERY_URL}/get-owner-fungible-tokens?collectionAddress=${contract}&owner=${owner}&chain=${chain}&blockchain=${issuer.blockchain ?? 'evm&'}`
 	if (issuer.symbol) query += `&symbol=${issuer.symbol}`
 	if (ipfsBaseUrl) query += `&ipfsBaseUrl=${ipfsBaseUrl}`
-
+	if (issuer.oAuth2options) {
+		query = issuer.oAuth2options.endpoints.userBalance.path;
+		// TODO when a user clicks load
+		// if(isCookieExpired(`tn-oauth2-expiry-${issuer.collectionID}`)) {
+		// 	ui.updateUI('wallet', { viewName: 'wallet' }, { viewTransition: 'slide-in-left' })
+		// }
+	}
 	return tokenRequest(query, true)
-	
-}
-
-export const getFungibleTokenBalancesViaOauth = (issuer: any) => {
-	// TOKEN DISCOVERY API REQUEST HERE.
 }
 
 export const getFungibleTokensMeta = async (issuer: OnChainIssuer, ipfsBaseUrl?: string) => {
@@ -28,6 +27,5 @@ export const getFungibleTokensMeta = async (issuer: OnChainIssuer, ipfsBaseUrl?:
 	}`
 	if (issuer.symbol) query += `&symbol=${issuer.symbol}`
 	if (ipfsBaseUrl) query += `&ipfsBaseUrl=${ipfsBaseUrl}`
-
 	return tokenRequest(query, true)
 }
diff --git a/src/utils/token/nftProvider.ts b/src/utils/token/nftProvider.ts
index d23b53bc..84db5b71 100644
--- a/src/utils/token/nftProvider.ts
+++ b/src/utils/token/nftProvider.ts
@@ -5,26 +5,11 @@ import { validateBlockchain } from '../support/isSupported'
 
 import { JsonRpc } from 'eosjs'
 
+// export const BASE_TOKEN_DISCOVERY_URL = 'http://localhost:3000'
 export const BASE_TOKEN_DISCOVERY_URL = 'https://api.token-discovery.tokenscript.org'
+import { isCookieExpired } from './../../utils/index'
 
-// blockchain
-// "chiliz"
-// chain
-// "socios"
-// collectionID
-// "socios"
-// fungile
-// true
-// oAuth2options
-// {consumerKey: 'PBK9Mx_ffFRUPHW9BLTxnGHRdywa', partnerTag: 'smarttokenlabs', endpoints: {…}}
-// onChain
-// true
-// symbol
-// "CHZ"
-// timestamp
-// 1693270793004
-
-export const getNftCollection = async (issuer: OnChainIssuer, ipfsBaseUrl?: string) => {
+export const getNftCollection = async (issuer: OnChainIssuer, ipfsBaseUrl?: string, ui?: any) => {
 	let query: string
 
 	if ('blockchain' in issuer && issuer.blockchain === 'ultra') {
@@ -32,10 +17,14 @@ export const getNftCollection = async (issuer: OnChainIssuer, ipfsBaseUrl?: stri
 		return { title: `Ultra NFT factory "${issuer['factoryId']}"` }
 	} else if ('blockchain' in issuer && issuer.blockchain === 'solana') {
 		query = getSolanaNftCollectionUrl(issuer as SolanaIssuerConfig, ipfsBaseUrl)
-	} else if ('blockchain' in issuer && issuer.blockchain === 'chiliz') {
-		query = getChilizNftCollectionUrl(issuer)
 	} else if ('blockchain' in issuer && issuer.blockchain === 'flow') {
 		query = getFlowNftCollectionUrl(issuer)
+	} else if (issuer.oAuth2options) {
+		query = issuer.oAuth2options.endpoints.userNfts.path;
+		// TODO instead do this when the user clicks on load!!!
+		// if(isCookieExpired(`tn-oauth2-expiry-${issuer.collectionID}`)) {
+		// 	ui.updateUI('wallet', { viewName: 'wallet' }, { viewTransition: 'slide-in-left' })
+		// }
 	} else {
 		query = getEvmNftCollectionUrl(issuer, ipfsBaseUrl)
 	}
@@ -54,12 +43,6 @@ export const getEvmNftCollectionUrl = (issuer: OnChainTokenConfig, ipfsBaseUrl:
 	return query
 }
 
-export const getChilizNftCollectionUrl = (issuer: OnChainTokenConfig) => {
-	const { contract, chain } = issuer
-	let query = `${BASE_TOKEN_DISCOVERY_URL}/get-token-collection?smartContract=${contract}&chain=${chain}&blockchain=chiliz`
-	return query
-}
-
 // TODO add ultra TOKEN_DISCOVERY service
 
 export const getSolanaNftCollectionUrl = (issuer: SolanaIssuerConfig, ipfsBaseUrl: string) => {
@@ -75,7 +58,7 @@ export const getFlowNftCollectionUrl = (issuer: OnChainTokenConfig) => {
 	return query
 }
 
-export const getNftTokens = async (issuer: OnChainIssuer, owner: string, ipfsBaseUrl?: string) => {
+export const getNftTokens = async (issuer: OnChainIssuer, owner: string, ipfsBaseUrl?: string, ui?: any) => {
 	let query: string
 	if ('blockchain' in issuer && issuer.blockchain === 'ultra') {
 		// TODO add to the Discovery Service
diff --git a/src/wallet/Web3WalletProvider.ts b/src/wallet/Web3WalletProvider.ts
index 6728e39a..6c78a461 100644
--- a/src/wallet/Web3WalletProvider.ts
+++ b/src/wallet/Web3WalletProvider.ts
@@ -1,5 +1,5 @@
 import { ethers } from 'ethers'
-import { logger, strToHexStr, strToUtfBytes, getCookieByName } from '../utils'
+import { logger, strToHexStr, strToUtfBytes, getCookieByName, deleteCookieByName, isCookieMaxAgeExpired } from '../utils'
 import { SafeConnectOptions } from './SafeConnectProvider'
 import { Client } from '../client'
 import {
@@ -28,6 +28,7 @@ export interface WalletConnection {
 	provider?: ethers.providers.Web3Provider | any // solana(phantom) have different interface
 	ethers?: any
 	meta?: WalletMeta
+	expiryCookieName?: string
 }
 
 export interface WalletConnectionOauth2 {
@@ -37,6 +38,7 @@ export interface WalletConnectionOauth2 {
 	provider: string
 	providerType: string
 	meta?: any
+	expiryCookieName?: string
 }
 
 export enum SupportedWalletProviders {
@@ -68,27 +70,13 @@ export class Web3WalletProvider {
 
 		for (let address in this.connections) {
 			let con = this.connections[address.toLowerCase()]
-
-			const oAuth2 = con as WalletConnectionOauth2
-
-			if (oAuth2?.providerType === 'oauth2') {
-				savedConnections[address] = {
-					address: oAuth2.address,
-					chainId: oAuth2.chainId,
-					blockchain: oAuth2.blockchain,
-					providerType: oAuth2.providerType,
-					provider: oAuth2.provider,
-				}
-			} else {
-				savedConnections[address] = {
-					address: con.address,
-					chainId: con.chainId,
-					providerType: con.providerType,
-					blockchain: con.blockchain,
-				}
+			savedConnections[address] = {
+				address: con.address,
+				chainId: con.chainId,
+				providerType: con.providerType,
+				blockchain: con.blockchain,
 			}
 		}
-
 		localStorage.setItem(Web3WalletProvider.LOCAL_STORAGE_KEY, JSON.stringify(savedConnections))
 	}
 
@@ -136,8 +124,10 @@ export class Web3WalletProvider {
 								}
 							}
 							break
-
-						default:
+						case 'socios':
+							console.log('remove socios wallet from local storage')
+							// deleteCookieByName(provider.expiryCookieName);
+							break
 					}
 				}
 			}
@@ -158,9 +148,7 @@ export class Web3WalletProvider {
 
 		for (let address in state) {
 			let connection = state[address]
-
 			try {
-				// TODO on Monday add support for oAuth flows
 				await this.connectWith(connection.providerType, true)
 			} catch (e) {
 				delete state[address]
@@ -228,6 +216,15 @@ export class Web3WalletProvider {
 		return connection.provider
 	}
 
+	// getOauthWalletProvider(provider: string) {
+	// 	let data = localStorage.getItem(Web3WalletProvider.LOCAL_STORAGE_KEY)
+	// 	if (data) {
+	// 		let state = JSON.parse(data)
+	// 		return state[provider]
+	// 	}
+	// 	return false;
+	// }
+
 	hasAnyConnection(blockchain: SupportedBlockchainsParam[]) {
 		for (const i in this.connections) {
 			if (blockchain.includes(this.connections[i].blockchain)) {
@@ -290,14 +287,13 @@ export class Web3WalletProvider {
 		}
 	}
 
-	public registerNewOauth2WalletAddress(address, chainId, oAuth2Provider, blockchain: SupportedBlockchainsParam, meta: object) {
+	public registerNewOauth2WalletAddress(address, chainId, oAuth2Provider, blockchain: SupportedBlockchainsParam) {
 		this.connections[address] = {
 			address: address,
 			chainId: chainId,
-			providerType: 'oauth2', // TODO make this a type to ensure it's not typed incorrectly
+			providerType: oAuth2Provider,
 			provider: oAuth2Provider,
 			blockchain: blockchain,
-			meta,
 		}
 		this.saveConnections()
 		this.emitSavedConnection(address)
@@ -512,21 +508,20 @@ export class Web3WalletProvider {
 			}
 		}
 
-		if (getCookieByName(`tn-oauth2-ref-${collectionID}`)) {
+		if (isCookieMaxAgeExpired(`tn-oauth2-expiry-${collectionID}`)) {
+			// @ts-ignore
+			this.client.ui.showLoaderDelayed(['<h4>Connecting to Socios...</h4>'], 600, true)
+			window.location.href = `https://partner.socios.com/oauth2/authorize?response_type=code&client_id=${client_id}&redirect_uri=${redirect_uri}&partner_tag=${partner_tag}`
+			return new Promise((resolve) => setTimeout(resolve, 10000))
+		} else {
 			this.registerNewOauth2WalletAddress(
 				'socios', // address id
 				'socios', // chain id
 				'Socios', // provider
-				'chiliz', // blockchain
-				null,
+				'evm', // blockchain
 			)
-			return 'Socios'
-		} else {
-			// @ts-ignore
-			this.client.ui.showLoaderDelayed(['<h4>Connecting to Socios...</h4>'], 600, true)
-			window.location.href = `https://partner.socios.com/oauth2/authorize?response_type=code&client_id=${client_id}&redirect_uri=${redirect_uri}&partner_tag=${partner_tag}`
-			return new Promise((resolve) => setTimeout(resolve, 10000))
 		}
+		return 'socios'
 	}
 
 	async Phantom(checkConnectionOnly: boolean) {

From 333f4ded46d784621d135a1f1b494b620f9bc329 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 6 Sep 2023 15:00:16 +1000
Subject: [PATCH 09/46] added logic to disconnect socios wallet.

---
 index.html                               |  8 --------
 src/client/index.ts                      |  5 -----
 src/client/interface.ts                  |  8 ++++----
 src/utils/token/fungibleTokenProvider.ts |  4 ----
 src/wallet/Web3WalletProvider.ts         | 11 ++++-------
 5 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/index.html b/index.html
index dc5fc0e1..295d5118 100644
--- a/index.html
+++ b/index.html
@@ -36,14 +36,6 @@
                     path: "http://localhost:5000/user-login-callback",
                     params: {}
                   },
-                  userLogout: {
-                    path: "http://localhost:5000/user-logout",
-                    params: {}
-                  },
-                  userSignature: {
-                    path: 'http://localhost:5000/user-signature',
-                    params: {}
-                  },
                   userBalance: {
                     path: 'http://localhost:5000/user-balance',
                     params: {}
diff --git a/src/client/index.ts b/src/client/index.ts
index f44f4b76..925ff4e8 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -137,11 +137,6 @@ export class Client {
 		// this.registerOutletProofEventListener()
 	}
 
-	async testSig() {
-		let res = await fetch('http://localhost:5000/user-signature?message=hola', {})
-		console.log(res)
-	}
-
 	handleRecievedRedirectMessages() {
 		const issuer = this.getDataFromQuery('issuer')
 		const error = this.getDataFromQuery('error')
diff --git a/src/client/interface.ts b/src/client/interface.ts
index eb0e18c8..f1f59cd1 100644
--- a/src/client/interface.ts
+++ b/src/client/interface.ts
@@ -65,13 +65,13 @@ export interface Oauth2IssuerConfig {
 				path: string
 				params?: object
 			}
-			userAccessToken: {
+			userBalance?: {
 				path: string
-				params?: object
+				params: object
 			}
-			userLogout: {
+			userNfts?: {
 				path: string
-				params?: object
+				params: object
 			}
 		}
 	}
diff --git a/src/utils/token/fungibleTokenProvider.ts b/src/utils/token/fungibleTokenProvider.ts
index ab83a0c0..7d000900 100644
--- a/src/utils/token/fungibleTokenProvider.ts
+++ b/src/utils/token/fungibleTokenProvider.ts
@@ -10,10 +10,6 @@ export const getFungibleTokenBalances = async (issuer: OnChainIssuer, owner: str
 	if (ipfsBaseUrl) query += `&ipfsBaseUrl=${ipfsBaseUrl}`
 	if (issuer.oAuth2options) {
 		query = issuer.oAuth2options.endpoints.userBalance.path;
-		// TODO when a user clicks load
-		// if(isCookieExpired(`tn-oauth2-expiry-${issuer.collectionID}`)) {
-		// 	ui.updateUI('wallet', { viewName: 'wallet' }, { viewTransition: 'slide-in-left' })
-		// }
 	}
 	return tokenRequest(query, true)
 }
diff --git a/src/wallet/Web3WalletProvider.ts b/src/wallet/Web3WalletProvider.ts
index 6c78a461..3054d158 100644
--- a/src/wallet/Web3WalletProvider.ts
+++ b/src/wallet/Web3WalletProvider.ts
@@ -106,8 +106,8 @@ export class Web3WalletProvider {
 			if (state) {
 				for (let item in state) {
 					let provider = state[item].providerType
-					switch (provider) {
-						case 'WalletConnectV2':
+					switch (provider.toLowerCase()) {
+						case 'walletconnectV2':
 							{
 								let walletConnect2Provider = await import('./WalletConnectV2Provider')
 
@@ -125,8 +125,7 @@ export class Web3WalletProvider {
 							}
 							break
 						case 'socios':
-							console.log('remove socios wallet from local storage')
-							// deleteCookieByName(provider.expiryCookieName);
+							deleteCookieByName(`tn-oauth2-expiry-socios`)
 							break
 					}
 				}
@@ -496,19 +495,17 @@ export class Web3WalletProvider {
 		let client_id
 		let redirect_uri
 		let partner_tag
-		let collectionID
 		for (const issuer of this.client.config.issuers) {
 			const oauthIssuer = issuer as Oauth2IssuerConfig
 			if (oauthIssuer.oAuth2options.consumerKey) {
 				client_id = oauthIssuer.oAuth2options.consumerKey
 				redirect_uri = oauthIssuer.oAuth2options.endpoints.redirectURI.path
 				partner_tag = oauthIssuer.oAuth2options.partnerTag
-				collectionID = oauthIssuer.collectionID
 				break
 			}
 		}
 
-		if (isCookieMaxAgeExpired(`tn-oauth2-expiry-${collectionID}`)) {
+		if (isCookieMaxAgeExpired(`tn-oauth2-expiry-socios`)) {
 			// @ts-ignore
 			this.client.ui.showLoaderDelayed(['<h4>Connecting to Socios...</h4>'], 600, true)
 			window.location.href = `https://partner.socios.com/oauth2/authorize?response_type=code&client_id=${client_id}&redirect_uri=${redirect_uri}&partner_tag=${partner_tag}`

From 5342dd328cd82e64666c950453205e6ec46c9565 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 6 Sep 2023 15:03:35 +1000
Subject: [PATCH 10/46] code tidy

---
 src/client/index.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/client/index.ts b/src/client/index.ts
index 925ff4e8..73c8ee2e 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -620,8 +620,7 @@ export class Client {
 			let issuer = issuers[issuerKey] as OnChainIssuer
 
 			try {
-				let tokens
-				tokens = await this.loadOnChainTokens(issuer)
+				const tokens = await this.loadOnChainTokens(issuer)
 				this.tokenStore.setTokens(issuerKey, tokens)
 			} catch (err) {
 				logger(2, err)

From 1f0ce4f9b171bad46f894ca8f6884288799b6a1e Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 6 Sep 2023 15:05:04 +1000
Subject: [PATCH 11/46] code tidy

---
 src/client/index.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/client/index.ts b/src/client/index.ts
index 73c8ee2e..c977651c 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -669,7 +669,6 @@ export class Client {
 		if (config.onChain === true) {
 			tokens = await this.loadOnChainTokens(config)
 		} else {
-			// TODO //
 			// @ts-ignore
 			tokens = await this.loadOutletTokens(config)
 		}

From 828ec5a198427b76e69be8608be6edac8aa731ec Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 6 Sep 2023 15:06:22 +1000
Subject: [PATCH 12/46] code tidy

---
 src/utils/token/fungibleTokenProvider.ts | 3 +--
 src/utils/token/nftProvider.ts           | 6 +-----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/utils/token/fungibleTokenProvider.ts b/src/utils/token/fungibleTokenProvider.ts
index 7d000900..20332473 100644
--- a/src/utils/token/fungibleTokenProvider.ts
+++ b/src/utils/token/fungibleTokenProvider.ts
@@ -1,9 +1,8 @@
 import { tokenRequest } from './../index'
 import { OnChainIssuer } from '../../client/interface'
 import { BASE_TOKEN_DISCOVERY_URL } from './nftProvider'
-import { isCookieExpired } from './../../utils/index'
 
-export const getFungibleTokenBalances = async (issuer: OnChainIssuer, owner: string, ipfsBaseUrl?: string, ui?: any) => {
+export const getFungibleTokenBalances = async (issuer: OnChainIssuer, owner: string, ipfsBaseUrl?: string) => {
 	const { contract, chain } = issuer
 	let query = `${BASE_TOKEN_DISCOVERY_URL}/get-owner-fungible-tokens?collectionAddress=${contract}&owner=${owner}&chain=${chain}&blockchain=${issuer.blockchain ?? 'evm&'}`
 	if (issuer.symbol) query += `&symbol=${issuer.symbol}`
diff --git a/src/utils/token/nftProvider.ts b/src/utils/token/nftProvider.ts
index 84db5b71..52a4b6c2 100644
--- a/src/utils/token/nftProvider.ts
+++ b/src/utils/token/nftProvider.ts
@@ -9,7 +9,7 @@ import { JsonRpc } from 'eosjs'
 export const BASE_TOKEN_DISCOVERY_URL = 'https://api.token-discovery.tokenscript.org'
 import { isCookieExpired } from './../../utils/index'
 
-export const getNftCollection = async (issuer: OnChainIssuer, ipfsBaseUrl?: string, ui?: any) => {
+export const getNftCollection = async (issuer: OnChainIssuer, ipfsBaseUrl?: string) => {
 	let query: string
 
 	if ('blockchain' in issuer && issuer.blockchain === 'ultra') {
@@ -21,10 +21,6 @@ export const getNftCollection = async (issuer: OnChainIssuer, ipfsBaseUrl?: stri
 		query = getFlowNftCollectionUrl(issuer)
 	} else if (issuer.oAuth2options) {
 		query = issuer.oAuth2options.endpoints.userNfts.path;
-		// TODO instead do this when the user clicks on load!!!
-		// if(isCookieExpired(`tn-oauth2-expiry-${issuer.collectionID}`)) {
-		// 	ui.updateUI('wallet', { viewName: 'wallet' }, { viewTransition: 'slide-in-left' })
-		// }
 	} else {
 		query = getEvmNftCollectionUrl(issuer, ipfsBaseUrl)
 	}

From 7c68fe3aa8499b0241312bcfda2f531182089355 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 6 Sep 2023 15:06:48 +1000
Subject: [PATCH 13/46] code tidy

---
 src/client/index.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/client/index.ts b/src/client/index.ts
index c977651c..4445a1ad 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -891,13 +891,6 @@ export class Client {
 		else return this.authenticateToken(authRequest as AuthenticateInterface)
 	}
 
-	// TEST method to debug issue with Socios signature API.
-	// TODO Integrate this into authentication flow.
-	async testSociosSignatureAPI(message: string) {
-		const response = await fetch(`http://localhost:5000/user-signature?message=${message}`)
-		return response
-	}
-
 	async authenticateToken(authRequest: AuthenticateInterface) {
 		await this.checkUserAgentSupport('authentication')
 

From 39f21d67a1c231c85e6e2c5c0f555ecc2c577811 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 6 Sep 2023 15:07:34 +1000
Subject: [PATCH 14/46] code tidy

---
 src/client/interface.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/interface.ts b/src/client/interface.ts
index f1f59cd1..7a48218e 100644
--- a/src/client/interface.ts
+++ b/src/client/interface.ts
@@ -27,7 +27,7 @@ export interface OffChainTokenConfig extends IssuerConfigInterface {
 }
 
 export interface OnChainTokenConfig extends IssuerConfigInterface {
-	onChain: boolean
+	onChain: true
 	contract: string
 	chain: string
 	openSeaSlug?: string

From 3b76e7578b70689e93ef71234aea36d841f1908c Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 6 Sep 2023 15:08:47 +1000
Subject: [PATCH 15/46] code tidy

---
 src/client/views/select-issuers.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/client/views/select-issuers.ts b/src/client/views/select-issuers.ts
index af22177c..5fef874b 100644
--- a/src/client/views/select-issuers.ts
+++ b/src/client/views/select-issuers.ts
@@ -286,7 +286,6 @@ export class SelectIssuers extends AbstractView {
 		tokenBtn.style.display = 'block'
 		let issuers = this.client.getTokenStore().getCurrentIssuers()
 
-		// TODO check if this should say 'Balance not found'.
 		tokenBtn.innerHTML =
 			tokens.length && issuers[issuer].fungible ? 'Balance found' : `${tokens.length} token${tokens.length > 1 ? 's' : ''} available`
 		tokenBtn.setAttribute('aria-label', `Navigate to select from ${tokens.length} of your ${issuer} tokens`)

From 1c592185c3568ec6acc36bb52bbc30e4fd8542a1 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 6 Sep 2023 15:10:11 +1000
Subject: [PATCH 16/46] code tidy

---
 src/utils/index.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/utils/index.ts b/src/utils/index.ts
index bbb9def7..cb65dfba 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -275,13 +275,10 @@ export const isCookieMaxAgeExpired = (cookieName) => {
 				// The cookie is still valid
 				return false
 			} else {
-				// The cookie has expired, you can optionally remove it
-				// document.cookie = `${cookieName}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;`;
 				return true
 			}
 		}
 	}
-	// The cookie with the given name was not found
 	return true
 }
 
@@ -295,7 +292,7 @@ export const isCookieExpired = (cookieName: string) => {
 			return currentDate > expirationDate
 		}
 	}
-	return true // Cookie not found, assume expired.
+	return true
 }
 
 export const getCookieByName = (cookieName: string) => {

From cec652b828375a6f8235441b4ae301d82a7b6c17 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 6 Sep 2023 15:11:56 +1000
Subject: [PATCH 17/46] code tidy

---
 webpack.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webpack.config.js b/webpack.config.js
index d8231663..ab49251c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -3,7 +3,7 @@ const webpack = require("webpack");
 const TerserPlugin = require("terser-webpack-plugin");
 
 module.exports = {
-  mode: "development",
+  mode: "production",
   target: "web",
   entry: "./src/index.ts",
   plugins: [

From 708a143b9238db2be09c2c4754b78c565644cd70 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 6 Sep 2023 15:13:03 +1000
Subject: [PATCH 18/46] code tidy

---
 src/wallet/Web3WalletProvider.ts | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/wallet/Web3WalletProvider.ts b/src/wallet/Web3WalletProvider.ts
index 3054d158..cd077eef 100644
--- a/src/wallet/Web3WalletProvider.ts
+++ b/src/wallet/Web3WalletProvider.ts
@@ -215,15 +215,6 @@ export class Web3WalletProvider {
 		return connection.provider
 	}
 
-	// getOauthWalletProvider(provider: string) {
-	// 	let data = localStorage.getItem(Web3WalletProvider.LOCAL_STORAGE_KEY)
-	// 	if (data) {
-	// 		let state = JSON.parse(data)
-	// 		return state[provider]
-	// 	}
-	// 	return false;
-	// }
-
 	hasAnyConnection(blockchain: SupportedBlockchainsParam[]) {
 		for (const i in this.connections) {
 			if (blockchain.includes(this.connections[i].blockchain)) {

From f098e00da6a25dfb3800fedca16055c123546563 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 6 Sep 2023 15:14:40 +1000
Subject: [PATCH 19/46] code tidy

---
 src/wallet/Web3WalletProvider.ts | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/wallet/Web3WalletProvider.ts b/src/wallet/Web3WalletProvider.ts
index cd077eef..58dc1d22 100644
--- a/src/wallet/Web3WalletProvider.ts
+++ b/src/wallet/Web3WalletProvider.ts
@@ -1,14 +1,8 @@
 import { ethers } from 'ethers'
-import { logger, strToHexStr, strToUtfBytes, getCookieByName, deleteCookieByName, isCookieMaxAgeExpired } from '../utils'
+import { logger, strToHexStr, strToUtfBytes, deleteCookieByName, isCookieMaxAgeExpired } from '../utils'
 import { SafeConnectOptions } from './SafeConnectProvider'
 import { Client } from '../client'
-import {
-	SupportedBlockchainsParam,
-	WalletOptionsInterface,
-	SignatureSupportedBlockchainsParamList,
-	OffChainTokenConfig,
-	OnChainTokenConfig,
-} from '../client/interface'
+import { SupportedBlockchainsParam, WalletOptionsInterface, SignatureSupportedBlockchainsParamList } from '../client/interface'
 import { DEFAULT_RPC_MAP } from '../core/constants'
 import { Oauth2IssuerConfig } from './../client/interface'
 
@@ -34,7 +28,7 @@ export interface WalletConnection {
 export interface WalletConnectionOauth2 {
 	address: string
 	chainId: number | string
-	blockchain: SupportedBlockchainsParam // TODO make this an OAuth list
+	blockchain: SupportedBlockchainsParam // TODO make this an OAuth list (when more providers exist)
 	provider: string
 	providerType: string
 	meta?: any

From 005ee7e6321e26c043a861e695b1e7a60cdef4e5 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 6 Sep 2023 15:16:13 +1000
Subject: [PATCH 20/46] code tidy

---
 src/utils/token/nftProvider.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/utils/token/nftProvider.ts b/src/utils/token/nftProvider.ts
index 52a4b6c2..e292aab9 100644
--- a/src/utils/token/nftProvider.ts
+++ b/src/utils/token/nftProvider.ts
@@ -7,7 +7,6 @@ import { JsonRpc } from 'eosjs'
 
 // export const BASE_TOKEN_DISCOVERY_URL = 'http://localhost:3000'
 export const BASE_TOKEN_DISCOVERY_URL = 'https://api.token-discovery.tokenscript.org'
-import { isCookieExpired } from './../../utils/index'
 
 export const getNftCollection = async (issuer: OnChainIssuer, ipfsBaseUrl?: string) => {
 	let query: string

From 0745bc83fdb1dae9a91bfb8cdc44567ea078445b Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 6 Sep 2023 15:18:31 +1000
Subject: [PATCH 21/46] code tidy

---
 src/utils/token/fungibleTokenProvider.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/token/fungibleTokenProvider.ts b/src/utils/token/fungibleTokenProvider.ts
index 20332473..94559c46 100644
--- a/src/utils/token/fungibleTokenProvider.ts
+++ b/src/utils/token/fungibleTokenProvider.ts
@@ -4,7 +4,7 @@ import { BASE_TOKEN_DISCOVERY_URL } from './nftProvider'
 
 export const getFungibleTokenBalances = async (issuer: OnChainIssuer, owner: string, ipfsBaseUrl?: string) => {
 	const { contract, chain } = issuer
-	let query = `${BASE_TOKEN_DISCOVERY_URL}/get-owner-fungible-tokens?collectionAddress=${contract}&owner=${owner}&chain=${chain}&blockchain=${issuer.blockchain ?? 'evm&'}`
+	let query = `${BASE_TOKEN_DISCOVERY_URL}/get-owner-fungible-tokens?collectionAddress=${contract}&owner=${owner}&chain=${chain}&blockchain=${issuer.blockchain ?? 'evm'}`
 	if (issuer.symbol) query += `&symbol=${issuer.symbol}`
 	if (ipfsBaseUrl) query += `&ipfsBaseUrl=${ipfsBaseUrl}`
 	if (issuer.oAuth2options) {

From b6e4450d8bd2b19509ea4fcf2647ee3b8cc7553d Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 6 Sep 2023 15:20:56 +1000
Subject: [PATCH 22/46] code tidy

---
 src/client/index.ts            | 4 ++--
 src/utils/token/nftProvider.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/client/index.ts b/src/client/index.ts
index 4445a1ad..bd3a048b 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -694,9 +694,9 @@ export class Client {
 		let tokens
 
 		if (issuer.fungible) {
-			tokens = await getFungibleTokenBalances(issuer, walletAddress, null, this.ui)
+			tokens = await getFungibleTokenBalances(issuer, walletAddress, null)
 		} else {
-			tokens = await getNftTokens(issuer, walletAddress, null, this.ui)
+			tokens = await getNftTokens(issuer, walletAddress)
 		}
 
 		tokens.map((token) => {
diff --git a/src/utils/token/nftProvider.ts b/src/utils/token/nftProvider.ts
index e292aab9..1ca6241e 100644
--- a/src/utils/token/nftProvider.ts
+++ b/src/utils/token/nftProvider.ts
@@ -53,7 +53,7 @@ export const getFlowNftCollectionUrl = (issuer: OnChainTokenConfig) => {
 	return query
 }
 
-export const getNftTokens = async (issuer: OnChainIssuer, owner: string, ipfsBaseUrl?: string, ui?: any) => {
+export const getNftTokens = async (issuer: OnChainIssuer, owner: string, ipfsBaseUrl?: string) => {
 	let query: string
 	if ('blockchain' in issuer && issuer.blockchain === 'ultra') {
 		// TODO add to the Discovery Service

From ed3a4f3eb9a84473bb14d4cf4d06b7dd2b1922cc Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 6 Sep 2023 15:22:19 +1000
Subject: [PATCH 23/46] code tidy

---
 src/client/views/select-issuers.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/client/views/select-issuers.ts b/src/client/views/select-issuers.ts
index 5fef874b..22979dd2 100644
--- a/src/client/views/select-issuers.ts
+++ b/src/client/views/select-issuers.ts
@@ -170,7 +170,6 @@ export class SelectIssuers extends AbstractView {
 	issuerConnectMarkup(title: string, image: string | undefined, issuer: string, tokens: any[], data: Issuer) {
 		let buttonText = ''
 
-		// TODO ensure fungilbe exists on type
 		// @ts-ignore
 		if (tokens?.length) buttonText = data?.fungible ? 'Balance found' : `${tokens.length} token${tokens.length > 1 ? 's' : ''} available`
 

From a60f3927c498b9f05497128bb2b9314ecdd79985 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 6 Sep 2023 16:09:03 +1000
Subject: [PATCH 24/46] code tidy

---
 src/client/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/client/index.ts b/src/client/index.ts
index bd3a048b..9e41bdae 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -131,6 +131,7 @@ export class Client {
 		this.config = this.mergeConfig(defaultConfig, config)
 
 		this.tokenStore = new TokenStore(this.config.autoEnableTokens, this.config.tokenPersistenceTTL)
+		// @ts-ignore
 		if (this.config.issuers?.length > 0) this.tokenStore.updateIssuers(this.config.issuers)
 
 		this.messaging = new Messaging()
@@ -696,7 +697,7 @@ export class Client {
 		if (issuer.fungible) {
 			tokens = await getFungibleTokenBalances(issuer, walletAddress, null)
 		} else {
-			tokens = await getNftTokens(issuer, walletAddress)
+			tokens = await getNftTokens(issuer, walletAddress, null)
 		}
 
 		tokens.map((token) => {

From 1904d4840a8f9d111705d0de854e3d24335d17dc Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Mon, 11 Sep 2023 12:04:24 +1000
Subject: [PATCH 25/46] updates to project config

---
 .gitignore   |   1 -
 index.html   | 770 +++++++++++++++++++++++++--------------------------
 package.json |   6 +-
 3 files changed, 390 insertions(+), 387 deletions(-)

diff --git a/.gitignore b/.gitignore
index d84dc0cb..9ba35691 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,4 @@ bundles
 .idea
 dist/
 token-negotiator-dist/
-
 .sass-cache
\ No newline at end of file
diff --git a/index.html b/index.html
index c3cb9154..6b0130f8 100644
--- a/index.html
+++ b/index.html
@@ -1,45 +1,44 @@
 <!doctype html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Document</title>
 
-    <script
-      type="text/javascript"
-      src="./token-negotiator-dist/negotiator.js"
-    ></script>
-    <link rel="stylesheet" href="./token-negotiator-dist/theme/style.css" />
-  </head>
-  <body onload="init()">
-    <button onclick="switchTheme()">Switch theme</button>
-    <button onclick="reloadIssuers()">Reload</button>
-    <div class="overlay-tn"></div>
-    <script>
-      var theme = "dark";
-      function init() {
-        window.negotiator = new negotiator.Client({
-          type: "active",
-          issuers: [
-            {
-              hideToggle: true,
-              noTokenMsg:
-                "<p>If you hold a Devcon ticket, please visit your magicLink email again and open the link in this browser.</p><p>You may reload this page after and try again.</p>",
-              onChain: false,
-              tokenName: "devcon6",
-              collectionID: "devcon6",
-              title: "Devcon VI Ticket Attestation",
-              image: "https://devcon-vi.attest.tickets/img/nft_bg.png",
-              tokenOrigin: "https://devcon-vi.attest.tickets/outlet.html",
-              attestationOrigin: "https://test.attestation.id/",
-              tokenUrlName: "ticket",
-              cryptoVerify: "https://form.smarttokenlabs.com",
-              tokenSecretName: "secret",
-              tokenIdName: "mail",
-              unsignedTokenDataName: "ticket",
-              whitelistDialogRenderer: (permissionTxt, acceptBtn, denyBtn) => {
-                return `
+<head>
+  <meta charset="UTF-8" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>Document</title>
+
+  <script type="text/javascript" src="./token-negotiator-dist/negotiator.js"></script>
+  <link rel="stylesheet" href="./token-negotiator-dist/theme/style.css" />
+</head>
+
+<body onload="init()">
+  <button onclick="switchTheme()">Switch theme</button>
+  <button onclick="reloadIssuers()">Reload</button>
+  <div class="overlay-tn"></div>
+  <script>
+    var theme = "dark";
+    function init() {
+      window.negotiator = new negotiator.Client({
+        type: "active",
+        issuers: [
+          {
+            hideToggle: true,
+            noTokenMsg:
+              "<p>If you hold a Devcon ticket, please visit your magicLink email again and open the link in this browser.</p><p>You may reload this page after and try again.</p>",
+            onChain: false,
+            tokenName: "devcon6",
+            collectionID: "devcon6",
+            title: "Devcon VI Ticket Attestation",
+            image: "https://devcon-vi.attest.tickets/img/nft_bg.png",
+            tokenOrigin: "https://devcon-vi.attest.tickets/outlet.html",
+            attestationOrigin: "https://test.attestation.id/",
+            tokenUrlName: "ticket",
+            cryptoVerify: "https://form.smarttokenlabs.com",
+            tokenSecretName: "secret",
+            tokenIdName: "mail",
+            unsignedTokenDataName: "ticket",
+            whitelistDialogRenderer: (permissionTxt, acceptBtn, denyBtn) => {
+              return `
 		<div class="tn-auth-box">
 			<div class="tn-auth-heading">
 				<img alt="devcon" src="img/FB_OG_Image.svg" style="width: 150px;" />
@@ -51,323 +50,139 @@
 			</div>
 		</div>
 	`;
-              },
-              signedTokenWhitelist: [
-                "https://devcon-vi.attest.tickets/",
-                "https://dev.loc",
-                "https://devconnect.loc/",
-                "https://devconnect.antopolbus.rv.ua/",
-                "https://perks.antopolbus.rv.ua/",
-                "https://stage-perks.smarttokenlabs.com/",
-                "http://localhost:5000/",
-
-                "https://hashkey.smarttokenlabs.com/",
-                "https://fayre-devcon.webflow.io/",
-                "https://fenbushi-devcon.webflow.io/",
-                "https://metasearch-devcon.webflow.io/",
-                "https://conspicuis-devcon.webflow.io/",
-                "https://devcon-vi.brandextender.io/",
-                "https://www.edcon.io/",
-              ],
-              itemStorageKey: "devconnectTokens",
-              base64senderPublicKeys: {
-                4: "MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAEAGJAHCiHbrCNAY9fAMdom4dGD6v/KkTIgRCkwLCjXFTkXWGrCEXHaZ8kWwdqlu0oYCrNQ2vdlqOl0s26/LzO8A==|MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAE-N-jGYo1OuO77XItd3zT-oIhZEVC44uqOhtJkmBsBNDTp3Seu_vmuLB-b4whNeFNBuJTsT7AHUiUe3JOwCcegA==",
-              },
-              base64attestorPubKey:
-                "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
-            },
-            {
-              collectionID: "devcon",
-              onChain: false,
-              title: "Devcon",
-              tokenIdName: "id",
-              image:
-                "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg",
-              tokenOrigin: "http://localhost:3002/",
-              attestationOrigin: "https://test.attestation.id/",
-              base64senderPublicKeys: {
-                6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
-                55: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
-              },
-              base64attestorPubKey:
-                "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
-              ticketIssuersUrlWebsitePrivateKey:
-                "MIICSwIBADCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBBIIBVTCCAVECAQEEIM/T+SzcXcdtcNIqo6ck0nJTYzKL5ywYBFNSpI7R8AuBoIHjMIHgAgEBMCwGByqGSM49AQECIQD////////////////////////////////////+///8LzBEBCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcEQQR5vmZ++dy7rFWgYpXOhwsHApv82y3OKNlZ8oFbFvgXmEg62ncmo8RlXaT7/A4RCKj9F7RIpoVUGZxH0I/7ENS4AiEA/////////////////////rqu3OavSKA7v9JejNA2QUECAQGhRANCAARjMR62qoIK9pHk17MyHHIU42Ix+Vl6Q2gTmIF72vNpinBpyoBkTkV0pnI1jdrLlAjJC0I91DZWQhVhddMCK65c",
-            },
-            // {
-            //   collectionID: "devcon",
-            //   onChain: false,
-            //   title: "Devcon",
-            //   image:
-            //     "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg",
-            //   tokenOrigin: "http://localhost:3002/",
-            //   attestationOrigin: "https://test.attestation.id/",
-            //   base64senderPublicKeys: {
-            //     6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
-            //   },
-            //   base64attestorPubKey:
-            //     "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
-            //   ticketIssuersUrlWebsitePrivateKey:
-            //     "MIICSwIBADCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBBIIBVTCCAVECAQEEIM/T+SzcXcdtcNIqo6ck0nJTYzKL5ywYBFNSpI7R8AuBoIHjMIHgAgEBMCwGByqGSM49AQECIQD////////////////////////////////////+///8LzBEBCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcEQQR5vmZ++dy7rFWgYpXOhwsHApv82y3OKNlZ8oFbFvgXmEg62ncmo8RlXaT7/A4RCKj9F7RIpoVUGZxH0I/7ENS4AiEA/////////////////////rqu3OavSKA7v9JejNA2QUECAQGhRANCAARjMR62qoIK9pHk17MyHHIU42Ix+Vl6Q2gTmIF72vNpinBpyoBkTkV0pnI1jdrLlAjJC0I91DZWQhVhddMCK65c",
-            // },
-            // {
-            //   collectionID: "edcon",
-            //   onChain: false,
-            //   title: "Edcon",
-            //   image:
-            //     "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRMSMZD26jgBM_da7b_0NfT7JZgyDk7rdk6o4iAVh4E12dV9LK-h0thJ_SdRWWptz1EYlk&usqp=CAU",
-            //   tokenOrigin: "http://localhost:3002/",
-            //   attestationOrigin: "https://test.attestation.id/",
-            //   base64senderPublicKeys: {
-            //     6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABAjUvEi8UYyC+0rSFu+IwRBos/DEC6YMJV+eCnoYOC4nZU7uayKDJmBxVnmTOSwaM4+gufLbeqqxuovyF5gI3TQ=",
-            //   },
-            //   base64attestorPubKey:
-            //     "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
-            // },
-            // {
-            //   collectionID: "devconnect",
-            //   onChain: false,
-            //   title: "Devconnect",
-            //   image:
-            //     "https://pbs.twimg.com/profile_images/1653427962350370816/GiJ0Wh-h_400x400.jpg",
-            //   tokenOrigin: "http://localhost:3002/",
-            //   attestationOrigin: "https://test.attestation.id/",
-            //   base64senderPublicKeys: {
-            //     7: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABAjUvEi8UYyC+0rSFu+IwRBos/DEC6YMJV+eCnoYOC4nZU7uayKDJmBxVnmTOSwaM4+gufLbeqqxuovyF5gI3TQ=",
-            //   },
-            //   base64attestorPubKey:
-            //     "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
-            // },
-            // {
-            // hideToggle : false,
-            // noTokenMsg: "<p>If you have a token please:</p><p>1. Open your magic link inside this browser.<br/>2. Refresh this page.</p>",
-            // collectionID: 'devcon',
-            // title: "Devcon",
-            // onChain: false,
-            // tokenOrigin: "http://localhost:3002/",
-            // attestationOrigin: "https://attestation.id/",
-            // unEndPoint: "https://crypto-verify.herokuapp.com/use-devcon-ticket",
-            // image: "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg",
-            // base64senderPublicKeys:
-            //     {
-            //         "AttestationDAO" : 'MFYwEAYHKoZIzj0CAQYFK...'
-            //     },
-            // base64attestorPubKey: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ="
-            // },
-            // {
-            //   collectionID: "crypto-cowboy-country",
-            //   tokenProgram: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
-            //   collectionAddress:
-            //     "bf0aae3dd0078a9feb975f1e3242ddcb7774d551c7fd2a3f07a89c827ed606b2",
-            //   updateAuthority: "CCCUzWanUNegjGby11DjujDvPaNN68jd9Rimwk2MZzqZ",
-            //   onChain: true,
-            //   symbol: "CCC",
-            //   chain: "mainnet",
-            //   blockchain: "solana",
-            // },
-            // {
-            //   collectionID: "penthouse-panther-club",
-            //   collectionAddress: "ff846ef2eed57e5367cf8826e63f4d53fe28d28aa67417accb6e4b48cbd19136",
-            //   updateAuthority: "92oYPmrr1BHznizuZmpKZ3MFRadMFYRTCxo9Pf34mZKX",
-            //   tokenProgram: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
-            //   onChain: true,
-            //   symbol: "PPC",
-            //   chain: "mainnet",
-            //   blockchain: "solana",
-            // },
-            // {
-            //   hideToggle : false,
-            //   collectionID: "pixel",
-            //   collectionAddress: "166424b16c4c7f40eb852f9eb2d0d6869a9ed7ac54a8e6afbd516676bfbbeb19",
-            //   onChain: true,
-            //   symbol: "PIXEL",
-            //   chain: "mainnet",
-            //   blockchain: "solana",
-            // },
-            {
-              onChain: true,
-              collectionID: "expansion-punks",
-              contract: "0x0d0167a823c6619d430b1a96ad85b888bcf97c37",
-              chain: "eth",
-              blockchain: "evm",
-            },
-            {
-              onChain: true,
-              collectionID: "fantom-collection-test",
-              contract: "0x94e22c14118353651636f9af43cd0a5a08b93da3",
-              chain: "fantom",
-              blockchain: "evm",
-            },
-            {
-              hideToggle: true,
-              noTokenMsg:
-                "<p>If you have a token please:</p><p>1. Open your magic link inside this browser.<br/>2. Refresh this page.</p>",
-              onChain: true,
-              collectionID: "bsc-collection-test",
-              contract: "0xF5db804101d8600c26598A1Ba465166c33CdAA4b",
-              chain: "bsc",
-              blockchain: "evm",
-            },
-            // {
-            //   onChain: true,
-            //   collectionID: "tt",
-            //   contract: '0x76be3b62873462d2142405439777e971754e8e77',
-            //   chain: 'eth',
-            //   blockchain: "evm",
-            // },
-            // { onChain: true, collectionID: "Perion", contract: '0x96af92ae2d822a0f191455ceca4d4e7ee227668e', chain: 'mumbai', blockchain: "evm" },
-            // { collectionID: 'COOLCATS-#2426-14', onChain: true, contract: '0x3C7e352481F4b2fdEc1e642a3f0018661c77513D', chain: 'eth', openSeaSlug: 'devcon-vi-suit-up-collection' },
-            // { collectionID: 'Town-Hall', onChain: true, contract: '0x81b30ff521D1fEB67EDE32db726D95714eb00637', chain: 'Optimism' },
-            // {
-            //   collectionID: "Blusteak Kangaroo #64",
-            //   onChain: true,
-            //   contract: "0xa996F7F3BC647EebC98C684aB0A302c9b85d2FA1",
-            //   chain: "Avalanche",
-            // },
-            // {
-            //   collectionID: "Alone Pirate",
-            //   onChain: true,
-            //   contract: "0x36535ec384B94342558e37282527b5052587af6A",
-            //   chain: "Arbitrum",
-            // },
-            // {
-            // 	collectionID: "NBA",
-            // 	onChain: true,
-            // 	contract: "A.0b2a3299cc857e29.TopShot",
-            // 	chain: "mainnet",
-            // 	blockchain: "flow",
-            // },
-            // {
-            //   onChain: true,
-            //   erc: 20,
-            //   fungible: true,
-            //   collectionID: "polygon",
-            //   contract: '0x52459834ca561cb55411699e9c2143683bcf865f',
-            //   chain: 'matic',
-            //   blockchain: "evm",
-            //   // Add fungible as a boolean
-            //   // symbol: 'USX'
-            // },
-            // {
-            //   contract: "0x107065a122f92636a1358a70a0efe0f1a080a7e5",
-            //   onChain: true,
-            //   fungible: true,
-            //   collectionID: "USX",
-            //   chain: "matic",
-            // },
-            // {
-            //   contract: "0x429f49faec3d568ef83ec803e02df78e25d5ee7d",
-            //   onChain: true,
-            //   fungible: true,
-            //   collectionID: "Ella",
-            //   chain: "matic",
-            // },
-            // {
-            //   contract: "0xaaa5b9e6c589642f98a1cda99b9d024b8407285a",
-            //   onChain: true,
-            //   fungible: true,
-            //   collectionID: "TITAN",
-            //   chain: "matic",
-            // },
-          ],
-          uiOptions: {
-            openingHeading:
-              "Open a new world of perks, benefits and opportunities with your attestation, collectible or token.",
-            issuerHeading: "Get discount with Ticket",
-            repeatAction: "try again",
-            theme: theme,
-            position: "top-right",
-          },
-          unSupportedUserAgent: {
-            authentication: {
-              config: {
-                metaMaskAndroid: true,
-                alphaWalletAndroid: true,
-                mewAndroid: true,
-                imTokenAndroid: true,
-              },
-              errorMessage:
-                "No Support for Authentication with this user agent. Try Chrome, Safari or Edge instead.",
-            },
-            full: {
-              config: {
-                iE: true,
-                iE9: true,
-              },
-              errorMessage:
-                "This browser is not supported. Please try using Chrome, Edge, FireFox or Safari.",
             },
-          },
-          safeConnectOptions: {
-            url: "https://safeconnect.tokenscript.org",
-            initialProof: false,
-          },
-          experimentalFeatures: ["magicLinkWallet"],
-        });
-
-        window.negotiator.on("tokens-selected", (tokens) => {
-          console.log("tokens-selected", tokens);
-        });
-        window.negotiator.on("connected-wallet", (wallet) => {
-          console.log("connected wallet", wallet);
-          window.testingWallet = wallet;
-        });
-        window.negotiator.on("network-change", (chain) => {
-          console.log("network change", chain);
-          window.testingChain = chain;
-        });
-        window.negotiator.on("disconnected-wallet", () => {
-          console.log("wallet successfully disconnected");
-        });
-        window.negotiator.on("loaded", () => {
-          console.log("token negotiator loaded");
-        });
-        window.negotiator.on("tokens-refreshed", () => {
-          console.log("tokens-refreshed");
-        });
-        window.negotiator.on("opened-overlay", () => {
-          console.log("opened overlay");
-        });
-        window.negotiator.on("closed-overlay", () => {
-          console.log("closed overlay");
-        });
-        window.negotiator.on("view-changed", (data) => {
-          console.log("view change", data);
-        });
-        window.negotiator.on("token-proof", (proof) => {
-          console.log(proof);
-        });
-
-        window.negotiator.on("tokens-loaded", (data) => {
-          console.log(`${data.loadedCollections} tokens were loaded`);
-        });
+            signedTokenWhitelist: [
+              "https://devcon-vi.attest.tickets/",
+              "https://dev.loc",
+              "https://devconnect.loc/",
+              "https://devconnect.antopolbus.rv.ua/",
+              "https://perks.antopolbus.rv.ua/",
+              "https://stage-perks.smarttokenlabs.com/",
+              "http://localhost:5000/",
 
-        window.negotiator.negotiate();
-      }
-
-      function reloadIssuers() {
-        window.negotiator.negotiate([
-          {
-            collectionID: "penthouse-panther-club",
-            collectionAddress:
-              "ff846ef2eed57e5367cf8826e63f4d53fe28d28aa67417accb6e4b48cbd19136",
-            updateAuthority: "92oYPmrr1BHznizuZmpKZ3MFRadMFYRTCxo9Pf34mZKX",
-            tokenProgram: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
-            onChain: true,
-            symbol: "PPC",
-            chain: "mainnet",
-            blockchain: "solana",
+              "https://hashkey.smarttokenlabs.com/",
+              "https://fayre-devcon.webflow.io/",
+              "https://fenbushi-devcon.webflow.io/",
+              "https://metasearch-devcon.webflow.io/",
+              "https://conspicuis-devcon.webflow.io/",
+              "https://devcon-vi.brandextender.io/",
+              "https://www.edcon.io/",
+            ],
+            itemStorageKey: "devconnectTokens",
+            base64senderPublicKeys: {
+              4: "MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAEAGJAHCiHbrCNAY9fAMdom4dGD6v/KkTIgRCkwLCjXFTkXWGrCEXHaZ8kWwdqlu0oYCrNQ2vdlqOl0s26/LzO8A==|MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAE-N-jGYo1OuO77XItd3zT-oIhZEVC44uqOhtJkmBsBNDTp3Seu_vmuLB-b4whNeFNBuJTsT7AHUiUe3JOwCcegA==",
+            },
+            base64attestorPubKey:
+              "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
           },
           {
-            hideToggle: false,
-            collectionID: "pixel",
-            collectionAddress:
-              "166424b16c4c7f40eb852f9eb2d0d6869a9ed7ac54a8e6afbd516676bfbbeb19",
-            onChain: true,
-            symbol: "PIXEL",
-            chain: "mainnet",
-            blockchain: "solana",
+            collectionID: "devcon",
+            onChain: false,
+            title: "Devcon",
+            tokenIdName: "id",
+            image:
+              "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg",
+            tokenOrigin: "http://localhost:3002/",
+            attestationOrigin: "https://test.attestation.id/",
+            base64senderPublicKeys: {
+              6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
+              55: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
+            },
+            base64attestorPubKey:
+              "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
+            ticketIssuersUrlWebsitePrivateKey:
+              "MIICSwIBADCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBBIIBVTCCAVECAQEEIM/T+SzcXcdtcNIqo6ck0nJTYzKL5ywYBFNSpI7R8AuBoIHjMIHgAgEBMCwGByqGSM49AQECIQD////////////////////////////////////+///8LzBEBCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcEQQR5vmZ++dy7rFWgYpXOhwsHApv82y3OKNlZ8oFbFvgXmEg62ncmo8RlXaT7/A4RCKj9F7RIpoVUGZxH0I/7ENS4AiEA/////////////////////rqu3OavSKA7v9JejNA2QUECAQGhRANCAARjMR62qoIK9pHk17MyHHIU42Ix+Vl6Q2gTmIF72vNpinBpyoBkTkV0pnI1jdrLlAjJC0I91DZWQhVhddMCK65c",
           },
+          // {
+          //   collectionID: "devcon",
+          //   onChain: false,
+          //   title: "Devcon",
+          //   image:
+          //     "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg",
+          //   tokenOrigin: "http://localhost:3002/",
+          //   attestationOrigin: "https://test.attestation.id/",
+          //   base64senderPublicKeys: {
+          //     6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
+          //   },
+          //   base64attestorPubKey:
+          //     "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
+          //   ticketIssuersUrlWebsitePrivateKey:
+          //     "MIICSwIBADCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBBIIBVTCCAVECAQEEIM/T+SzcXcdtcNIqo6ck0nJTYzKL5ywYBFNSpI7R8AuBoIHjMIHgAgEBMCwGByqGSM49AQECIQD////////////////////////////////////+///8LzBEBCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcEQQR5vmZ++dy7rFWgYpXOhwsHApv82y3OKNlZ8oFbFvgXmEg62ncmo8RlXaT7/A4RCKj9F7RIpoVUGZxH0I/7ENS4AiEA/////////////////////rqu3OavSKA7v9JejNA2QUECAQGhRANCAARjMR62qoIK9pHk17MyHHIU42Ix+Vl6Q2gTmIF72vNpinBpyoBkTkV0pnI1jdrLlAjJC0I91DZWQhVhddMCK65c",
+          // },
+          // {
+          //   collectionID: "edcon",
+          //   onChain: false,
+          //   title: "Edcon",
+          //   image:
+          //     "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRMSMZD26jgBM_da7b_0NfT7JZgyDk7rdk6o4iAVh4E12dV9LK-h0thJ_SdRWWptz1EYlk&usqp=CAU",
+          //   tokenOrigin: "http://localhost:3002/",
+          //   attestationOrigin: "https://test.attestation.id/",
+          //   base64senderPublicKeys: {
+          //     6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABAjUvEi8UYyC+0rSFu+IwRBos/DEC6YMJV+eCnoYOC4nZU7uayKDJmBxVnmTOSwaM4+gufLbeqqxuovyF5gI3TQ=",
+          //   },
+          //   base64attestorPubKey:
+          //     "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
+          // },
+          // {
+          //   collectionID: "devconnect",
+          //   onChain: false,
+          //   title: "Devconnect",
+          //   image:
+          //     "https://pbs.twimg.com/profile_images/1653427962350370816/GiJ0Wh-h_400x400.jpg",
+          //   tokenOrigin: "http://localhost:3002/",
+          //   attestationOrigin: "https://test.attestation.id/",
+          //   base64senderPublicKeys: {
+          //     7: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABAjUvEi8UYyC+0rSFu+IwRBos/DEC6YMJV+eCnoYOC4nZU7uayKDJmBxVnmTOSwaM4+gufLbeqqxuovyF5gI3TQ=",
+          //   },
+          //   base64attestorPubKey:
+          //     "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
+          // },
+          // {
+          // hideToggle : false,
+          // noTokenMsg: "<p>If you have a token please:</p><p>1. Open your magic link inside this browser.<br/>2. Refresh this page.</p>",
+          // collectionID: 'devcon',
+          // title: "Devcon",
+          // onChain: false,
+          // tokenOrigin: "http://localhost:3002/",
+          // attestationOrigin: "https://attestation.id/",
+          // unEndPoint: "https://crypto-verify.herokuapp.com/use-devcon-ticket",
+          // image: "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg",
+          // base64senderPublicKeys:
+          //     {
+          //         "AttestationDAO" : 'MFYwEAYHKoZIzj0CAQYFK...'
+          //     },
+          // base64attestorPubKey: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ="
+          // },
+          // {
+          //   collectionID: "crypto-cowboy-country",
+          //   tokenProgram: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
+          //   collectionAddress:
+          //     "bf0aae3dd0078a9feb975f1e3242ddcb7774d551c7fd2a3f07a89c827ed606b2",
+          //   updateAuthority: "CCCUzWanUNegjGby11DjujDvPaNN68jd9Rimwk2MZzqZ",
+          //   onChain: true,
+          //   symbol: "CCC",
+          //   chain: "mainnet",
+          //   blockchain: "solana",
+          // },
+          // {
+          //   collectionID: "penthouse-panther-club",
+          //   collectionAddress: "ff846ef2eed57e5367cf8826e63f4d53fe28d28aa67417accb6e4b48cbd19136",
+          //   updateAuthority: "92oYPmrr1BHznizuZmpKZ3MFRadMFYRTCxo9Pf34mZKX",
+          //   tokenProgram: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
+          //   onChain: true,
+          //   symbol: "PPC",
+          //   chain: "mainnet",
+          //   blockchain: "solana",
+          // },
+          // {
+          //   hideToggle : false,
+          //   collectionID: "pixel",
+          //   collectionAddress: "166424b16c4c7f40eb852f9eb2d0d6869a9ed7ac54a8e6afbd516676bfbbeb19",
+          //   onChain: true,
+          //   symbol: "PIXEL",
+          //   chain: "mainnet",
+          //   blockchain: "solana",
+          // },
           {
             onChain: true,
             collectionID: "expansion-punks",
@@ -392,39 +207,224 @@
             chain: "bsc",
             blockchain: "evm",
           },
-          {
-            onChain: true,
-            collectionID: "tt",
-            contract: "0x76be3b62873462d2142405439777e971754e8e77",
-            chain: "eth",
-            blockchain: "evm",
-          },
-          {
-            onChain: true,
-            collectionID: "Perion",
-            contract: "0x96af92ae2d822a0f191455ceca4d4e7ee227668e",
-            chain: "mumbai",
-            blockchain: "evm",
-          },
-          {
-            collectionID: "COOLCATS-#2426-14",
-            onChain: true,
-            contract: "0x3C7e352481F4b2fdEc1e642a3f0018661c77513D",
-            chain: "eth",
-            openSeaSlug: "devcon-vi-suit-up-collection",
+          // {
+          //   onChain: true,
+          //   collectionID: "tt",
+          //   contract: '0x76be3b62873462d2142405439777e971754e8e77',
+          //   chain: 'eth',
+          //   blockchain: "evm",
+          // },
+          // { onChain: true, collectionID: "Perion", contract: '0x96af92ae2d822a0f191455ceca4d4e7ee227668e', chain: 'mumbai', blockchain: "evm" },
+          // { collectionID: 'COOLCATS-#2426-14', onChain: true, contract: '0x3C7e352481F4b2fdEc1e642a3f0018661c77513D', chain: 'eth', openSeaSlug: 'devcon-vi-suit-up-collection' },
+          // { collectionID: 'Town-Hall', onChain: true, contract: '0x81b30ff521D1fEB67EDE32db726D95714eb00637', chain: 'Optimism' },
+          // {
+          //   collectionID: "Blusteak Kangaroo #64",
+          //   onChain: true,
+          //   contract: "0xa996F7F3BC647EebC98C684aB0A302c9b85d2FA1",
+          //   chain: "Avalanche",
+          // },
+          // {
+          //   collectionID: "Alone Pirate",
+          //   onChain: true,
+          //   contract: "0x36535ec384B94342558e37282527b5052587af6A",
+          //   chain: "Arbitrum",
+          // },
+          // {
+          // 	collectionID: "NBA",
+          // 	onChain: true,
+          // 	contract: "A.0b2a3299cc857e29.TopShot",
+          // 	chain: "mainnet",
+          // 	blockchain: "flow",
+          // },
+          // {
+          //   onChain: true,
+          //   erc: 20,
+          //   fungible: true,
+          //   collectionID: "polygon",
+          //   contract: '0x52459834ca561cb55411699e9c2143683bcf865f',
+          //   chain: 'matic',
+          //   blockchain: "evm",
+          //   // Add fungible as a boolean
+          //   // symbol: 'USX'
+          // },
+          // {
+          //   contract: "0x107065a122f92636a1358a70a0efe0f1a080a7e5",
+          //   onChain: true,
+          //   fungible: true,
+          //   collectionID: "USX",
+          //   chain: "matic",
+          // },
+          // {
+          //   contract: "0x429f49faec3d568ef83ec803e02df78e25d5ee7d",
+          //   onChain: true,
+          //   fungible: true,
+          //   collectionID: "Ella",
+          //   chain: "matic",
+          // },
+          // {
+          //   contract: "0xaaa5b9e6c589642f98a1cda99b9d024b8407285a",
+          //   onChain: true,
+          //   fungible: true,
+          //   collectionID: "TITAN",
+          //   chain: "matic",
+          // },
+        ],
+        uiOptions: {
+          openingHeading:
+            "Open a new world of perks, benefits and opportunities with your attestation, collectible or token.",
+          issuerHeading: "Get discount with Ticket",
+          repeatAction: "try again",
+          theme: theme,
+          position: "top-right",
+        },
+        unSupportedUserAgent: {
+          authentication: {
+            config: {
+              metaMaskAndroid: true,
+              alphaWalletAndroid: true,
+              mewAndroid: true,
+              imTokenAndroid: true,
+            },
+            errorMessage:
+              "No Support for Authentication with this user agent. Try Chrome, Safari or Edge instead.",
           },
-          {
-            collectionID: "Town-Hall",
-            onChain: true,
-            contract: "0x81b30ff521D1fEB67EDE32db726D95714eb00637",
-            chain: "Optimism",
+          full: {
+            config: {
+              iE: true,
+              iE9: true,
+            },
+            errorMessage:
+              "This browser is not supported. Please try using Chrome, Edge, FireFox or Safari.",
           },
-        ]);
-      }
-      function switchTheme() {
-        theme = theme === "dark" ? "light" : "dark";
-        window.negotiator.switchTheme(theme);
-      }
-    </script>
-  </body>
-</html>
+        },
+        safeConnectOptions: {
+          url: "https://safeconnect.tokenscript.org",
+          initialProof: false,
+        },
+        experimentalFeatures: ["magicLinkWallet"],
+      });
+
+      window.negotiator.on("tokens-selected", (tokens) => {
+        console.log("tokens-selected", tokens);
+      });
+      window.negotiator.on("connected-wallet", (wallet) => {
+        console.log("connected wallet", wallet);
+        window.testingWallet = wallet;
+      });
+      window.negotiator.on("network-change", (chain) => {
+        console.log("network change", chain);
+        window.testingChain = chain;
+      });
+      window.negotiator.on("disconnected-wallet", () => {
+        console.log("wallet successfully disconnected");
+      });
+      window.negotiator.on("loaded", () => {
+        console.log("token negotiator loaded");
+      });
+      window.negotiator.on("tokens-refreshed", () => {
+        console.log("tokens-refreshed");
+      });
+      window.negotiator.on("opened-overlay", () => {
+        console.log("opened overlay");
+      });
+      window.negotiator.on("closed-overlay", () => {
+        console.log("closed overlay");
+      });
+      window.negotiator.on("view-changed", (data) => {
+        console.log("view change", data);
+      });
+      window.negotiator.on("token-proof", (proof) => {
+        console.log(proof);
+      });
+
+      window.negotiator.on("tokens-loaded", (data) => {
+        console.log(`${data.loadedCollections} tokens were loaded`);
+      });
+
+      window.negotiator.negotiate();
+    }
+
+    function reloadIssuers() {
+      window.negotiator.negotiate([
+        {
+          collectionID: "penthouse-panther-club",
+          collectionAddress:
+            "ff846ef2eed57e5367cf8826e63f4d53fe28d28aa67417accb6e4b48cbd19136",
+          updateAuthority: "92oYPmrr1BHznizuZmpKZ3MFRadMFYRTCxo9Pf34mZKX",
+          tokenProgram: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
+          onChain: true,
+          symbol: "PPC",
+          chain: "mainnet",
+          blockchain: "solana",
+        },
+        {
+          hideToggle: false,
+          collectionID: "pixel",
+          collectionAddress:
+            "166424b16c4c7f40eb852f9eb2d0d6869a9ed7ac54a8e6afbd516676bfbbeb19",
+          onChain: true,
+          symbol: "PIXEL",
+          chain: "mainnet",
+          blockchain: "solana",
+        },
+        {
+          onChain: true,
+          collectionID: "expansion-punks",
+          contract: "0x0d0167a823c6619d430b1a96ad85b888bcf97c37",
+          chain: "eth",
+          blockchain: "evm",
+        },
+        {
+          onChain: true,
+          collectionID: "fantom-collection-test",
+          contract: "0x94e22c14118353651636f9af43cd0a5a08b93da3",
+          chain: "fantom",
+          blockchain: "evm",
+        },
+        {
+          hideToggle: true,
+          noTokenMsg:
+            "<p>If you have a token please:</p><p>1. Open your magic link inside this browser.<br/>2. Refresh this page.</p>",
+          onChain: true,
+          collectionID: "bsc-collection-test",
+          contract: "0xF5db804101d8600c26598A1Ba465166c33CdAA4b",
+          chain: "bsc",
+          blockchain: "evm",
+        },
+        {
+          onChain: true,
+          collectionID: "tt",
+          contract: "0x76be3b62873462d2142405439777e971754e8e77",
+          chain: "eth",
+          blockchain: "evm",
+        },
+        {
+          onChain: true,
+          collectionID: "Perion",
+          contract: "0x96af92ae2d822a0f191455ceca4d4e7ee227668e",
+          chain: "mumbai",
+          blockchain: "evm",
+        },
+        {
+          collectionID: "COOLCATS-#2426-14",
+          onChain: true,
+          contract: "0x3C7e352481F4b2fdEc1e642a3f0018661c77513D",
+          chain: "eth",
+          openSeaSlug: "devcon-vi-suit-up-collection",
+        },
+        {
+          collectionID: "Town-Hall",
+          onChain: true,
+          contract: "0x81b30ff521D1fEB67EDE32db726D95714eb00637",
+          chain: "Optimism",
+        },
+      ]);
+    }
+    function switchTheme() {
+      theme = theme === "dark" ? "light" : "dark";
+      window.negotiator.switchTheme(theme);
+    }
+  </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/package.json b/package.json
index e4b7bf51..c916ad34 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,10 @@
   "bugs": {
     "url": "https://github.com/TokenScript/token-negotiator/issues"
   },
+  "keywords": [
+    "tokenScript",
+    "token-negotiator"
+  ],
   "homepage": "https://github.com/TokenScript/token-negotiator#readme",
   "dependencies": {
     "@onflow/fcl": "^1.3.2",
@@ -104,4 +108,4 @@
   "browserslist": [
     "last 5 years"
   ]
-}
+}
\ No newline at end of file

From 4b816285515be1576c2287af9f5143b47bd517cf Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Mon, 11 Sep 2023 12:25:08 +1000
Subject: [PATCH 26/46] updates to project config

---
 index.html | 280 ++++++-----------------------------------------------
 1 file changed, 29 insertions(+), 251 deletions(-)

diff --git a/index.html b/index.html
index 6b0130f8..22b57b7c 100644
--- a/index.html
+++ b/index.html
@@ -6,7 +6,6 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>Document</title>
-
   <script type="text/javascript" src="./token-negotiator-dist/negotiator.js"></script>
   <link rel="stylesheet" href="./token-negotiator-dist/theme/style.css" />
 </head>
@@ -16,258 +15,37 @@
   <button onclick="reloadIssuers()">Reload</button>
   <div class="overlay-tn"></div>
   <script>
-    var theme = "dark";
+    var theme = "light";
     function init() {
       window.negotiator = new negotiator.Client({
         type: "active",
         issuers: [
-          {
-            hideToggle: true,
-            noTokenMsg:
-              "<p>If you hold a Devcon ticket, please visit your magicLink email again and open the link in this browser.</p><p>You may reload this page after and try again.</p>",
-            onChain: false,
-            tokenName: "devcon6",
-            collectionID: "devcon6",
-            title: "Devcon VI Ticket Attestation",
-            image: "https://devcon-vi.attest.tickets/img/nft_bg.png",
-            tokenOrigin: "https://devcon-vi.attest.tickets/outlet.html",
-            attestationOrigin: "https://test.attestation.id/",
-            tokenUrlName: "ticket",
-            cryptoVerify: "https://form.smarttokenlabs.com",
-            tokenSecretName: "secret",
-            tokenIdName: "mail",
-            unsignedTokenDataName: "ticket",
-            whitelistDialogRenderer: (permissionTxt, acceptBtn, denyBtn) => {
-              return `
-		<div class="tn-auth-box">
-			<div class="tn-auth-heading">
-				<img alt="devcon" src="img/FB_OG_Image.svg" style="width: 150px;" />
-			</div>
-			<div class="tn-auth-content">
-				<p>${permissionTxt}</p>
-				${acceptBtn}
-				${denyBtn}
-			</div>
-		</div>
-	`;
-            },
-            signedTokenWhitelist: [
-              "https://devcon-vi.attest.tickets/",
-              "https://dev.loc",
-              "https://devconnect.loc/",
-              "https://devconnect.antopolbus.rv.ua/",
-              "https://perks.antopolbus.rv.ua/",
-              "https://stage-perks.smarttokenlabs.com/",
-              "http://localhost:5000/",
-
-              "https://hashkey.smarttokenlabs.com/",
-              "https://fayre-devcon.webflow.io/",
-              "https://fenbushi-devcon.webflow.io/",
-              "https://metasearch-devcon.webflow.io/",
-              "https://conspicuis-devcon.webflow.io/",
-              "https://devcon-vi.brandextender.io/",
-              "https://www.edcon.io/",
-            ],
-            itemStorageKey: "devconnectTokens",
-            base64senderPublicKeys: {
-              4: "MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAEAGJAHCiHbrCNAY9fAMdom4dGD6v/KkTIgRCkwLCjXFTkXWGrCEXHaZ8kWwdqlu0oYCrNQ2vdlqOl0s26/LzO8A==|MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAE-N-jGYo1OuO77XItd3zT-oIhZEVC44uqOhtJkmBsBNDTp3Seu_vmuLB-b4whNeFNBuJTsT7AHUiUe3JOwCcegA==",
-            },
-            base64attestorPubKey:
-              "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
-          },
-          {
-            collectionID: "devcon",
-            onChain: false,
-            title: "Devcon",
-            tokenIdName: "id",
-            image:
-              "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg",
-            tokenOrigin: "http://localhost:3002/",
-            attestationOrigin: "https://test.attestation.id/",
-            base64senderPublicKeys: {
-              6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
-              55: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
-            },
-            base64attestorPubKey:
-              "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
-            ticketIssuersUrlWebsitePrivateKey:
-              "MIICSwIBADCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBBIIBVTCCAVECAQEEIM/T+SzcXcdtcNIqo6ck0nJTYzKL5ywYBFNSpI7R8AuBoIHjMIHgAgEBMCwGByqGSM49AQECIQD////////////////////////////////////+///8LzBEBCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcEQQR5vmZ++dy7rFWgYpXOhwsHApv82y3OKNlZ8oFbFvgXmEg62ncmo8RlXaT7/A4RCKj9F7RIpoVUGZxH0I/7ENS4AiEA/////////////////////rqu3OavSKA7v9JejNA2QUECAQGhRANCAARjMR62qoIK9pHk17MyHHIU42Ix+Vl6Q2gTmIF72vNpinBpyoBkTkV0pnI1jdrLlAjJC0I91DZWQhVhddMCK65c",
-          },
-          // {
-          //   collectionID: "devcon",
-          //   onChain: false,
-          //   title: "Devcon",
-          //   image:
-          //     "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg",
-          //   tokenOrigin: "http://localhost:3002/",
-          //   attestationOrigin: "https://test.attestation.id/",
-          //   base64senderPublicKeys: {
-          //     6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
-          //   },
-          //   base64attestorPubKey:
-          //     "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
-          //   ticketIssuersUrlWebsitePrivateKey:
-          //     "MIICSwIBADCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBBIIBVTCCAVECAQEEIM/T+SzcXcdtcNIqo6ck0nJTYzKL5ywYBFNSpI7R8AuBoIHjMIHgAgEBMCwGByqGSM49AQECIQD////////////////////////////////////+///8LzBEBCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcEQQR5vmZ++dy7rFWgYpXOhwsHApv82y3OKNlZ8oFbFvgXmEg62ncmo8RlXaT7/A4RCKj9F7RIpoVUGZxH0I/7ENS4AiEA/////////////////////rqu3OavSKA7v9JejNA2QUECAQGhRANCAARjMR62qoIK9pHk17MyHHIU42Ix+Vl6Q2gTmIF72vNpinBpyoBkTkV0pnI1jdrLlAjJC0I91DZWQhVhddMCK65c",
-          // },
-          // {
-          //   collectionID: "edcon",
-          //   onChain: false,
-          //   title: "Edcon",
-          //   image:
-          //     "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRMSMZD26jgBM_da7b_0NfT7JZgyDk7rdk6o4iAVh4E12dV9LK-h0thJ_SdRWWptz1EYlk&usqp=CAU",
-          //   tokenOrigin: "http://localhost:3002/",
-          //   attestationOrigin: "https://test.attestation.id/",
-          //   base64senderPublicKeys: {
-          //     6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABAjUvEi8UYyC+0rSFu+IwRBos/DEC6YMJV+eCnoYOC4nZU7uayKDJmBxVnmTOSwaM4+gufLbeqqxuovyF5gI3TQ=",
-          //   },
-          //   base64attestorPubKey:
-          //     "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
-          // },
-          // {
-          //   collectionID: "devconnect",
-          //   onChain: false,
-          //   title: "Devconnect",
-          //   image:
-          //     "https://pbs.twimg.com/profile_images/1653427962350370816/GiJ0Wh-h_400x400.jpg",
-          //   tokenOrigin: "http://localhost:3002/",
-          //   attestationOrigin: "https://test.attestation.id/",
-          //   base64senderPublicKeys: {
-          //     7: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABAjUvEi8UYyC+0rSFu+IwRBos/DEC6YMJV+eCnoYOC4nZU7uayKDJmBxVnmTOSwaM4+gufLbeqqxuovyF5gI3TQ=",
-          //   },
-          //   base64attestorPubKey:
-          //     "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
-          // },
-          // {
-          // hideToggle : false,
-          // noTokenMsg: "<p>If you have a token please:</p><p>1. Open your magic link inside this browser.<br/>2. Refresh this page.</p>",
-          // collectionID: 'devcon',
-          // title: "Devcon",
-          // onChain: false,
-          // tokenOrigin: "http://localhost:3002/",
-          // attestationOrigin: "https://attestation.id/",
-          // unEndPoint: "https://crypto-verify.herokuapp.com/use-devcon-ticket",
-          // image: "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg",
-          // base64senderPublicKeys:
-          //     {
-          //         "AttestationDAO" : 'MFYwEAYHKoZIzj0CAQYFK...'
-          //     },
-          // base64attestorPubKey: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ="
-          // },
-          // {
-          //   collectionID: "crypto-cowboy-country",
-          //   tokenProgram: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
-          //   collectionAddress:
-          //     "bf0aae3dd0078a9feb975f1e3242ddcb7774d551c7fd2a3f07a89c827ed606b2",
-          //   updateAuthority: "CCCUzWanUNegjGby11DjujDvPaNN68jd9Rimwk2MZzqZ",
-          //   onChain: true,
-          //   symbol: "CCC",
-          //   chain: "mainnet",
-          //   blockchain: "solana",
-          // },
-          // {
-          //   collectionID: "penthouse-panther-club",
-          //   collectionAddress: "ff846ef2eed57e5367cf8826e63f4d53fe28d28aa67417accb6e4b48cbd19136",
-          //   updateAuthority: "92oYPmrr1BHznizuZmpKZ3MFRadMFYRTCxo9Pf34mZKX",
-          //   tokenProgram: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
-          //   onChain: true,
-          //   symbol: "PPC",
-          //   chain: "mainnet",
-          //   blockchain: "solana",
-          // },
-          // {
-          //   hideToggle : false,
-          //   collectionID: "pixel",
-          //   collectionAddress: "166424b16c4c7f40eb852f9eb2d0d6869a9ed7ac54a8e6afbd516676bfbbeb19",
-          //   onChain: true,
-          //   symbol: "PIXEL",
-          //   chain: "mainnet",
-          //   blockchain: "solana",
-          // },
           {
             onChain: true,
-            collectionID: "expansion-punks",
-            contract: "0x0d0167a823c6619d430b1a96ad85b888bcf97c37",
+            fungible: true,
             chain: "eth",
             blockchain: "evm",
+            collectionID: "socios",
+            contract: "0x3506424F91fD33084466F402d5D97f05F8e3b4AF",
+            oAuth2options: {
+              consumerKey: "PBK9Mx_ffFRUPHW9BLTxnGHRdywa",
+              partnerTag: "smarttokenlabs",
+              endpoints: {
+                redirectURI: {
+                  path: "http://localhost:5000/user-login-callback",
+                  params: {}
+                },
+                userBalance: {
+                  path: 'http://localhost:5000/user-balance',
+                  params: {}
+                },
+                userNfts: {
+                  path: 'http://localhost:5000/user-nfts',
+                  params: {}
+                },
+              },
+            },
           },
-          {
-            onChain: true,
-            collectionID: "fantom-collection-test",
-            contract: "0x94e22c14118353651636f9af43cd0a5a08b93da3",
-            chain: "fantom",
-            blockchain: "evm",
-          },
-          {
-            hideToggle: true,
-            noTokenMsg:
-              "<p>If you have a token please:</p><p>1. Open your magic link inside this browser.<br/>2. Refresh this page.</p>",
-            onChain: true,
-            collectionID: "bsc-collection-test",
-            contract: "0xF5db804101d8600c26598A1Ba465166c33CdAA4b",
-            chain: "bsc",
-            blockchain: "evm",
-          },
-          // {
-          //   onChain: true,
-          //   collectionID: "tt",
-          //   contract: '0x76be3b62873462d2142405439777e971754e8e77',
-          //   chain: 'eth',
-          //   blockchain: "evm",
-          // },
-          // { onChain: true, collectionID: "Perion", contract: '0x96af92ae2d822a0f191455ceca4d4e7ee227668e', chain: 'mumbai', blockchain: "evm" },
-          // { collectionID: 'COOLCATS-#2426-14', onChain: true, contract: '0x3C7e352481F4b2fdEc1e642a3f0018661c77513D', chain: 'eth', openSeaSlug: 'devcon-vi-suit-up-collection' },
-          // { collectionID: 'Town-Hall', onChain: true, contract: '0x81b30ff521D1fEB67EDE32db726D95714eb00637', chain: 'Optimism' },
-          // {
-          //   collectionID: "Blusteak Kangaroo #64",
-          //   onChain: true,
-          //   contract: "0xa996F7F3BC647EebC98C684aB0A302c9b85d2FA1",
-          //   chain: "Avalanche",
-          // },
-          // {
-          //   collectionID: "Alone Pirate",
-          //   onChain: true,
-          //   contract: "0x36535ec384B94342558e37282527b5052587af6A",
-          //   chain: "Arbitrum",
-          // },
-          // {
-          // 	collectionID: "NBA",
-          // 	onChain: true,
-          // 	contract: "A.0b2a3299cc857e29.TopShot",
-          // 	chain: "mainnet",
-          // 	blockchain: "flow",
-          // },
-          // {
-          //   onChain: true,
-          //   erc: 20,
-          //   fungible: true,
-          //   collectionID: "polygon",
-          //   contract: '0x52459834ca561cb55411699e9c2143683bcf865f',
-          //   chain: 'matic',
-          //   blockchain: "evm",
-          //   // Add fungible as a boolean
-          //   // symbol: 'USX'
-          // },
-          // {
-          //   contract: "0x107065a122f92636a1358a70a0efe0f1a080a7e5",
-          //   onChain: true,
-          //   fungible: true,
-          //   collectionID: "USX",
-          //   chain: "matic",
-          // },
-          // {
-          //   contract: "0x429f49faec3d568ef83ec803e02df78e25d5ee7d",
-          //   onChain: true,
-          //   fungible: true,
-          //   collectionID: "Ella",
-          //   chain: "matic",
-          // },
-          // {
-          //   contract: "0xaaa5b9e6c589642f98a1cda99b9d024b8407285a",
-          //   onChain: true,
-          //   fungible: true,
-          //   collectionID: "TITAN",
-          //   chain: "matic",
-          // },
         ],
         uiOptions: {
           openingHeading:
@@ -367,13 +145,13 @@
           chain: "mainnet",
           blockchain: "solana",
         },
-        {
-          onChain: true,
-          collectionID: "expansion-punks",
-          contract: "0x0d0167a823c6619d430b1a96ad85b888bcf97c37",
-          chain: "eth",
-          blockchain: "evm",
-        },
+        // {
+        //   onChain: true,
+        //   collectionID: "expansion-punks",
+        //   contract: "0x0d0167a823c6619d430b1a96ad85b888bcf97c37",
+        //   chain: "eth",
+        //   blockchain: "evm",
+        // },
         {
           onChain: true,
           collectionID: "fantom-collection-test",

From 10a062121f4ab5996ab892a73da0e2f90084daba Mon Sep 17 00:00:00 2001
From: Nick <nicktaras@hotmail.co.uk>
Date: Mon, 11 Sep 2023 12:36:25 +1000
Subject: [PATCH 27/46] Update index.html

---
 index.html | 208 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 208 insertions(+)

diff --git a/index.html b/index.html
index e69de29b..8fb8c250 100644
--- a/index.html
+++ b/index.html
@@ -0,0 +1,208 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Document</title>
+    <script
+      type="text/javascript"
+      src="./token-negotiator-dist/negotiator.js"
+    ></script>
+    <link rel="stylesheet" href="./token-negotiator-dist/theme/style.css" />
+  </head>
+  <body onload="init()">
+    <button onclick="switchTheme()">Switch theme</button>
+    <button onclick="reloadIssuers()">Reload</button>
+    <div class="overlay-tn"></div>
+    <script>
+      var theme = "light";
+      function init() {
+        window.negotiator = new negotiator.Client({
+          type: "active",
+          issuers: [
+            {
+              onChain: true,
+              fungible: true,
+              chain: "eth",
+              blockchain: "evm",
+              collectionID: "socios",
+              contract: "0x3506424F91fD33084466F402d5D97f05F8e3b4AF",
+              oAuth2options: {
+                consumerKey: "PBK9Mx_ffFRUPHW9BLTxnGHRdywa",
+                partnerTag: "smarttokenlabs",
+                endpoints: {
+                  redirectURI: {
+                    path: "http://localhost:5000/user-login-callback",
+                    params: {}
+                  },
+                  userBalance: {
+                    path: 'http://localhost:5000/user-balance',
+                    params: {}
+                  },
+                  userNfts: {
+                    path: 'http://localhost:5000/user-nfts',
+                    params: {}
+                  },
+                },
+              }, 
+            },
+          ],
+          uiOptions: {
+            openingHeading:
+              "Open a new world of perks, benefits and opportunities with your attestation, collectible or token.",
+            issuerHeading: "Get discount with Ticket",
+            repeatAction: "try again",
+            theme: theme,
+            position: "top-right",
+          },
+          unSupportedUserAgent: {
+            authentication: {
+              config: {
+                metaMaskAndroid: true,
+                alphaWalletAndroid: true,
+                mewAndroid: true,
+                imTokenAndroid: true,
+              },
+              errorMessage:
+                "No Support for Authentication with this user agent. Try Chrome, Safari or Edge instead.",
+            },
+            full: {
+              config: {
+                iE: true,
+                iE9: true,
+              },
+              errorMessage:
+                "This browser is not supported. Please try using Chrome, Edge, FireFox or Safari.",
+            },
+          },
+          safeConnectOptions: {
+            url: "https://safeconnect.tokenscript.org",
+            initialProof: false,
+          },
+          experimentalFeatures: ["magicLinkWallet"],
+        });
+
+        window.negotiator.on("tokens-selected", (tokens) => {
+          console.log("tokens-selected", tokens);
+        });
+        window.negotiator.on("connected-wallet", (wallet) => {
+          console.log("connected wallet", wallet);
+          window.testingWallet = wallet;
+        });
+        window.negotiator.on("network-change", (chain) => {
+          console.log("network change", chain);
+          window.testingChain = chain;
+        });
+        window.negotiator.on("disconnected-wallet", () => {
+          console.log("wallet successfully disconnected");
+        });
+        window.negotiator.on("loaded", () => {
+          console.log("token negotiator loaded");
+        });
+        window.negotiator.on("tokens-refreshed", () => {
+          console.log("tokens-refreshed");
+        });
+        window.negotiator.on("opened-overlay", () => {
+          console.log("opened overlay");
+        });
+        window.negotiator.on("closed-overlay", () => {
+          console.log("closed overlay");
+        });
+        window.negotiator.on("view-changed", (data) => {
+          console.log("view change", data);
+        });
+        window.negotiator.on("token-proof", (proof) => {
+          console.log(proof);
+        });
+
+        window.negotiator.on("tokens-loaded", (data) => {
+          console.log(`${data.loadedCollections} tokens were loaded`);
+        });
+
+        window.negotiator.negotiate();
+      }
+
+      function reloadIssuers() {
+        window.negotiator.negotiate([
+          {
+            collectionID: "penthouse-panther-club",
+            collectionAddress:
+              "ff846ef2eed57e5367cf8826e63f4d53fe28d28aa67417accb6e4b48cbd19136",
+            updateAuthority: "92oYPmrr1BHznizuZmpKZ3MFRadMFYRTCxo9Pf34mZKX",
+            tokenProgram: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
+            onChain: true,
+            symbol: "PPC",
+            chain: "mainnet",
+            blockchain: "solana",
+          },
+          {
+            hideToggle: false,
+            collectionID: "pixel",
+            collectionAddress:
+              "166424b16c4c7f40eb852f9eb2d0d6869a9ed7ac54a8e6afbd516676bfbbeb19",
+            onChain: true,
+            symbol: "PIXEL",
+            chain: "mainnet",
+            blockchain: "solana",
+          },
+          // {
+          //   onChain: true,
+          //   collectionID: "expansion-punks",
+          //   contract: "0x0d0167a823c6619d430b1a96ad85b888bcf97c37",
+          //   chain: "eth",
+          //   blockchain: "evm",
+          // },
+          {
+            onChain: true,
+            collectionID: "fantom-collection-test",
+            contract: "0x94e22c14118353651636f9af43cd0a5a08b93da3",
+            chain: "fantom",
+            blockchain: "evm",
+          },
+          {
+            hideToggle: true,
+            noTokenMsg:
+              "<p>If you have a token please:</p><p>1. Open your magic link inside this browser.<br/>2. Refresh this page.</p>",
+            onChain: true,
+            collectionID: "bsc-collection-test",
+            contract: "0xF5db804101d8600c26598A1Ba465166c33CdAA4b",
+            chain: "bsc",
+            blockchain: "evm",
+          },
+          {
+            onChain: true,
+            collectionID: "tt",
+            contract: "0x76be3b62873462d2142405439777e971754e8e77",
+            chain: "eth",
+            blockchain: "evm",
+          },
+          {
+            onChain: true,
+            collectionID: "Perion",
+            contract: "0x96af92ae2d822a0f191455ceca4d4e7ee227668e",
+            chain: "mumbai",
+            blockchain: "evm",
+          },
+          {
+            collectionID: "COOLCATS-#2426-14",
+            onChain: true,
+            contract: "0x3C7e352481F4b2fdEc1e642a3f0018661c77513D",
+            chain: "eth",
+            openSeaSlug: "devcon-vi-suit-up-collection",
+          },
+          {
+            collectionID: "Town-Hall",
+            onChain: true,
+            contract: "0x81b30ff521D1fEB67EDE32db726D95714eb00637",
+            chain: "Optimism",
+          },
+        ]);
+      }
+      function switchTheme() {
+        theme = theme === "dark" ? "light" : "dark";
+        window.negotiator.switchTheme(theme);
+      }
+    </script>
+  </body>
+</html>

From 5fadc800b56e22440f760498e6570595bd0ae2a1 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Mon, 11 Sep 2023 12:40:38 +1000
Subject: [PATCH 28/46] updates to project config

---
 index.html | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/index.html b/index.html
index 22b57b7c..99ab7db3 100644
--- a/index.html
+++ b/index.html
@@ -46,6 +46,32 @@
               },
             },
           },
+          {
+            onChain: true,
+            fungible: true,
+            chain: "eth",
+            blockchain: "evm",
+            collectionID: "socios",
+            contract: "0x3506424F91fD33084466F402d5D97f05F8e3b4AF",
+            oAuth2options: {
+              consumerKey: "PBK9Mx_ffFRUPHW9BLTxnGHRdywa",
+              partnerTag: "smarttokenlabs",
+              endpoints: {
+                redirectURI: {
+                  path: "http://localhost:5000/user-login-callback",
+                  params: {}
+                },
+                userBalance: {
+                  path: 'http://localhost:5000/user-balance',
+                  params: {}
+                },
+                userNfts: {
+                  path: 'http://localhost:5000/user-nfts',
+                  params: {}
+                },
+              },
+            },
+          },
         ],
         uiOptions: {
           openingHeading:

From 477047cc506265e640829909f223de0e5b9abaf4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Sep 2023 03:19:13 +0000
Subject: [PATCH 29/46] Bump @onflow/fcl from 1.3.2 to 1.6.0

Bumps [@onflow/fcl](https://github.com/onflow/flow-js-sdk) from 1.3.2 to 1.6.0.
- [Release notes](https://github.com/onflow/flow-js-sdk/releases)
- [Commits](https://github.com/onflow/flow-js-sdk/compare/@onflow/fcl@1.3.2...@onflow/fcl@1.6.0)

---
updated-dependencies:
- dependency-name: "@onflow/fcl"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 1241 +++++++++++++++++----------------------------
 1 file changed, 474 insertions(+), 767 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0e719be6..a36d584a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1790,11 +1790,23 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/@es-joy/jsdoccomment": {
+      "version": "0.37.1",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.37.1.tgz",
+      "integrity": "sha512-5vxWJ1gEkEF0yRd0O+uK6dHJf7adrxwQSX8PuRiPfFSAbNLnY0ZJfXaZucoz14Jj2N11xn2DnlEPwWRpYpvRjg==",
+      "dependencies": {
+        "comment-parser": "1.3.1",
+        "esquery": "^1.5.0",
+        "jsdoc-type-pratt-parser": "~4.0.0"
+      },
+      "engines": {
+        "node": "^14 || ^16 || ^17 || ^18 || ^19 || ^20"
+      }
+    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
       "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-      "dev": true,
       "dependencies": {
         "eslint-visitor-keys": "^3.3.0"
       },
@@ -1809,7 +1821,6 @@
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.0.tgz",
       "integrity": "sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==",
-      "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
@@ -1818,7 +1829,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz",
       "integrity": "sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==",
-      "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
@@ -1840,14 +1850,12 @@
     "node_modules/@eslint/eslintrc/node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
       "version": "13.20.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
       "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
-      "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -1862,7 +1870,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
       "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -1874,7 +1881,6 @@
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -1886,7 +1892,6 @@
       "version": "8.38.0",
       "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.38.0.tgz",
       "integrity": "sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g==",
-      "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
@@ -2707,7 +2712,6 @@
       "version": "0.11.8",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
       "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
-      "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
         "debug": "^4.1.1",
@@ -2721,7 +2725,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
       "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true,
       "engines": {
         "node": ">=12.22"
       },
@@ -2733,8 +2736,7 @@
     "node_modules/@humanwhocodes/object-schema": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
     },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
@@ -3742,7 +3744,6 @@
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -3755,7 +3756,6 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
       "engines": {
         "node": ">= 8"
       }
@@ -3764,7 +3764,6 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -4015,214 +4014,167 @@
       }
     },
     "node_modules/@onflow/config": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@onflow/config/-/config-1.0.5.tgz",
-      "integrity": "sha512-r2IUyY4SJgAY6YCzKL0cOOertHETp9BgVfCjTIq236WAHr7aMS1oNyqcVPPR++zjDK8n64lRgrxlcYSZB/LrFg==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@onflow/config/-/config-1.1.2.tgz",
+      "integrity": "sha512-Jnorp86YkGFJLpCE4ufY8wva5vW8MJxkPzLRITW+aqUDVH9FQvYuTCLHsujy/Mrr9+WgrClf6MQrA2bUCE2zEg==",
       "dependencies": {
         "@babel/runtime": "^7.18.6",
-        "@onflow/util-actor": "^1.1.2"
+        "@onflow/util-actor": "^1.2.0",
+        "eslint": "^8.34.0",
+        "eslint-plugin-jsdoc": "^40.0.0"
       }
     },
     "node_modules/@onflow/fcl": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@onflow/fcl/-/fcl-1.3.2.tgz",
-      "integrity": "sha512-H2YduE8JUMqjUBR9R3YOFgWrT/yMg+aE5w8uwrMD3YJ/wGpF6iKo0XJGRa7kPVn5pP0HjKQnOlmCLvHwEGEhQQ==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@onflow/fcl/-/fcl-1.6.0.tgz",
+      "integrity": "sha512-ksZFzf0JRtSYDNgCJKeuOt1R39DfBs62uym+GVPW9B5ahWjShoD2D9KYHVZiDbvMX19wUmB9vkgkiUvYfYEobw==",
       "dependencies": {
         "@babel/runtime": "^7.18.6",
-        "@onflow/config": "^1.0.5",
+        "@onflow/config": "^1.1.2",
         "@onflow/interaction": "0.0.11",
-        "@onflow/rlp": "^1.0.2",
-        "@onflow/sdk": "^1.1.2",
-        "@onflow/types": "^1.0.5",
-        "@onflow/util-actor": "^1.1.1",
-        "@onflow/util-address": "^1.0.2",
-        "@onflow/util-invariant": "^1.0.2",
-        "@onflow/util-logger": "^1.1.1",
-        "@onflow/util-template": "^1.0.3",
-        "@onflow/util-uid": "^1.0.2",
-        "node-fetch": "^2.6.7"
-      }
-    },
-    "node_modules/@onflow/fcl/node_modules/node-fetch": {
-      "version": "2.6.10",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.10.tgz",
-      "integrity": "sha512-5YytjUVbwzjE/BX4N62vnPPkGNxlJPwdA9/ArUc4pcM6cYS4Hinuv4VazzwjMGgnWuiQqcemOanib/5PpcsGug==",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
+        "@onflow/rlp": "^1.1.0",
+        "@onflow/sdk": "^1.2.2",
+        "@onflow/types": "^1.1.0",
+        "@onflow/util-actor": "^1.2.0",
+        "@onflow/util-address": "^1.1.0",
+        "@onflow/util-invariant": "^1.1.0",
+        "@onflow/util-logger": "^1.2.2",
+        "@onflow/util-template": "^1.1.0",
+        "@onflow/util-uid": "^1.1.0",
+        "cross-fetch": "^3.1.6"
       },
       "peerDependencies": {
-        "encoding": "^0.1.0"
+        "@react-native-async-storage/async-storage": "^1.13.0",
+        "expo-linking": "^4.0.0",
+        "expo-web-browser": "^12.0.0",
+        "react": "^17.0.0 || ^18.0.0",
+        "react-native": "^0.0.0-0 || 0.60 - 0.72 || 1000.0.0"
       },
       "peerDependenciesMeta": {
-        "encoding": {
+        "@react-native-async-storage/async-storage": {
+          "optional": true
+        },
+        "expo-linking": {
+          "optional": true
+        },
+        "expo-web-browser": {
+          "optional": true
+        },
+        "react": {
+          "optional": true
+        },
+        "react-native": {
           "optional": true
         }
       }
     },
-    "node_modules/@onflow/fcl/node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
-    "node_modules/@onflow/fcl/node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "node_modules/@onflow/fcl/node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
     "node_modules/@onflow/interaction": {
       "version": "0.0.11",
       "resolved": "https://registry.npmjs.org/@onflow/interaction/-/interaction-0.0.11.tgz",
       "integrity": "sha512-Xuq1Mmx6Wyba/F/L+QLQs0yJeQDsIDwy5SKk5vrCuVgIj0yD8k506g5L8ODrbM1LWll8i0tQsoOi0F85vNl5sA=="
     },
     "node_modules/@onflow/rlp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@onflow/rlp/-/rlp-1.0.4.tgz",
-      "integrity": "sha512-/4jSoh9eXPoN9iUCsbI+PAuTRJyYgT+XR4NdZYmxILRwOtIsSd2I9XatA4rrSzk9DJ0h8l9SmYx1y0XLnD+ohQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@onflow/rlp/-/rlp-1.1.0.tgz",
+      "integrity": "sha512-JJj4dZpKaWmCOXnado+D3RU5xYAXui9kHOmCVfdLReYHIsYBgxwHCDO/hDiQjrbmfLpiybbJKTaIldu+xkCU3Q==",
       "dependencies": {
         "@babel/runtime": "^7.18.6",
         "buffer": "^6.0.3"
       }
     },
     "node_modules/@onflow/sdk": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@onflow/sdk/-/sdk-1.1.2.tgz",
-      "integrity": "sha512-HNfQ6Q91FfFwd2g1wa/YHvmv6BYeXGONkEJyfOaoPRIbp3lG9W35HYX7Yvgtn7fvcQG+TRL8n386mzJ6Vn4dmA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@onflow/sdk/-/sdk-1.2.2.tgz",
+      "integrity": "sha512-OGwp98C7iP7KUGFoBxgnEr52hnr7vxBTCu/TI/w1giF8USPgjgQXNxJdHVauY54Yu/ruoT6XfdSMAS4PACCB/w==",
       "dependencies": {
         "@babel/runtime": "^7.18.6",
-        "@onflow/config": "^1.0.3",
-        "@onflow/rlp": "^1.0.2",
-        "@onflow/transport-http": "^1.5.0",
-        "@onflow/util-actor": "^1.1.1",
-        "@onflow/util-address": "^1.0.2",
-        "@onflow/util-invariant": "^1.0.2",
-        "@onflow/util-logger": "^1.1.1",
-        "@onflow/util-template": "^1.0.3",
+        "@onflow/config": "^1.1.1",
+        "@onflow/rlp": "^1.1.0",
+        "@onflow/transport-http": "^1.7.1",
+        "@onflow/util-actor": "^1.2.0",
+        "@onflow/util-address": "^1.1.0",
+        "@onflow/util-invariant": "^1.1.0",
+        "@onflow/util-logger": "^1.2.1",
+        "@onflow/util-template": "^1.1.0",
         "deepmerge": "^4.2.2",
         "sha3": "^2.1.4"
       }
     },
     "node_modules/@onflow/transport-http": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@onflow/transport-http/-/transport-http-1.5.0.tgz",
-      "integrity": "sha512-CGgfPC1kI+ssqDgFXxGgKHLVtu1tCGtyGJiS/fplyVun9RC7AwEp2KkjTP2dxRlto3HmntoaBkOw7z38UCxRZw==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@onflow/transport-http/-/transport-http-1.7.1.tgz",
+      "integrity": "sha512-enSKRDf2OMIH61ltyZe5pxLB8KifdRdVpWwE0MU2S0Vq5DmNN3FfwUZVh1nrK2aJZkLdryJrNJtvv7ot2NPrYA==",
       "dependencies": {
         "@babel/runtime": "^7.18.6",
-        "@onflow/util-address": "^1.0.2",
-        "@onflow/util-invariant": "^1.0.2",
-        "@onflow/util-logger": "^1.1.1",
-        "@onflow/util-template": "^1.0.3",
-        "node-fetch": "^2.6.7"
-      }
-    },
-    "node_modules/@onflow/transport-http/node_modules/node-fetch": {
-      "version": "2.6.10",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.10.tgz",
-      "integrity": "sha512-5YytjUVbwzjE/BX4N62vnPPkGNxlJPwdA9/ArUc4pcM6cYS4Hinuv4VazzwjMGgnWuiQqcemOanib/5PpcsGug==",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@onflow/transport-http/node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
-    "node_modules/@onflow/transport-http/node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "node_modules/@onflow/transport-http/node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
+        "@onflow/util-address": "^1.1.0",
+        "@onflow/util-invariant": "^1.1.0",
+        "@onflow/util-logger": "^1.2.1",
+        "@onflow/util-template": "^1.1.0",
+        "abort-controller": "^3.0.0",
+        "cross-fetch": "^3.1.6"
       }
     },
     "node_modules/@onflow/types": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@onflow/types/-/types-1.0.5.tgz",
-      "integrity": "sha512-Uf6APOwgkxPwgonQ8JRrOB0KZ5eJpNBVXlEiZIv5ddzsfM6qd9p3csEE5YmuLhAooAcisG3ROTzw2hT/zUNGbw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@onflow/types/-/types-1.1.0.tgz",
+      "integrity": "sha512-UUd2ZAFqdd8BHW//uTg+YRlh3EIH9Na+UYJ9qXpt6y87qjW0Lf4Zkhn6H5IqvhIJsjK17QYnXLFpoXItD/+ToQ==",
       "dependencies": {
         "@babel/runtime": "^7.18.6"
       }
     },
     "node_modules/@onflow/util-actor": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@onflow/util-actor/-/util-actor-1.1.2.tgz",
-      "integrity": "sha512-fsRGw5c2idlG5T0u48tzah1iE0OIc4WmgrNYN0gQ1NHX+Ue8iySoQdCIcdSxJCHOXwpHWe68fWTonCzbRJOssQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@onflow/util-actor/-/util-actor-1.2.0.tgz",
+      "integrity": "sha512-voyHXE3qYNC+P75vzv55pGDDwpxxWKWH0aToR/3g9Bq8nKGcGoszxaMJkVy+fKX1akfdT0yKr/GxXRkjCS9SBg==",
       "dependencies": {
         "@babel/runtime": "^7.18.6",
-        "queue-microtask": "1.1.2"
+        "queue-microtask": "1.2.3"
       }
     },
-    "node_modules/@onflow/util-actor/node_modules/queue-microtask": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.1.2.tgz",
-      "integrity": "sha512-F9wwNePtXrzZenAB3ax0Y8TSKGvuB7Qw16J30hspEUTbfUM+H827XyN3rlpwhVmtm5wuZtbKIHjOnwDn7MUxWQ=="
-    },
     "node_modules/@onflow/util-address": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@onflow/util-address/-/util-address-1.0.3.tgz",
-      "integrity": "sha512-w8DPYSvYm5h0hhZ0hZwiCwu9UgJBtIv2KyhDiH3TZG8srT+9GxtTPX4NzZtAVuxqWTNVlTGePD/Upxusiwnk6g==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@onflow/util-address/-/util-address-1.1.0.tgz",
+      "integrity": "sha512-HhJOIfNaYAoeYuTNUe85jt4fqnJhFmSbYqyufiJBrplwd3eKmNsan0NYvVYO4U1ecu3KyuY4D9R/NtjGpHjMlA==",
       "dependencies": {
         "@babel/runtime": "^7.18.6"
       }
     },
     "node_modules/@onflow/util-invariant": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@onflow/util-invariant/-/util-invariant-1.0.3.tgz",
-      "integrity": "sha512-+Hk93W9JwACLkM5/oOILqI9L55o5QxETBV5Du/2dLgNbjXDElMmQzURFXx6fTmODTLZ6Ri+d1nvb7AxapYFe0Q==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@onflow/util-invariant/-/util-invariant-1.1.0.tgz",
+      "integrity": "sha512-5uxweKl5tqeqB1QLzs3dWWLtpNo7H4PgcmgnRIcC2oItAkELcnVCybDdlfYjKB4n/dlg3rIym8cJQE2tBeOpZQ==",
       "dependencies": {
         "@babel/runtime": "^7.18.6"
       }
     },
     "node_modules/@onflow/util-logger": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@onflow/util-logger/-/util-logger-1.1.2.tgz",
-      "integrity": "sha512-BcVDzKNGv/j3gqnq1lc0fpJV7LCHWPJyzYR588/keiY90mFHwLe8ahXYG1UYPu02KymlVqlInfISKWlNwk4aug==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@onflow/util-logger/-/util-logger-1.2.2.tgz",
+      "integrity": "sha512-qgOZFfp4NvGuIwZ6zMPiskt/xBNo6wG+L4k/nt3v4/eVzNZeUR5OZ7XlcA0fjtr2a3W9CNt83bmFSq/11ZGgCw==",
       "dependencies": {
-        "@babel/runtime": "^7.18.6",
-        "@onflow/config": "^1.0.4"
+        "@babel/runtime": "^7.18.6"
+      },
+      "peerDependencies": {
+        "@onflow/util-config": ">1.1.1"
+      },
+      "peerDependenciesMeta": {
+        "@onflow/util-config": {
+          "optional": true
+        }
       }
     },
     "node_modules/@onflow/util-template": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@onflow/util-template/-/util-template-1.0.4.tgz",
-      "integrity": "sha512-syTJzhFn+CaW/FAqVLJJ3Oq9pTuxS5Wk0+g9AkSKWJ8PCY+FLr7UC2mGr/5pO//L13Elz7cv/djXVxNA1ULQmw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@onflow/util-template/-/util-template-1.1.0.tgz",
+      "integrity": "sha512-gGqJJH5OTPPRmHk6YxMw4t5Ecy7iHnj00ZlCE7lnlOnpGUNdHrNNfoeE//hO8TBGNNVpOkEQERWiLDph+/oIxg==",
       "dependencies": {
         "@babel/runtime": "^7.18.6"
       }
     },
     "node_modules/@onflow/util-uid": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@onflow/util-uid/-/util-uid-1.0.3.tgz",
-      "integrity": "sha512-hBdfV+0BSDphcvLvL8KFivyV5ZhpVyRcrOn0fuSD4is/hN5d1mLFBev9gur9gdmQUUwgFt0v+aA/Tc/7mRDctQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@onflow/util-uid/-/util-uid-1.1.0.tgz",
+      "integrity": "sha512-HmWfKCOXoz1/TIu7fRx6iR7Nfhq6q5Tmn4YWc868SIfFeWv/inpvVJyrKX0nORf87csSnRSqdDzrJGBowgcXVA==",
       "dependencies": {
         "@babel/runtime": "^7.18.6"
       }
@@ -6586,7 +6538,6 @@
       "version": "8.8.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
       "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-      "devOptional": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -6617,7 +6568,6 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
@@ -6672,7 +6622,6 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -7563,7 +7512,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "devOptional": true,
       "engines": {
         "node": ">=6"
       }
@@ -7880,6 +7828,14 @@
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
+    "node_modules/comment-parser": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.1.tgz",
+      "integrity": "sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==",
+      "engines": {
+        "node": ">= 12.0.0"
+      }
+    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -8009,56 +7965,17 @@
       "peer": true
     },
     "node_modules/cross-fetch": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
-      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
+      "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
       "dependencies": {
-        "node-fetch": "2.6.7"
-      }
-    },
-    "node_modules/cross-fetch/node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/cross-fetch/node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
-    "node_modules/cross-fetch/node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "node_modules/cross-fetch/node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
+        "node-fetch": "^2.6.12"
       }
     },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
       "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "devOptional": true,
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -8253,8 +8170,7 @@
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
     "node_modules/deepmerge": {
       "version": "4.2.2",
@@ -8381,7 +8297,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -8893,7 +8808,6 @@
       "version": "8.38.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.38.0.tgz",
       "integrity": "sha512-pIdsD2jwlUGf/U38Jv97t8lq6HpaU/G9NKbYmpWpZGw3LdTNhZLbJePqxOXGB5+JEKfOPU/XLxYxFh03nr1KTg==",
-      "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
@@ -8958,6 +8872,67 @@
         "eslint": ">=7.0.0"
       }
     },
+    "node_modules/eslint-plugin-jsdoc": {
+      "version": "40.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-40.3.0.tgz",
+      "integrity": "sha512-EhCqpzRkxoT2DUB4AnrU0ggBYvTh3bWrLZzQTupq6vSVE6XzNwJVKsOHa41GCoevnsWMBNmoDVjXWGqckjuG1g==",
+      "dependencies": {
+        "@es-joy/jsdoccomment": "~0.37.0",
+        "comment-parser": "1.3.1",
+        "debug": "^4.3.4",
+        "escape-string-regexp": "^4.0.0",
+        "esquery": "^1.5.0",
+        "semver": "^7.3.8",
+        "spdx-expression-parse": "^3.0.1"
+      },
+      "engines": {
+        "node": "^14 || ^16 || ^17 || ^18 || ^19"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
     "node_modules/eslint-scope": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
@@ -9002,7 +8977,6 @@
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
       "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
-      "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -9014,7 +8988,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -9028,14 +9001,12 @@
     "node_modules/eslint/node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "node_modules/eslint/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -9051,7 +9022,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -9062,14 +9032,12 @@
     "node_modules/eslint/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/eslint/node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -9081,7 +9049,6 @@
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
       "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-      "dev": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
@@ -9094,7 +9061,6 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -9103,7 +9069,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
       "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
       "dependencies": {
         "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
@@ -9119,7 +9084,6 @@
       "version": "13.19.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
       "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
-      "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -9134,7 +9098,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -9143,7 +9106,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
       "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -9155,7 +9117,6 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
       "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
       "dependencies": {
         "p-locate": "^5.0.0"
       },
@@ -9170,7 +9131,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
       "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
       "dependencies": {
         "p-limit": "^3.0.2"
       },
@@ -9185,7 +9145,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -9197,7 +9156,6 @@
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -9209,7 +9167,6 @@
       "version": "9.5.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz",
       "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==",
-      "dev": true,
       "dependencies": {
         "acorn": "^8.8.0",
         "acorn-jsx": "^5.3.2",
@@ -9239,7 +9196,6 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
       "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
-      "dev": true,
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -9251,7 +9207,6 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -9260,7 +9215,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -9272,7 +9226,6 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -9290,7 +9243,6 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9366,48 +9318,6 @@
         "safe-event-emitter": "^1.0.1"
       }
     },
-    "node_modules/eth-json-rpc-infura/node_modules/node-fetch": {
-      "version": "2.6.10",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.10.tgz",
-      "integrity": "sha512-5YytjUVbwzjE/BX4N62vnPPkGNxlJPwdA9/ArUc4pcM6cYS4Hinuv4VazzwjMGgnWuiQqcemOanib/5PpcsGug==",
-      "dev": true,
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eth-json-rpc-infura/node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "dev": true
-    },
-    "node_modules/eth-json-rpc-infura/node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "dev": true
-    },
-    "node_modules/eth-json-rpc-infura/node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dev": true,
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
     "node_modules/eth-json-rpc-middleware": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/eth-json-rpc-middleware/-/eth-json-rpc-middleware-6.0.0.tgz",
@@ -9467,48 +9377,6 @@
         "safe-event-emitter": "^1.0.1"
       }
     },
-    "node_modules/eth-json-rpc-middleware/node_modules/node-fetch": {
-      "version": "2.6.10",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.10.tgz",
-      "integrity": "sha512-5YytjUVbwzjE/BX4N62vnPPkGNxlJPwdA9/ArUc4pcM6cYS4Hinuv4VazzwjMGgnWuiQqcemOanib/5PpcsGug==",
-      "dev": true,
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eth-json-rpc-middleware/node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "dev": true
-    },
-    "node_modules/eth-json-rpc-middleware/node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "dev": true
-    },
-    "node_modules/eth-json-rpc-middleware/node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dev": true,
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
     "node_modules/eth-lib": {
       "version": "0.2.8",
       "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.2.8.tgz",
@@ -10094,14 +9962,12 @@
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "devOptional": true
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
     },
     "node_modules/fast-redact": {
       "version": "3.1.2",
@@ -10129,7 +9995,6 @@
       "version": "1.15.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
       "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
-      "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -10147,7 +10012,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
       "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
       "dependencies": {
         "flat-cache": "^3.0.4"
       },
@@ -10252,7 +10116,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
       "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
       "dependencies": {
         "flatted": "^3.1.0",
         "rimraf": "^3.0.2"
@@ -10264,8 +10127,7 @@
     "node_modules/flatted": {
       "version": "3.2.7",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
-      "dev": true
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
     },
     "node_modules/follow-redirects": {
       "version": "1.15.2",
@@ -10474,7 +10336,6 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -10559,8 +10420,7 @@
     "node_modules/grapheme-splitter": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-      "dev": true
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
     },
     "node_modules/har-schema": {
       "version": "2.0.0",
@@ -11099,7 +10959,6 @@
       "version": "5.2.4",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
       "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
-      "dev": true,
       "engines": {
         "node": ">= 4"
       }
@@ -11119,7 +10978,6 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -11135,7 +10993,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -11163,7 +11020,6 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "devOptional": true,
       "engines": {
         "node": ">=0.8.19"
       }
@@ -11505,7 +11361,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
       "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -13962,6 +13817,14 @@
       "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
       "dev": true
     },
+    "node_modules/jsdoc-type-pratt-parser": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz",
+      "integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -14008,8 +13871,7 @@
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
     "node_modules/json-stable-stringify": {
       "version": "1.0.2",
@@ -14026,8 +13888,7 @@
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
     },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
@@ -14375,7 +14236,6 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
       "dependencies": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -15170,8 +15030,7 @@
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "devOptional": true
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
     },
     "node_modules/natural-compare-lite": {
       "version": "1.4.0",
@@ -15200,6 +15059,25 @@
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz",
       "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA=="
     },
+    "node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/node-gyp-build": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz",
@@ -15426,7 +15304,6 @@
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
       "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
       "dependencies": {
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
@@ -15525,7 +15402,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -15772,7 +15648,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "devOptional": true,
       "engines": {
         "node": ">=8"
       }
@@ -16026,7 +15901,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -16161,7 +16035,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
       "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -16787,7 +16660,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
@@ -16797,7 +16669,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "devOptional": true,
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -16832,7 +16703,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
       "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -17080,7 +16950,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "devOptional": true,
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -17092,7 +16961,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "devOptional": true,
       "engines": {
         "node": ">=8"
       }
@@ -17293,6 +17161,25 @@
         "source-map": "^0.6.0"
       }
     },
+    "node_modules/spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz",
+      "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w=="
+    },
     "node_modules/split-on-first": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
@@ -17865,8 +17752,7 @@
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
     },
     "node_modules/thread-stream": {
       "version": "0.15.2",
@@ -18294,6 +18180,11 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
     "node_modules/ts-command-line-args": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/ts-command-line-args/-/ts-command-line-args-2.5.0.tgz",
@@ -18695,7 +18586,6 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
       "dependencies": {
         "prelude-ls": "^1.2.1"
       },
@@ -18977,7 +18867,6 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -19350,26 +19239,6 @@
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
       "dev": true
     },
-    "node_modules/web3-provider-engine/node_modules/node-fetch": {
-      "version": "2.6.10",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.10.tgz",
-      "integrity": "sha512-5YytjUVbwzjE/BX4N62vnPPkGNxlJPwdA9/ArUc4pcM6cYS4Hinuv4VazzwjMGgnWuiQqcemOanib/5PpcsGug==",
-      "dev": true,
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/web3-provider-engine/node_modules/readable-stream": {
       "version": "2.3.7",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -19394,28 +19263,6 @@
         "safe-buffer": "~5.1.0"
       }
     },
-    "node_modules/web3-provider-engine/node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "dev": true
-    },
-    "node_modules/web3-provider-engine/node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "dev": true
-    },
-    "node_modules/web3-provider-engine/node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dev": true,
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
     "node_modules/web3-provider-engine/node_modules/ws": {
       "version": "5.2.3",
       "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz",
@@ -19697,11 +19544,24 @@
         "node": ">=12"
       }
     },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/whatwg-url/node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "devOptional": true,
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -19761,7 +19621,6 @@
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
       "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -21299,11 +21158,20 @@
       "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
       "dev": true
     },
+    "@es-joy/jsdoccomment": {
+      "version": "0.37.1",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.37.1.tgz",
+      "integrity": "sha512-5vxWJ1gEkEF0yRd0O+uK6dHJf7adrxwQSX8PuRiPfFSAbNLnY0ZJfXaZucoz14Jj2N11xn2DnlEPwWRpYpvRjg==",
+      "requires": {
+        "comment-parser": "1.3.1",
+        "esquery": "^1.5.0",
+        "jsdoc-type-pratt-parser": "~4.0.0"
+      }
+    },
     "@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
       "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-      "dev": true,
       "requires": {
         "eslint-visitor-keys": "^3.3.0"
       }
@@ -21311,14 +21179,12 @@
     "@eslint-community/regexpp": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.0.tgz",
-      "integrity": "sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==",
-      "dev": true
+      "integrity": "sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ=="
     },
     "@eslint/eslintrc": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz",
       "integrity": "sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==",
-      "dev": true,
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
@@ -21334,14 +21200,12 @@
         "argparse": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "dev": true
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
         },
         "globals": {
           "version": "13.20.0",
           "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
           "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
-          "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
           }
@@ -21350,7 +21214,6 @@
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
           "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "dev": true,
           "requires": {
             "argparse": "^2.0.1"
           }
@@ -21358,16 +21221,14 @@
         "type-fest": {
           "version": "0.20.2",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-          "dev": true
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
         }
       }
     },
     "@eslint/js": {
       "version": "8.38.0",
       "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.38.0.tgz",
-      "integrity": "sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g==",
-      "dev": true
+      "integrity": "sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g=="
     },
     "@ethereum-attestation-service/eas-contracts": {
       "version": "0.27.1",
@@ -21850,7 +21711,6 @@
       "version": "0.11.8",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
       "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
-      "dev": true,
       "requires": {
         "@humanwhocodes/object-schema": "^1.2.1",
         "debug": "^4.1.1",
@@ -21860,14 +21720,12 @@
     "@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="
     },
     "@humanwhocodes/object-schema": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
     },
     "@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
@@ -22632,7 +22490,6 @@
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
       "requires": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -22641,14 +22498,12 @@
     "@nodelib/fs.stat": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
     },
     "@nodelib/fs.walk": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
       "requires": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -22847,61 +22702,34 @@
       "optional": true
     },
     "@onflow/config": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@onflow/config/-/config-1.0.5.tgz",
-      "integrity": "sha512-r2IUyY4SJgAY6YCzKL0cOOertHETp9BgVfCjTIq236WAHr7aMS1oNyqcVPPR++zjDK8n64lRgrxlcYSZB/LrFg==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@onflow/config/-/config-1.1.2.tgz",
+      "integrity": "sha512-Jnorp86YkGFJLpCE4ufY8wva5vW8MJxkPzLRITW+aqUDVH9FQvYuTCLHsujy/Mrr9+WgrClf6MQrA2bUCE2zEg==",
       "requires": {
         "@babel/runtime": "^7.18.6",
-        "@onflow/util-actor": "^1.1.2"
+        "@onflow/util-actor": "^1.2.0",
+        "eslint": "^8.34.0",
+        "eslint-plugin-jsdoc": "^40.0.0"
       }
     },
     "@onflow/fcl": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@onflow/fcl/-/fcl-1.3.2.tgz",
-      "integrity": "sha512-H2YduE8JUMqjUBR9R3YOFgWrT/yMg+aE5w8uwrMD3YJ/wGpF6iKo0XJGRa7kPVn5pP0HjKQnOlmCLvHwEGEhQQ==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@onflow/fcl/-/fcl-1.6.0.tgz",
+      "integrity": "sha512-ksZFzf0JRtSYDNgCJKeuOt1R39DfBs62uym+GVPW9B5ahWjShoD2D9KYHVZiDbvMX19wUmB9vkgkiUvYfYEobw==",
       "requires": {
         "@babel/runtime": "^7.18.6",
-        "@onflow/config": "^1.0.5",
+        "@onflow/config": "^1.1.2",
         "@onflow/interaction": "0.0.11",
-        "@onflow/rlp": "^1.0.2",
-        "@onflow/sdk": "^1.1.2",
-        "@onflow/types": "^1.0.5",
-        "@onflow/util-actor": "^1.1.1",
-        "@onflow/util-address": "^1.0.2",
-        "@onflow/util-invariant": "^1.0.2",
-        "@onflow/util-logger": "^1.1.1",
-        "@onflow/util-template": "^1.0.3",
-        "@onflow/util-uid": "^1.0.2",
-        "node-fetch": "^2.6.7"
-      },
-      "dependencies": {
-        "node-fetch": {
-          "version": "2.6.10",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.10.tgz",
-          "integrity": "sha512-5YytjUVbwzjE/BX4N62vnPPkGNxlJPwdA9/ArUc4pcM6cYS4Hinuv4VazzwjMGgnWuiQqcemOanib/5PpcsGug==",
-          "requires": {
-            "whatwg-url": "^5.0.0"
-          }
-        },
-        "tr46": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-          "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-        },
-        "webidl-conversions": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-          "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-        },
-        "whatwg-url": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-          "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-          "requires": {
-            "tr46": "~0.0.3",
-            "webidl-conversions": "^3.0.0"
-          }
-        }
+        "@onflow/rlp": "^1.1.0",
+        "@onflow/sdk": "^1.2.2",
+        "@onflow/types": "^1.1.0",
+        "@onflow/util-actor": "^1.2.0",
+        "@onflow/util-address": "^1.1.0",
+        "@onflow/util-invariant": "^1.1.0",
+        "@onflow/util-logger": "^1.2.2",
+        "@onflow/util-template": "^1.1.0",
+        "@onflow/util-uid": "^1.1.0",
+        "cross-fetch": "^3.1.6"
       }
     },
     "@onflow/interaction": {
@@ -22910,135 +22738,99 @@
       "integrity": "sha512-Xuq1Mmx6Wyba/F/L+QLQs0yJeQDsIDwy5SKk5vrCuVgIj0yD8k506g5L8ODrbM1LWll8i0tQsoOi0F85vNl5sA=="
     },
     "@onflow/rlp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@onflow/rlp/-/rlp-1.0.4.tgz",
-      "integrity": "sha512-/4jSoh9eXPoN9iUCsbI+PAuTRJyYgT+XR4NdZYmxILRwOtIsSd2I9XatA4rrSzk9DJ0h8l9SmYx1y0XLnD+ohQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@onflow/rlp/-/rlp-1.1.0.tgz",
+      "integrity": "sha512-JJj4dZpKaWmCOXnado+D3RU5xYAXui9kHOmCVfdLReYHIsYBgxwHCDO/hDiQjrbmfLpiybbJKTaIldu+xkCU3Q==",
       "requires": {
         "@babel/runtime": "^7.18.6",
         "buffer": "^6.0.3"
       }
     },
     "@onflow/sdk": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@onflow/sdk/-/sdk-1.1.2.tgz",
-      "integrity": "sha512-HNfQ6Q91FfFwd2g1wa/YHvmv6BYeXGONkEJyfOaoPRIbp3lG9W35HYX7Yvgtn7fvcQG+TRL8n386mzJ6Vn4dmA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@onflow/sdk/-/sdk-1.2.2.tgz",
+      "integrity": "sha512-OGwp98C7iP7KUGFoBxgnEr52hnr7vxBTCu/TI/w1giF8USPgjgQXNxJdHVauY54Yu/ruoT6XfdSMAS4PACCB/w==",
       "requires": {
         "@babel/runtime": "^7.18.6",
-        "@onflow/config": "^1.0.3",
-        "@onflow/rlp": "^1.0.2",
-        "@onflow/transport-http": "^1.5.0",
-        "@onflow/util-actor": "^1.1.1",
-        "@onflow/util-address": "^1.0.2",
-        "@onflow/util-invariant": "^1.0.2",
-        "@onflow/util-logger": "^1.1.1",
-        "@onflow/util-template": "^1.0.3",
+        "@onflow/config": "^1.1.1",
+        "@onflow/rlp": "^1.1.0",
+        "@onflow/transport-http": "^1.7.1",
+        "@onflow/util-actor": "^1.2.0",
+        "@onflow/util-address": "^1.1.0",
+        "@onflow/util-invariant": "^1.1.0",
+        "@onflow/util-logger": "^1.2.1",
+        "@onflow/util-template": "^1.1.0",
         "deepmerge": "^4.2.2",
         "sha3": "^2.1.4"
       }
     },
     "@onflow/transport-http": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@onflow/transport-http/-/transport-http-1.5.0.tgz",
-      "integrity": "sha512-CGgfPC1kI+ssqDgFXxGgKHLVtu1tCGtyGJiS/fplyVun9RC7AwEp2KkjTP2dxRlto3HmntoaBkOw7z38UCxRZw==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@onflow/transport-http/-/transport-http-1.7.1.tgz",
+      "integrity": "sha512-enSKRDf2OMIH61ltyZe5pxLB8KifdRdVpWwE0MU2S0Vq5DmNN3FfwUZVh1nrK2aJZkLdryJrNJtvv7ot2NPrYA==",
       "requires": {
         "@babel/runtime": "^7.18.6",
-        "@onflow/util-address": "^1.0.2",
-        "@onflow/util-invariant": "^1.0.2",
-        "@onflow/util-logger": "^1.1.1",
-        "@onflow/util-template": "^1.0.3",
-        "node-fetch": "^2.6.7"
-      },
-      "dependencies": {
-        "node-fetch": {
-          "version": "2.6.10",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.10.tgz",
-          "integrity": "sha512-5YytjUVbwzjE/BX4N62vnPPkGNxlJPwdA9/ArUc4pcM6cYS4Hinuv4VazzwjMGgnWuiQqcemOanib/5PpcsGug==",
-          "requires": {
-            "whatwg-url": "^5.0.0"
-          }
-        },
-        "tr46": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-          "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-        },
-        "webidl-conversions": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-          "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-        },
-        "whatwg-url": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-          "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-          "requires": {
-            "tr46": "~0.0.3",
-            "webidl-conversions": "^3.0.0"
-          }
-        }
+        "@onflow/util-address": "^1.1.0",
+        "@onflow/util-invariant": "^1.1.0",
+        "@onflow/util-logger": "^1.2.1",
+        "@onflow/util-template": "^1.1.0",
+        "abort-controller": "^3.0.0",
+        "cross-fetch": "^3.1.6"
       }
     },
     "@onflow/types": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@onflow/types/-/types-1.0.5.tgz",
-      "integrity": "sha512-Uf6APOwgkxPwgonQ8JRrOB0KZ5eJpNBVXlEiZIv5ddzsfM6qd9p3csEE5YmuLhAooAcisG3ROTzw2hT/zUNGbw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@onflow/types/-/types-1.1.0.tgz",
+      "integrity": "sha512-UUd2ZAFqdd8BHW//uTg+YRlh3EIH9Na+UYJ9qXpt6y87qjW0Lf4Zkhn6H5IqvhIJsjK17QYnXLFpoXItD/+ToQ==",
       "requires": {
         "@babel/runtime": "^7.18.6"
       }
     },
     "@onflow/util-actor": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@onflow/util-actor/-/util-actor-1.1.2.tgz",
-      "integrity": "sha512-fsRGw5c2idlG5T0u48tzah1iE0OIc4WmgrNYN0gQ1NHX+Ue8iySoQdCIcdSxJCHOXwpHWe68fWTonCzbRJOssQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@onflow/util-actor/-/util-actor-1.2.0.tgz",
+      "integrity": "sha512-voyHXE3qYNC+P75vzv55pGDDwpxxWKWH0aToR/3g9Bq8nKGcGoszxaMJkVy+fKX1akfdT0yKr/GxXRkjCS9SBg==",
       "requires": {
         "@babel/runtime": "^7.18.6",
-        "queue-microtask": "1.1.2"
-      },
-      "dependencies": {
-        "queue-microtask": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.1.2.tgz",
-          "integrity": "sha512-F9wwNePtXrzZenAB3ax0Y8TSKGvuB7Qw16J30hspEUTbfUM+H827XyN3rlpwhVmtm5wuZtbKIHjOnwDn7MUxWQ=="
-        }
+        "queue-microtask": "1.2.3"
       }
     },
     "@onflow/util-address": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@onflow/util-address/-/util-address-1.0.3.tgz",
-      "integrity": "sha512-w8DPYSvYm5h0hhZ0hZwiCwu9UgJBtIv2KyhDiH3TZG8srT+9GxtTPX4NzZtAVuxqWTNVlTGePD/Upxusiwnk6g==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@onflow/util-address/-/util-address-1.1.0.tgz",
+      "integrity": "sha512-HhJOIfNaYAoeYuTNUe85jt4fqnJhFmSbYqyufiJBrplwd3eKmNsan0NYvVYO4U1ecu3KyuY4D9R/NtjGpHjMlA==",
       "requires": {
         "@babel/runtime": "^7.18.6"
       }
     },
     "@onflow/util-invariant": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@onflow/util-invariant/-/util-invariant-1.0.3.tgz",
-      "integrity": "sha512-+Hk93W9JwACLkM5/oOILqI9L55o5QxETBV5Du/2dLgNbjXDElMmQzURFXx6fTmODTLZ6Ri+d1nvb7AxapYFe0Q==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@onflow/util-invariant/-/util-invariant-1.1.0.tgz",
+      "integrity": "sha512-5uxweKl5tqeqB1QLzs3dWWLtpNo7H4PgcmgnRIcC2oItAkELcnVCybDdlfYjKB4n/dlg3rIym8cJQE2tBeOpZQ==",
       "requires": {
         "@babel/runtime": "^7.18.6"
       }
     },
     "@onflow/util-logger": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@onflow/util-logger/-/util-logger-1.1.2.tgz",
-      "integrity": "sha512-BcVDzKNGv/j3gqnq1lc0fpJV7LCHWPJyzYR588/keiY90mFHwLe8ahXYG1UYPu02KymlVqlInfISKWlNwk4aug==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@onflow/util-logger/-/util-logger-1.2.2.tgz",
+      "integrity": "sha512-qgOZFfp4NvGuIwZ6zMPiskt/xBNo6wG+L4k/nt3v4/eVzNZeUR5OZ7XlcA0fjtr2a3W9CNt83bmFSq/11ZGgCw==",
       "requires": {
-        "@babel/runtime": "^7.18.6",
-        "@onflow/config": "^1.0.4"
+        "@babel/runtime": "^7.18.6"
       }
     },
     "@onflow/util-template": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@onflow/util-template/-/util-template-1.0.4.tgz",
-      "integrity": "sha512-syTJzhFn+CaW/FAqVLJJ3Oq9pTuxS5Wk0+g9AkSKWJ8PCY+FLr7UC2mGr/5pO//L13Elz7cv/djXVxNA1ULQmw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@onflow/util-template/-/util-template-1.1.0.tgz",
+      "integrity": "sha512-gGqJJH5OTPPRmHk6YxMw4t5Ecy7iHnj00ZlCE7lnlOnpGUNdHrNNfoeE//hO8TBGNNVpOkEQERWiLDph+/oIxg==",
       "requires": {
         "@babel/runtime": "^7.18.6"
       }
     },
     "@onflow/util-uid": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@onflow/util-uid/-/util-uid-1.0.3.tgz",
-      "integrity": "sha512-hBdfV+0BSDphcvLvL8KFivyV5ZhpVyRcrOn0fuSD4is/hN5d1mLFBev9gur9gdmQUUwgFt0v+aA/Tc/7mRDctQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@onflow/util-uid/-/util-uid-1.1.0.tgz",
+      "integrity": "sha512-HmWfKCOXoz1/TIu7fRx6iR7Nfhq6q5Tmn4YWc868SIfFeWv/inpvVJyrKX0nORf87csSnRSqdDzrJGBowgcXVA==",
       "requires": {
         "@babel/runtime": "^7.18.6"
       }
@@ -25073,8 +24865,7 @@
     "acorn": {
       "version": "8.8.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-      "devOptional": true
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA=="
     },
     "acorn-globals": {
       "version": "7.0.1",
@@ -25097,7 +24888,6 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
       "requires": {}
     },
     "acorn-walk": {
@@ -25138,7 +24928,6 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
       "requires": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -25830,8 +25619,7 @@
     "callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "devOptional": true
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
     },
     "camelcase": {
       "version": "5.3.1",
@@ -26066,6 +25854,11 @@
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
+    "comment-parser": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.1.tgz",
+      "integrity": "sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA=="
+    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -26180,47 +25973,17 @@
       "peer": true
     },
     "cross-fetch": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
-      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
+      "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
       "requires": {
-        "node-fetch": "2.6.7"
-      },
-      "dependencies": {
-        "node-fetch": {
-          "version": "2.6.7",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-          "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-          "requires": {
-            "whatwg-url": "^5.0.0"
-          }
-        },
-        "tr46": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-          "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-        },
-        "webidl-conversions": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-          "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-        },
-        "whatwg-url": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-          "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-          "requires": {
-            "tr46": "~0.0.3",
-            "webidl-conversions": "^3.0.0"
-          }
-        }
+        "node-fetch": "^2.6.12"
       }
     },
     "cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
       "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "devOptional": true,
       "requires": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -26363,8 +26126,7 @@
     "deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
     "deepmerge": {
       "version": "4.2.2",
@@ -26466,7 +26228,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
       "requires": {
         "esutils": "^2.0.2"
       }
@@ -26898,7 +26659,6 @@
       "version": "8.38.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.38.0.tgz",
       "integrity": "sha512-pIdsD2jwlUGf/U38Jv97t8lq6HpaU/G9NKbYmpWpZGw3LdTNhZLbJePqxOXGB5+JEKfOPU/XLxYxFh03nr1KTg==",
-      "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
@@ -26946,7 +26706,6 @@
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
           "requires": {
             "color-convert": "^2.0.1"
           }
@@ -26954,14 +26713,12 @@
         "argparse": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "dev": true
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
         },
         "chalk": {
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
           "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
@@ -26971,7 +26728,6 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
           "requires": {
             "color-name": "~1.1.4"
           }
@@ -26979,20 +26735,17 @@
         "color-name": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
         },
         "escape-string-regexp": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-          "dev": true
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
         },
         "eslint-scope": {
           "version": "7.1.1",
           "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
           "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-          "dev": true,
           "requires": {
             "esrecurse": "^4.3.0",
             "estraverse": "^5.2.0"
@@ -27001,14 +26754,12 @@
         "estraverse": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
         },
         "find-up": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
           "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-          "dev": true,
           "requires": {
             "locate-path": "^6.0.0",
             "path-exists": "^4.0.0"
@@ -27018,7 +26769,6 @@
           "version": "13.19.0",
           "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
           "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
-          "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
           }
@@ -27026,14 +26776,12 @@
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "js-yaml": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
           "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "dev": true,
           "requires": {
             "argparse": "^2.0.1"
           }
@@ -27042,7 +26790,6 @@
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
           "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-          "dev": true,
           "requires": {
             "p-locate": "^5.0.0"
           }
@@ -27051,7 +26798,6 @@
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
           "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-          "dev": true,
           "requires": {
             "p-limit": "^3.0.2"
           }
@@ -27060,7 +26806,6 @@
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
@@ -27068,8 +26813,7 @@
         "type-fest": {
           "version": "0.20.2",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-          "dev": true
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
         }
       }
     },
@@ -27080,6 +26824,48 @@
       "dev": true,
       "requires": {}
     },
+    "eslint-plugin-jsdoc": {
+      "version": "40.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-40.3.0.tgz",
+      "integrity": "sha512-EhCqpzRkxoT2DUB4AnrU0ggBYvTh3bWrLZzQTupq6vSVE6XzNwJVKsOHa41GCoevnsWMBNmoDVjXWGqckjuG1g==",
+      "requires": {
+        "@es-joy/jsdoccomment": "~0.37.0",
+        "comment-parser": "1.3.1",
+        "debug": "^4.3.4",
+        "escape-string-regexp": "^4.0.0",
+        "esquery": "^1.5.0",
+        "semver": "^7.3.8",
+        "spdx-expression-parse": "^3.0.1"
+      },
+      "dependencies": {
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+        }
+      }
+    },
     "eslint-scope": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
@@ -27110,14 +26896,12 @@
     "eslint-visitor-keys": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
-      "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
-      "dev": true
+      "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ=="
     },
     "espree": {
       "version": "9.5.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz",
       "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==",
-      "dev": true,
       "requires": {
         "acorn": "^8.8.0",
         "acorn-jsx": "^5.3.2",
@@ -27134,7 +26918,6 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
       "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
-      "dev": true,
       "requires": {
         "estraverse": "^5.1.0"
       },
@@ -27142,8 +26925,7 @@
         "estraverse": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
         }
       }
     },
@@ -27151,7 +26933,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
       "requires": {
         "estraverse": "^5.2.0"
       },
@@ -27159,8 +26940,7 @@
         "estraverse": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
         }
       }
     },
@@ -27173,8 +26953,7 @@
     "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
     },
     "eth-block-tracker": {
       "version": "4.4.3",
@@ -27242,37 +27021,6 @@
             "eth-rpc-errors": "^3.0.0",
             "safe-event-emitter": "^1.0.1"
           }
-        },
-        "node-fetch": {
-          "version": "2.6.10",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.10.tgz",
-          "integrity": "sha512-5YytjUVbwzjE/BX4N62vnPPkGNxlJPwdA9/ArUc4pcM6cYS4Hinuv4VazzwjMGgnWuiQqcemOanib/5PpcsGug==",
-          "dev": true,
-          "requires": {
-            "whatwg-url": "^5.0.0"
-          }
-        },
-        "tr46": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-          "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-          "dev": true
-        },
-        "webidl-conversions": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-          "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-          "dev": true
-        },
-        "whatwg-url": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-          "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-          "dev": true,
-          "requires": {
-            "tr46": "~0.0.3",
-            "webidl-conversions": "^3.0.0"
-          }
         }
       }
     },
@@ -27334,37 +27082,6 @@
             "eth-rpc-errors": "^3.0.0",
             "safe-event-emitter": "^1.0.1"
           }
-        },
-        "node-fetch": {
-          "version": "2.6.10",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.10.tgz",
-          "integrity": "sha512-5YytjUVbwzjE/BX4N62vnPPkGNxlJPwdA9/ArUc4pcM6cYS4Hinuv4VazzwjMGgnWuiQqcemOanib/5PpcsGug==",
-          "dev": true,
-          "requires": {
-            "whatwg-url": "^5.0.0"
-          }
-        },
-        "tr46": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-          "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-          "dev": true
-        },
-        "webidl-conversions": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-          "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-          "dev": true
-        },
-        "whatwg-url": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-          "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-          "dev": true,
-          "requires": {
-            "tr46": "~0.0.3",
-            "webidl-conversions": "^3.0.0"
-          }
         }
       }
     },
@@ -27920,14 +27637,12 @@
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "devOptional": true
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
     },
     "fast-redact": {
       "version": "3.1.2",
@@ -27949,7 +27664,6 @@
       "version": "1.15.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
       "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
-      "dev": true,
       "requires": {
         "reusify": "^1.0.4"
       }
@@ -27967,7 +27681,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
       "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
       "requires": {
         "flat-cache": "^3.0.4"
       }
@@ -28043,7 +27756,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
       "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
       "requires": {
         "flatted": "^3.1.0",
         "rimraf": "^3.0.2"
@@ -28052,8 +27764,7 @@
     "flatted": {
       "version": "3.2.7",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
-      "dev": true
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
     },
     "follow-redirects": {
       "version": "1.15.2",
@@ -28200,7 +27911,6 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
       "requires": {
         "is-glob": "^4.0.3"
       }
@@ -28264,8 +27974,7 @@
     "grapheme-splitter": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-      "dev": true
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
     },
     "har-schema": {
       "version": "2.0.0",
@@ -28643,8 +28352,7 @@
     "ignore": {
       "version": "5.2.4",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
-      "dev": true
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="
     },
     "immediate": {
       "version": "3.3.0",
@@ -28661,7 +28369,6 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
       "requires": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -28670,8 +28377,7 @@
         "resolve-from": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-          "dev": true
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
         }
       }
     },
@@ -28688,8 +28394,7 @@
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "devOptional": true
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
     },
     "indent-string": {
       "version": "4.0.0",
@@ -28909,8 +28614,7 @@
     "is-path-inside": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
     },
     "is-plain-obj": {
       "version": "2.1.0",
@@ -30735,6 +30439,11 @@
       "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
       "dev": true
     },
+    "jsdoc-type-pratt-parser": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz",
+      "integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ=="
+    },
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -30772,8 +30481,7 @@
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
     "json-stable-stringify": {
       "version": "1.0.2",
@@ -30787,8 +30495,7 @@
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
     },
     "json-stringify-safe": {
       "version": "5.0.1",
@@ -31085,7 +30792,6 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
       "requires": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -31717,8 +31423,7 @@
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "devOptional": true
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
     },
     "natural-compare-lite": {
       "version": "1.4.0",
@@ -31747,6 +31452,14 @@
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz",
       "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA=="
     },
+    "node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      }
+    },
     "node-gyp-build": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz",
@@ -31926,7 +31639,6 @@
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
       "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
       "requires": {
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
@@ -31997,7 +31709,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
       "requires": {
         "callsites": "^3.0.0"
       }
@@ -32175,8 +31886,7 @@
     "path-key": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "devOptional": true
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
     },
     "path-parse": {
       "version": "1.0.7",
@@ -32353,8 +32063,7 @@
     "prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
     },
     "prettier": {
       "version": "3.0.0",
@@ -32462,8 +32171,7 @@
     "punycode": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
-      "dev": true
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
     },
     "pvtsutils": {
       "version": "1.3.2",
@@ -32934,14 +32642,12 @@
     "reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
     },
     "rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "devOptional": true,
       "requires": {
         "glob": "^7.1.3"
       }
@@ -32967,7 +32673,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
       "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
       "requires": {
         "queue-microtask": "^1.2.2"
       }
@@ -33145,7 +32850,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "devOptional": true,
       "requires": {
         "shebang-regex": "^3.0.0"
       }
@@ -33153,8 +32857,7 @@
     "shebang-regex": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "devOptional": true
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
     },
     "shelljs": {
       "version": "0.8.5",
@@ -33304,6 +33007,25 @@
         "source-map": "^0.6.0"
       }
     },
+    "spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz",
+      "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w=="
+    },
     "split-on-first": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
@@ -33718,8 +33440,7 @@
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
     },
     "thread-stream": {
       "version": "0.15.2",
@@ -34065,6 +33786,11 @@
         }
       }
     },
+    "tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
     "ts-command-line-args": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/ts-command-line-args/-/ts-command-line-args-2.5.0.tgz",
@@ -34343,7 +34069,6 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
       "requires": {
         "prelude-ls": "^1.2.1"
       }
@@ -34532,7 +34257,6 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -34863,15 +34587,6 @@
           "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
           "dev": true
         },
-        "node-fetch": {
-          "version": "2.6.10",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.10.tgz",
-          "integrity": "sha512-5YytjUVbwzjE/BX4N62vnPPkGNxlJPwdA9/ArUc4pcM6cYS4Hinuv4VazzwjMGgnWuiQqcemOanib/5PpcsGug==",
-          "dev": true,
-          "requires": {
-            "whatwg-url": "^5.0.0"
-          }
-        },
         "readable-stream": {
           "version": "2.3.7",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -34896,28 +34611,6 @@
             "safe-buffer": "~5.1.0"
           }
         },
-        "tr46": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-          "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-          "dev": true
-        },
-        "webidl-conversions": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-          "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-          "dev": true
-        },
-        "whatwg-url": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-          "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-          "dev": true,
-          "requires": {
-            "tr46": "~0.0.3",
-            "webidl-conversions": "^3.0.0"
-          }
-        },
         "ws": {
           "version": "5.2.3",
           "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz",
@@ -35126,11 +34819,26 @@
       "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
       "dev": true
     },
+    "whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "requires": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      },
+      "dependencies": {
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+          "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+        }
+      }
+    },
     "which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "devOptional": true,
       "requires": {
         "isexe": "^2.0.0"
       }
@@ -35174,8 +34882,7 @@
     "word-wrap": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
-      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
-      "dev": true
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="
     },
     "wordwrapjs": {
       "version": "4.0.1",

From 13a2eb65122cede2806eb47874b10650f6df3c0a Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Mon, 11 Sep 2023 14:58:47 +1000
Subject: [PATCH 30/46] apply promise to sync applied check

---
 src/client/auth/signedUNChallenge.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/client/auth/signedUNChallenge.ts b/src/client/auth/signedUNChallenge.ts
index bd4867d2..f80e60fa 100644
--- a/src/client/auth/signedUNChallenge.ts
+++ b/src/client/auth/signedUNChallenge.ts
@@ -27,7 +27,8 @@ export class SignedUNChallenge extends AbstractAuthentication implements Authent
 		if (currentProof) {
 			let unChallenge = currentProof?.data as UNInterface
 
-			if (unChallenge.expiration < Date.now() || !UN.verifySignature(unChallenge)) {
+			const isVerified = await UN.verifySignature(unChallenge);
+			if (unChallenge.expiration < Date.now() || isVerified) {
 				this.deleteProof(address)
 				currentProof = null
 			}

From d869dd26e99aece62aacb6137ee8f4b1f0a7cda7 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Mon, 11 Sep 2023 15:17:08 +1000
Subject: [PATCH 31/46] apply promise to sync applied check

---
 index.html | 247 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 247 insertions(+)

diff --git a/index.html b/index.html
index 22b57b7c..62041080 100644
--- a/index.html
+++ b/index.html
@@ -46,6 +46,253 @@
               },
             },
           },
+          {
+            hideToggle: true,
+            noTokenMsg:
+              "<p>If you hold a Devcon ticket, please visit your magicLink email again and open the link in this browser.</p><p>You may reload this page after and try again.</p>",
+            onChain: false,
+            tokenName: "devcon6",
+            collectionID: "devcon6",
+            title: "Devcon VI Ticket Attestation",
+            image: "https://devcon-vi.attest.tickets/img/nft_bg.png",
+            tokenOrigin: "https://devcon-vi.attest.tickets/outlet.html",
+            attestationOrigin: "https://test.attestation.id/",
+            tokenUrlName: "ticket",
+            cryptoVerify: "https://form.smarttokenlabs.com",
+            tokenSecretName: "secret",
+            tokenIdName: "mail",
+            unsignedTokenDataName: "ticket",
+            whitelistDialogRenderer: (permissionTxt, acceptBtn, denyBtn) => {
+              return `
+		<div class="tn-auth-box">
+			<div class="tn-auth-heading">
+				<img alt="devcon" src="img/FB_OG_Image.svg" style="width: 150px;" />
+			</div>
+			<div class="tn-auth-content">
+				<p>${permissionTxt}</p>
+				${acceptBtn}
+				${denyBtn}
+			</div>
+		</div>
+	`;
+            },
+            signedTokenWhitelist: [
+              "https://devcon-vi.attest.tickets/",
+              "https://dev.loc",
+              "https://devconnect.loc/",
+              "https://devconnect.antopolbus.rv.ua/",
+              "https://perks.antopolbus.rv.ua/",
+              "https://stage-perks.smarttokenlabs.com/",
+              "http://localhost:5000/",
+
+              "https://hashkey.smarttokenlabs.com/",
+              "https://fayre-devcon.webflow.io/",
+              "https://fenbushi-devcon.webflow.io/",
+              "https://metasearch-devcon.webflow.io/",
+              "https://conspicuis-devcon.webflow.io/",
+              "https://devcon-vi.brandextender.io/",
+              "https://www.edcon.io/",
+            ],
+            itemStorageKey: "devconnectTokens",
+            base64senderPublicKeys: {
+              4: "MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAEAGJAHCiHbrCNAY9fAMdom4dGD6v/KkTIgRCkwLCjXFTkXWGrCEXHaZ8kWwdqlu0oYCrNQ2vdlqOl0s26/LzO8A==|MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAE-N-jGYo1OuO77XItd3zT-oIhZEVC44uqOhtJkmBsBNDTp3Seu_vmuLB-b4whNeFNBuJTsT7AHUiUe3JOwCcegA==",
+            },
+            base64attestorPubKey:
+              "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
+          },
+          {
+            collectionID: "devcon",
+            onChain: false,
+            title: "Devcon",
+            tokenIdName: "id",
+            image:
+              "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg",
+            tokenOrigin: "http://localhost:3002/",
+            attestationOrigin: "https://test.attestation.id/",
+            base64senderPublicKeys: {
+              6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
+              55: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
+            },
+            base64attestorPubKey:
+              "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
+            ticketIssuersUrlWebsitePrivateKey:
+              "MIICSwIBADCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBBIIBVTCCAVECAQEEIM/T+SzcXcdtcNIqo6ck0nJTYzKL5ywYBFNSpI7R8AuBoIHjMIHgAgEBMCwGByqGSM49AQECIQD////////////////////////////////////+///8LzBEBCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcEQQR5vmZ++dy7rFWgYpXOhwsHApv82y3OKNlZ8oFbFvgXmEg62ncmo8RlXaT7/A4RCKj9F7RIpoVUGZxH0I/7ENS4AiEA/////////////////////rqu3OavSKA7v9JejNA2QUECAQGhRANCAARjMR62qoIK9pHk17MyHHIU42Ix+Vl6Q2gTmIF72vNpinBpyoBkTkV0pnI1jdrLlAjJC0I91DZWQhVhddMCK65c",
+          },
+          // {
+          //   collectionID: "devcon",
+          //   onChain: false,
+          //   title: "Devcon",
+          //   image:
+          //     "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg",
+          //   tokenOrigin: "http://localhost:3002/",
+          //   attestationOrigin: "https://test.attestation.id/",
+          //   base64senderPublicKeys: {
+          //     6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
+          //   },
+          //   base64attestorPubKey:
+          //     "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
+          //   ticketIssuersUrlWebsitePrivateKey:
+          //     "MIICSwIBADCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBBIIBVTCCAVECAQEEIM/T+SzcXcdtcNIqo6ck0nJTYzKL5ywYBFNSpI7R8AuBoIHjMIHgAgEBMCwGByqGSM49AQECIQD////////////////////////////////////+///8LzBEBCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcEQQR5vmZ++dy7rFWgYpXOhwsHApv82y3OKNlZ8oFbFvgXmEg62ncmo8RlXaT7/A4RCKj9F7RIpoVUGZxH0I/7ENS4AiEA/////////////////////rqu3OavSKA7v9JejNA2QUECAQGhRANCAARjMR62qoIK9pHk17MyHHIU42Ix+Vl6Q2gTmIF72vNpinBpyoBkTkV0pnI1jdrLlAjJC0I91DZWQhVhddMCK65c",
+          // },
+          // {
+          //   collectionID: "edcon",
+          //   onChain: false,
+          //   title: "Edcon",
+          //   image:
+          //     "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRMSMZD26jgBM_da7b_0NfT7JZgyDk7rdk6o4iAVh4E12dV9LK-h0thJ_SdRWWptz1EYlk&usqp=CAU",
+          //   tokenOrigin: "http://localhost:3002/",
+          //   attestationOrigin: "https://test.attestation.id/",
+          //   base64senderPublicKeys: {
+          //     6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABAjUvEi8UYyC+0rSFu+IwRBos/DEC6YMJV+eCnoYOC4nZU7uayKDJmBxVnmTOSwaM4+gufLbeqqxuovyF5gI3TQ=",
+          //   },
+          //   base64attestorPubKey:
+          //     "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
+          // },
+          // {
+          //   collectionID: "devconnect",
+          //   onChain: false,
+          //   title: "Devconnect",
+          //   image:
+          //     "https://pbs.twimg.com/profile_images/1653427962350370816/GiJ0Wh-h_400x400.jpg",
+          //   tokenOrigin: "http://localhost:3002/",
+          //   attestationOrigin: "https://test.attestation.id/",
+          //   base64senderPublicKeys: {
+          //     7: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABAjUvEi8UYyC+0rSFu+IwRBos/DEC6YMJV+eCnoYOC4nZU7uayKDJmBxVnmTOSwaM4+gufLbeqqxuovyF5gI3TQ=",
+          //   },
+          //   base64attestorPubKey:
+          //     "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
+          // },
+          // {
+          // hideToggle : false,
+          // noTokenMsg: "<p>If you have a token please:</p><p>1. Open your magic link inside this browser.<br/>2. Refresh this page.</p>",
+          // collectionID: 'devcon',
+          // title: "Devcon",
+          // onChain: false,
+          // tokenOrigin: "http://localhost:3002/",
+          // attestationOrigin: "https://attestation.id/",
+          // unEndPoint: "https://crypto-verify.herokuapp.com/use-devcon-ticket",
+          // image: "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg",
+          // base64senderPublicKeys:
+          //     {
+          //         "AttestationDAO" : 'MFYwEAYHKoZIzj0CAQYFK...'
+          //     },
+          // base64attestorPubKey: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ="
+          // },
+          // {
+          //   collectionID: "crypto-cowboy-country",
+          //   tokenProgram: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
+          //   collectionAddress:
+          //     "bf0aae3dd0078a9feb975f1e3242ddcb7774d551c7fd2a3f07a89c827ed606b2",
+          //   updateAuthority: "CCCUzWanUNegjGby11DjujDvPaNN68jd9Rimwk2MZzqZ",
+          //   onChain: true,
+          //   symbol: "CCC",
+          //   chain: "mainnet",
+          //   blockchain: "solana",
+          // },
+          // {
+          //   collectionID: "penthouse-panther-club",
+          //   collectionAddress: "ff846ef2eed57e5367cf8826e63f4d53fe28d28aa67417accb6e4b48cbd19136",
+          //   updateAuthority: "92oYPmrr1BHznizuZmpKZ3MFRadMFYRTCxo9Pf34mZKX",
+          //   tokenProgram: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
+          //   onChain: true,
+          //   symbol: "PPC",
+          //   chain: "mainnet",
+          //   blockchain: "solana",
+          // },
+          // {
+          //   hideToggle : false,
+          //   collectionID: "pixel",
+          //   collectionAddress: "166424b16c4c7f40eb852f9eb2d0d6869a9ed7ac54a8e6afbd516676bfbbeb19",
+          //   onChain: true,
+          //   symbol: "PIXEL",
+          //   chain: "mainnet",
+          //   blockchain: "solana",
+          // },
+          {
+            onChain: true,
+            collectionID: "expansion-punks",
+            contract: "0x0d0167a823c6619d430b1a96ad85b888bcf97c37",
+            chain: "eth",
+            blockchain: "evm",
+          },
+          {
+            onChain: true,
+            collectionID: "fantom-collection-test",
+            contract: "0x94e22c14118353651636f9af43cd0a5a08b93da3",
+            chain: "fantom",
+            blockchain: "evm",
+          },
+          {
+            hideToggle: true,
+            noTokenMsg:
+              "<p>If you have a token please:</p><p>1. Open your magic link inside this browser.<br/>2. Refresh this page.</p>",
+            onChain: true,
+            collectionID: "bsc-collection-test",
+            contract: "0xF5db804101d8600c26598A1Ba465166c33CdAA4b",
+            chain: "bsc",
+            blockchain: "evm",
+          },
+          // {
+          //   onChain: true,
+          //   collectionID: "tt",
+          //   contract: '0x76be3b62873462d2142405439777e971754e8e77',
+          //   chain: 'eth',
+          //   blockchain: "evm",
+          // },
+          // { onChain: true, collectionID: "Perion", contract: '0x96af92ae2d822a0f191455ceca4d4e7ee227668e', chain: 'mumbai', blockchain: "evm" },
+          // { collectionID: 'COOLCATS-#2426-14', onChain: true, contract: '0x3C7e352481F4b2fdEc1e642a3f0018661c77513D', chain: 'eth', openSeaSlug: 'devcon-vi-suit-up-collection' },
+          // { collectionID: 'Town-Hall', onChain: true, contract: '0x81b30ff521D1fEB67EDE32db726D95714eb00637', chain: 'Optimism' },
+          // {
+          //   collectionID: "Blusteak Kangaroo #64",
+          //   onChain: true,
+          //   contract: "0xa996F7F3BC647EebC98C684aB0A302c9b85d2FA1",
+          //   chain: "Avalanche",
+          // },
+          // {
+          //   collectionID: "Alone Pirate",
+          //   onChain: true,
+          //   contract: "0x36535ec384B94342558e37282527b5052587af6A",
+          //   chain: "Arbitrum",
+          // },
+          // {
+          // 	collectionID: "NBA",
+          // 	onChain: true,
+          // 	contract: "A.0b2a3299cc857e29.TopShot",
+          // 	chain: "mainnet",
+          // 	blockchain: "flow",
+          // },
+          // {
+          //   onChain: true,
+          //   erc: 20,
+          //   fungible: true,
+          //   collectionID: "polygon",
+          //   contract: '0x52459834ca561cb55411699e9c2143683bcf865f',
+          //   chain: 'matic',
+          //   blockchain: "evm",
+          //   // Add fungible as a boolean
+          //   // symbol: 'USX'
+          // },
+          // {
+          //   contract: "0x107065a122f92636a1358a70a0efe0f1a080a7e5",
+          //   onChain: true,
+          //   fungible: true,
+          //   collectionID: "USX",
+          //   chain: "matic",
+          // },
+          // {
+          //   contract: "0x429f49faec3d568ef83ec803e02df78e25d5ee7d",
+          //   onChain: true,
+          //   fungible: true,
+          //   collectionID: "Ella",
+          //   chain: "matic",
+          // },
+          // {
+          //   contract: "0xaaa5b9e6c589642f98a1cda99b9d024b8407285a",
+          //   onChain: true,
+          //   fungible: true,
+          //   collectionID: "TITAN",
+          //   chain: "matic",
+          // },
         ],
         uiOptions: {
           openingHeading:

From 9811c6f64acf948ae92fb74bac3184b5467a89d1 Mon Sep 17 00:00:00 2001
From: Oleh Hryb <oleg.grib.ua@gmail.com>
Date: Mon, 11 Sep 2023 18:24:32 +0100
Subject: [PATCH 32/46] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20code=20fixed=20and?=
 =?UTF-8?q?=20works=20great?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/auth/signedUNChallenge.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/client/auth/signedUNChallenge.ts b/src/client/auth/signedUNChallenge.ts
index f80e60fa..37cc4195 100644
--- a/src/client/auth/signedUNChallenge.ts
+++ b/src/client/auth/signedUNChallenge.ts
@@ -28,11 +28,13 @@ export class SignedUNChallenge extends AbstractAuthentication implements Authent
 			let unChallenge = currentProof?.data as UNInterface
 
 			const isVerified = await UN.verifySignature(unChallenge);
-			if (unChallenge.expiration < Date.now() || isVerified) {
+			if (unChallenge.expiration < Date.now() || !isVerified) {
 				this.deleteProof(address)
 				currentProof = null
 			}
-		} else {
+		}
+
+		if (!currentProof){
 			let walletConnection = connection.provider
 
 			currentProof = {

From 14bc3bf37f732d8e7b8efd31b49fa038ec16ba37 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Tue, 12 Sep 2023 12:11:01 +1000
Subject: [PATCH 33/46] defaul to re-direct mode

---
 package.json                        | 3 ++-
 src/utils/support/getBrowserData.ts | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index c916ad34..3472a255 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tokenscript/token-negotiator",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "description": "Token-negotiator a token attestation bridge between web 2.0 and 3.0.",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,6 +8,7 @@
     "dist/",
     "README.md",
     "CHANGELOG.md",
+    "CONTRIBUTING.md",
     "LICENSE"
   ],
   "scripts": {
diff --git a/src/utils/support/getBrowserData.ts b/src/utils/support/getBrowserData.ts
index a0bf08b0..d4d2a0de 100644
--- a/src/utils/support/getBrowserData.ts
+++ b/src/utils/support/getBrowserData.ts
@@ -117,14 +117,12 @@ export function browserBlocksIframeStorage(): boolean {
 }
 
 export function shouldUseRedirectMode(redirectConfig?: 'always' | 'never') {
-	let browserData = getBrowserData()
-
 	switch (redirectConfig) {
 		case 'always':
 			return true
 		case 'never':
 			return false
 		default:
-			return isBrave() || browserData.fireFox || (browserData.iOS && !isSafari())
+			return true;
 	}
 }

From 64940371c618230046adc1df1e2a9d670efa9bad Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Tue, 12 Sep 2023 16:08:33 +1000
Subject: [PATCH 34/46] added text configuration to all of active ui

---
 index.html                         |   8 +-
 package-lock.json                  | 367 +++++++++++++++++++++++++++--
 package.json                       |   3 +-
 src/client/ui.ts                   |   8 +-
 src/client/views/select-issuers.ts |  45 +++-
 src/client/views/start.ts          |   2 +-
 src/client/views/utils/index.ts    |   6 +
 src/version.ts                     |   2 +-
 8 files changed, 405 insertions(+), 36 deletions(-)
 create mode 100644 src/client/views/utils/index.ts

diff --git a/index.html b/index.html
index 62041080..bf8759a3 100644
--- a/index.html
+++ b/index.html
@@ -295,10 +295,16 @@
           // },
         ],
         uiOptions: {
+          openingAction: "Let's Go!",
           openingHeading:
             "Open a new world of perks, benefits and opportunities with your attestation, collectible or token.",
           issuerHeading: "Get discount with Ticket",
-          repeatAction: "try again",
+          repeatAction: "Try Again",
+          loadAction: "Load Tokens",
+          dismissAction: "Dismiss",
+          noTokensFoundEvent: "No Tokens Found",
+          balancesFoundEvent: "Balances Found",
+          nftsFoundEvent: "Available Token(s)",
           theme: theme,
           position: "top-right",
         },
diff --git a/package-lock.json b/package-lock.json
index d70ab699..7e432534 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@tokenscript/token-negotiator",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@tokenscript/token-negotiator",
-      "version": "3.0.2",
+      "version": "3.1.0",
       "license": "MIT",
       "dependencies": {
         "@onflow/fcl": "^1.3.2",
@@ -20,6 +20,7 @@
         "eosjs": "^22.1.0",
         "eosjs-ecc": "^4.0.7",
         "ethers": "^5.4.0",
+        "http-server": "^14.1.1",
         "pvutils": "^1.0.17",
         "text-encoding": "^0.7.0",
         "tweetnacl": "^1.0.3",
@@ -6791,7 +6792,6 @@
       "version": "2.6.4",
       "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
       "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
-      "dev": true,
       "dependencies": {
         "lodash": "^4.17.14"
       }
@@ -7120,6 +7120,17 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/basic-auth": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
+      "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
+      "dependencies": {
+        "safe-buffer": "5.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -7907,6 +7918,14 @@
       "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
       "dev": true
     },
+    "node_modules/corser": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/corser/-/corser-2.0.1.tgz",
+      "integrity": "sha512-utCYNzRSQIZNPIcGZdQc92UVJYAhtGAteCFg0yRaFm8f0P+CPtyGyHXJcGXnffjCybUCEx3FQ2G7U3/o9eIkVQ==",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
     "node_modules/crc-32": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
@@ -9821,8 +9840,7 @@
     "node_modules/eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "node_modules/events": {
       "version": "3.3.0",
@@ -10807,7 +10825,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
       "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
-      "dev": true,
       "dependencies": {
         "whatwg-encoding": "^2.0.0"
       },
@@ -10841,6 +10858,19 @@
       "resolved": "https://registry.npmjs.org/http-https/-/http-https-1.0.0.tgz",
       "integrity": "sha512-o0PWwVCSp3O0wS6FvNr6xfBCHgt0m1tvPLFOCc2iFDKTRAXhB7m8klDf7ErowFH8POa6dVdGatKU5I1YYwzUyg=="
     },
+    "node_modules/http-proxy": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+      "dependencies": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/http-proxy-agent": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
@@ -10855,6 +10885,96 @@
         "node": ">= 6"
       }
     },
+    "node_modules/http-server": {
+      "version": "14.1.1",
+      "resolved": "https://registry.npmjs.org/http-server/-/http-server-14.1.1.tgz",
+      "integrity": "sha512-+cbxadF40UXd9T01zUHgA+rlo2Bg1Srer4+B4NwIHdaGxAGGv59nYRnGGDJ9LBk7alpS0US+J+bLLdQOOkJq4A==",
+      "dependencies": {
+        "basic-auth": "^2.0.1",
+        "chalk": "^4.1.2",
+        "corser": "^2.0.1",
+        "he": "^1.2.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy": "^1.18.1",
+        "mime": "^1.6.0",
+        "minimist": "^1.2.6",
+        "opener": "^1.5.1",
+        "portfinder": "^1.0.28",
+        "secure-compare": "3.0.1",
+        "union": "~0.5.0",
+        "url-join": "^4.0.1"
+      },
+      "bin": {
+        "http-server": "bin/http-server"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/http-server/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/http-server/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/http-server/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/http-server/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/http-server/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/http-server/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -10916,7 +11036,6 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -14686,6 +14805,17 @@
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
       "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
     },
+    "node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -15300,6 +15430,14 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/opener": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
+      "bin": {
+        "opener": "bin/opener-bin.js"
+      }
+    },
     "node_modules/optionator": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -15777,6 +15915,38 @@
         "node": ">=4.0.0"
       }
     },
+    "node_modules/portfinder": {
+      "version": "1.0.32",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
+      "integrity": "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==",
+      "dependencies": {
+        "async": "^2.6.4",
+        "debug": "^3.2.7",
+        "mkdirp": "^0.5.6"
+      },
+      "engines": {
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/portfinder/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/portfinder/node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
     "node_modules/postcss": {
       "version": "8.4.20",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz",
@@ -16257,7 +16427,6 @@
       "version": "6.5.3",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
       "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
-      "dev": true,
       "engines": {
         "node": ">=0.6"
       }
@@ -16606,8 +16775,7 @@
     "node_modules/requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-      "dev": true
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
     },
     "node_modules/resolve": {
       "version": "1.22.1",
@@ -16860,6 +17028,11 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/secure-compare": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/secure-compare/-/secure-compare-3.0.1.tgz",
+      "integrity": "sha512-AckIIV90rPDcBcglUwXPF3kg0P0qmPsPXAj6BBEENQE1p5yA1xfmDJzfi1Tappj37Pv2mVbKpL3Z1T+Nn7k1Qw=="
+    },
     "node_modules/secure-random": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/secure-random/-/secure-random-1.1.2.tgz",
@@ -18812,6 +18985,17 @@
         "node": ">=4"
       }
     },
+    "node_modules/union": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/union/-/union-0.5.0.tgz",
+      "integrity": "sha512-N6uOhuW6zO95P3Mel2I2zMsbsanvvtgn6jVqJv4vbVcz/JN0OkL9suomjQGmWtxJQXOCqUJvquc1sMeNz/IwlA==",
+      "dependencies": {
+        "qs": "^6.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -18880,6 +19064,11 @@
         "qs": "^6.11.0"
       }
     },
+    "node_modules/url-join": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
+      "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA=="
+    },
     "node_modules/url-parse": {
       "version": "1.5.10",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
@@ -19521,7 +19710,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
       "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
-      "dev": true,
       "dependencies": {
         "iconv-lite": "0.6.3"
       },
@@ -25063,7 +25251,6 @@
       "version": "2.6.4",
       "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
       "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
-      "dev": true,
       "requires": {
         "lodash": "^4.17.14"
       }
@@ -25308,6 +25495,14 @@
       "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
       "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A=="
     },
+    "basic-auth": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
+      "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -25919,6 +26114,11 @@
       "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
       "dev": true
     },
+    "corser": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/corser/-/corser-2.0.1.tgz",
+      "integrity": "sha512-utCYNzRSQIZNPIcGZdQc92UVJYAhtGAteCFg0yRaFm8f0P+CPtyGyHXJcGXnffjCybUCEx3FQ2G7U3/o9eIkVQ=="
+    },
     "crc-32": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
@@ -27516,8 +27716,7 @@
     "eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "events": {
       "version": "3.3.0",
@@ -28251,7 +28450,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
       "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
-      "dev": true,
       "requires": {
         "whatwg-encoding": "^2.0.0"
       }
@@ -28279,6 +28477,16 @@
       "resolved": "https://registry.npmjs.org/http-https/-/http-https-1.0.0.tgz",
       "integrity": "sha512-o0PWwVCSp3O0wS6FvNr6xfBCHgt0m1tvPLFOCc2iFDKTRAXhB7m8klDf7ErowFH8POa6dVdGatKU5I1YYwzUyg=="
     },
+    "http-proxy": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+      "requires": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      }
+    },
     "http-proxy-agent": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
@@ -28290,6 +28498,71 @@
         "debug": "4"
       }
     },
+    "http-server": {
+      "version": "14.1.1",
+      "resolved": "https://registry.npmjs.org/http-server/-/http-server-14.1.1.tgz",
+      "integrity": "sha512-+cbxadF40UXd9T01zUHgA+rlo2Bg1Srer4+B4NwIHdaGxAGGv59nYRnGGDJ9LBk7alpS0US+J+bLLdQOOkJq4A==",
+      "requires": {
+        "basic-auth": "^2.0.1",
+        "chalk": "^4.1.2",
+        "corser": "^2.0.1",
+        "he": "^1.2.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy": "^1.18.1",
+        "mime": "^1.6.0",
+        "minimist": "^1.2.6",
+        "opener": "^1.5.1",
+        "portfinder": "^1.0.28",
+        "secure-compare": "3.0.1",
+        "union": "~0.5.0",
+        "url-join": "^4.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -28332,7 +28605,6 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
       "requires": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       }
@@ -31177,6 +31449,11 @@
         }
       }
     },
+    "mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+    },
     "mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -31635,6 +31912,11 @@
         "is-wsl": "^2.1.1"
       }
     },
+    "opener": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A=="
+    },
     "optionator": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -31986,6 +32268,34 @@
       "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz",
       "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w=="
     },
+    "portfinder": {
+      "version": "1.0.32",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
+      "integrity": "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==",
+      "requires": {
+        "async": "^2.6.4",
+        "debug": "^3.2.7",
+        "mkdirp": "^0.5.6"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+          "requires": {
+            "minimist": "^1.2.6"
+          }
+        }
+      }
+    },
     "postcss": {
       "version": "8.4.20",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz",
@@ -32336,8 +32646,7 @@
     "qs": {
       "version": "6.5.3",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
-      "dev": true
+      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="
     },
     "query-string": {
       "version": "7.1.3",
@@ -32604,8 +32913,7 @@
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-      "dev": true
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
     },
     "resolve": {
       "version": "1.22.1",
@@ -32775,6 +33083,11 @@
         "node-gyp-build": "^4.2.0"
       }
     },
+    "secure-compare": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/secure-compare/-/secure-compare-3.0.1.tgz",
+      "integrity": "sha512-AckIIV90rPDcBcglUwXPF3kg0P0qmPsPXAj6BBEENQE1p5yA1xfmDJzfi1Tappj37Pv2mVbKpL3Z1T+Nn7k1Qw=="
+    },
     "secure-random": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/secure-random/-/secure-random-1.1.2.tgz",
@@ -34227,6 +34540,14 @@
       "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
       "dev": true
     },
+    "union": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/union/-/union-0.5.0.tgz",
+      "integrity": "sha512-N6uOhuW6zO95P3Mel2I2zMsbsanvvtgn6jVqJv4vbVcz/JN0OkL9suomjQGmWtxJQXOCqUJvquc1sMeNz/IwlA==",
+      "requires": {
+        "qs": "^6.4.0"
+      }
+    },
     "universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -34285,6 +34606,11 @@
         }
       }
     },
+    "url-join": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
+      "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA=="
+    },
     "url-parse": {
       "version": "1.5.10",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
@@ -34802,7 +35128,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
       "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
-      "dev": true,
       "requires": {
         "iconv-lite": "0.6.3"
       }
diff --git a/package.json b/package.json
index 3b486803..5089907a 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,7 @@
     "eosjs": "^22.1.0",
     "eosjs-ecc": "^4.0.7",
     "ethers": "^5.4.0",
+    "http-server": "^14.1.1",
     "pvutils": "^1.0.17",
     "text-encoding": "^0.7.0",
     "tweetnacl": "^1.0.3",
@@ -109,4 +110,4 @@
   "browserslist": [
     "last 5 years"
   ]
-}
\ No newline at end of file
+}
diff --git a/src/client/ui.ts b/src/client/ui.ts
index 999ef562..838c1881 100644
--- a/src/client/ui.ts
+++ b/src/client/ui.ts
@@ -13,10 +13,16 @@ export type UItheme = 'light' | 'dark'
 export type ViewType = 'start' | 'main' | 'wallet' | string
 
 export interface UIOptionsInterface {
+	dismissAction: string
+	loadAction: string
+	noTokensFoundEvent: string
+	balancesFoundEvent: string
+	nftsFoundEvent: string
 	uiType?: UIType
 	containerElement?: string
 	openingHeading?: string
 	openingButtonText?: string
+	openingAction?: string
 	issuerHeading?: string
 	repeatAction?: string
 	theme?: UItheme
@@ -111,7 +117,7 @@ export class Ui implements UiInterface {
 			if (this.retryCallback) {
 				this.retryCallback()
 				this.retryCallback = undefined
-				this.retryButton.innerText = 'Dismiss'
+				this.retryButton.innerText = this.options.dismissAction ?? 'Dismiss'
 			}
 		})
 
diff --git a/src/client/views/select-issuers.ts b/src/client/views/select-issuers.ts
index 22979dd2..7b7fb634 100644
--- a/src/client/views/select-issuers.ts
+++ b/src/client/views/select-issuers.ts
@@ -4,6 +4,7 @@ import { IconView } from './icon-view'
 import { logger } from '../../utils'
 import { UIUpdateEventType } from '../index'
 import { Issuer } from '../interface'
+import { applyHTMLElementsInnerText } from './utils/index'
 
 export class SelectIssuers extends AbstractView {
 	issuerListContainer: any
@@ -77,7 +78,7 @@ export class SelectIssuers extends AbstractView {
                         </g>
                     </svg>
                   </button>
-                  <p class="headline-tn token-name">Token Name Here</p>
+                  <p class="headline-tn token-name"></p>
                 </div>
                 <ul class="token-list-container-tn" role="menubar"></ul>
               </div>
@@ -171,7 +172,7 @@ export class SelectIssuers extends AbstractView {
 		let buttonText = ''
 
 		// @ts-ignore
-		if (tokens?.length) buttonText = data?.fungible ? 'Balance found' : `${tokens.length} token${tokens.length > 1 ? 's' : ''} available`
+		if (tokens?.length) buttonText = data?.fungible ? 'Balance found' : `${tokens.length} Token${tokens.length > 1 ? 's' : ''} available`
 
 		return `
             <li class="issuer-connect-banner-tn" data-issuer="${issuer}" role="menuitem">
@@ -187,7 +188,7 @@ export class SelectIssuers extends AbstractView {
 				>
 				${
 					this.client.issuersLoaded === true
-						? 'Load'
+						? this.params.options.loadAction ?? 'Load'
 						: '<div class="lds-ellipsis lds-ellipsis-sm" style=""><div></div><div></div><div></div><div></div></div>'
 				}
 			  </button>
@@ -215,10 +216,11 @@ export class SelectIssuers extends AbstractView {
 			this.issuerLoading.bind(this),
 			(issuer: string, tokens: any[]) => {
 				if (!tokens?.length) {
-					const connectBtn = this.issuerListContainer.querySelector(`[data-issuer="${issuer}"] .connect-btn-tn`)
-
-					if (connectBtn) connectBtn.innerText = 'Load'
-
+					applyHTMLElementsInnerText(
+						this.issuerListContainer,
+						`[data-issuer="${issuer}"] .connect-btn-tn`,
+						this.params.options.loadAction ?? 'Load',
+					) 
 					return
 				}
 
@@ -245,13 +247,25 @@ export class SelectIssuers extends AbstractView {
 			logger(2, err)
 			this.ui.showError(err)
 			this.client.eventSender('error', { issuer, error: err })
+			applyHTMLElementsInnerText(
+				this.issuerListContainer,
+				`[data-issuer="${issuer}"] .connect-btn-tn`,
+				this.params.options.repeatAction ?? 'Try Again',
+			) 
 			return
 		}
 
 		this.ui.dismissLoader()
 
 		if (!tokens?.length) {
-			this.ui.showError(`No tokens found! ${this.client.getNoTokenMsg(issuer)}`)
+			this.ui.showError(`
+			${this.params.options.noTokensFoundEvent ?? 'No tokens found! ' }
+			${this.client.getNoTokenMsg(issuer)}`)
+			applyHTMLElementsInnerText(
+				this.issuerListContainer,
+				`[data-issuer="${issuer}"] .connect-btn-tn`,
+				this.params.options.repeatAction ?? 'Try Again',
+			)
 			return
 		}
 
@@ -285,8 +299,14 @@ export class SelectIssuers extends AbstractView {
 		tokenBtn.style.display = 'block'
 		let issuers = this.client.getTokenStore().getCurrentIssuers()
 
+		// applyHTMLElementsInnerText(
+		// 	this.issuerListContainer,
+		// 	`[data-issuer="${issuer}"] .connect-btn-tn`,
+		// 	this.params.options.balanceFoundEvent ?? 'Balance found',
+		// )
+
 		tokenBtn.innerHTML =
-			tokens.length && issuers[issuer].fungible ? 'Balance found' : `${tokens.length} token${tokens.length > 1 ? 's' : ''} available`
+			tokens.length && issuers[issuer].fungible ? this.params.options.balanceFoundEvent ?? 'Balance found' : `${tokens.length} ${this.params.options.nftsFoundEvent ?? 'Token(s) Available'}`
 		tokenBtn.setAttribute('aria-label', `Navigate to select from ${tokens.length} of your ${issuer} tokens`)
 		tokenBtn.setAttribute('tabIndex', 1)
 
@@ -311,7 +331,12 @@ export class SelectIssuers extends AbstractView {
 		const config = tokenStore.getCurrentIssuers()[issuer]
 		const tokenData = tokenStore.getIssuerTokens(issuer) ?? []
 
-		if (config.title) this.viewContainer.getElementsByClassName('headline-tn token-name')[0].innerHTML = config.title
+		if (config.title) {
+			this.viewContainer.getElementsByClassName('headline-tn token-name')[0].innerHTML = config.title
+		} else {
+			this.viewContainer.getElementsByClassName('headline-tn token-name')[0].innerHTML = config.collectionID
+			console.warn(`${config.collectionID} config is missing a title.`)
+		}
 
 		let tokens: TokenListItemInterface[] = []
 
diff --git a/src/client/views/start.ts b/src/client/views/start.ts
index 0a22796d..f10d5f3b 100644
--- a/src/client/views/start.ts
+++ b/src/client/views/start.ts
@@ -13,7 +13,7 @@ export class Start extends AbstractView {
               <div class="inner-content-tn">
                 <div class="inner-content-block-tn">
                   <button class="opening-btn-tn" aria-label="Start connecting your tokens">
-				  ${this.params.options.openingButtonText ?? "Let's go!"}
+				  ${this.params.options.openingButtonText ?? this.params.options.openingAction ?? "Let's go!"}
 				  </button>
                   <div class="opening-heading-tn">${this.params.options.openingHeading}</div>
                 </div>
diff --git a/src/client/views/utils/index.ts b/src/client/views/utils/index.ts
new file mode 100644
index 00000000..d038a468
--- /dev/null
+++ b/src/client/views/utils/index.ts
@@ -0,0 +1,6 @@
+
+
+export const applyHTMLElementsInnerText = (searchElment: HTMLElement, querySelectionString: string, text: string) => {
+  const element: HTMLElement = searchElment.querySelector(querySelectionString)
+  if (element) element.innerText = text
+}
\ No newline at end of file
diff --git a/src/version.ts b/src/version.ts
index ff2bdf6a..32ccf64c 100644
--- a/src/version.ts
+++ b/src/version.ts
@@ -1,2 +1,2 @@
 // modified by build process.
-export const VERSION = '3.0.2'
+export const VERSION = '3.1.0'

From 0c4d87c8df2b192c8c9a646edc8071099b2dc6ca Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Tue, 12 Sep 2023 16:11:04 +1000
Subject: [PATCH 35/46] added text configuration to all of active ui

---
 package-lock.json | 363 +++-------------------------------------------
 package.json      |   3 +-
 2 files changed, 20 insertions(+), 346 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7e432534..22f20fe1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,6 @@
         "eosjs": "^22.1.0",
         "eosjs-ecc": "^4.0.7",
         "ethers": "^5.4.0",
-        "http-server": "^14.1.1",
         "pvutils": "^1.0.17",
         "text-encoding": "^0.7.0",
         "tweetnacl": "^1.0.3",
@@ -6792,6 +6791,7 @@
       "version": "2.6.4",
       "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
       "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+      "dev": true,
       "dependencies": {
         "lodash": "^4.17.14"
       }
@@ -7120,17 +7120,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/basic-auth": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
-      "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
-      "dependencies": {
-        "safe-buffer": "5.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -7918,14 +7907,6 @@
       "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
       "dev": true
     },
-    "node_modules/corser": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/corser/-/corser-2.0.1.tgz",
-      "integrity": "sha512-utCYNzRSQIZNPIcGZdQc92UVJYAhtGAteCFg0yRaFm8f0P+CPtyGyHXJcGXnffjCybUCEx3FQ2G7U3/o9eIkVQ==",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/crc-32": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
@@ -9840,7 +9821,8 @@
     "node_modules/eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+      "dev": true
     },
     "node_modules/events": {
       "version": "3.3.0",
@@ -10825,6 +10807,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
       "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+      "dev": true,
       "dependencies": {
         "whatwg-encoding": "^2.0.0"
       },
@@ -10858,19 +10841,6 @@
       "resolved": "https://registry.npmjs.org/http-https/-/http-https-1.0.0.tgz",
       "integrity": "sha512-o0PWwVCSp3O0wS6FvNr6xfBCHgt0m1tvPLFOCc2iFDKTRAXhB7m8klDf7ErowFH8POa6dVdGatKU5I1YYwzUyg=="
     },
-    "node_modules/http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "dependencies": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
     "node_modules/http-proxy-agent": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
@@ -10885,96 +10855,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/http-server": {
-      "version": "14.1.1",
-      "resolved": "https://registry.npmjs.org/http-server/-/http-server-14.1.1.tgz",
-      "integrity": "sha512-+cbxadF40UXd9T01zUHgA+rlo2Bg1Srer4+B4NwIHdaGxAGGv59nYRnGGDJ9LBk7alpS0US+J+bLLdQOOkJq4A==",
-      "dependencies": {
-        "basic-auth": "^2.0.1",
-        "chalk": "^4.1.2",
-        "corser": "^2.0.1",
-        "he": "^1.2.0",
-        "html-encoding-sniffer": "^3.0.0",
-        "http-proxy": "^1.18.1",
-        "mime": "^1.6.0",
-        "minimist": "^1.2.6",
-        "opener": "^1.5.1",
-        "portfinder": "^1.0.28",
-        "secure-compare": "3.0.1",
-        "union": "~0.5.0",
-        "url-join": "^4.0.1"
-      },
-      "bin": {
-        "http-server": "bin/http-server"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/http-server/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/http-server/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/http-server/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/http-server/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/http-server/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/http-server/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -11036,6 +10916,7 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -14805,17 +14686,6 @@
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
       "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
     },
-    "node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -15430,14 +15300,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/opener": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
-      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
-      "bin": {
-        "opener": "bin/opener-bin.js"
-      }
-    },
     "node_modules/optionator": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -15915,38 +15777,6 @@
         "node": ">=4.0.0"
       }
     },
-    "node_modules/portfinder": {
-      "version": "1.0.32",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
-      "integrity": "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==",
-      "dependencies": {
-        "async": "^2.6.4",
-        "debug": "^3.2.7",
-        "mkdirp": "^0.5.6"
-      },
-      "engines": {
-        "node": ">= 0.12.0"
-      }
-    },
-    "node_modules/portfinder/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/portfinder/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
     "node_modules/postcss": {
       "version": "8.4.20",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz",
@@ -16427,6 +16257,7 @@
       "version": "6.5.3",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
       "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+      "dev": true,
       "engines": {
         "node": ">=0.6"
       }
@@ -16775,7 +16606,8 @@
     "node_modules/requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
     },
     "node_modules/resolve": {
       "version": "1.22.1",
@@ -17028,11 +16860,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/secure-compare": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/secure-compare/-/secure-compare-3.0.1.tgz",
-      "integrity": "sha512-AckIIV90rPDcBcglUwXPF3kg0P0qmPsPXAj6BBEENQE1p5yA1xfmDJzfi1Tappj37Pv2mVbKpL3Z1T+Nn7k1Qw=="
-    },
     "node_modules/secure-random": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/secure-random/-/secure-random-1.1.2.tgz",
@@ -18985,17 +18812,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/union": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/union/-/union-0.5.0.tgz",
-      "integrity": "sha512-N6uOhuW6zO95P3Mel2I2zMsbsanvvtgn6jVqJv4vbVcz/JN0OkL9suomjQGmWtxJQXOCqUJvquc1sMeNz/IwlA==",
-      "dependencies": {
-        "qs": "^6.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
     "node_modules/universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -19064,11 +18880,6 @@
         "qs": "^6.11.0"
       }
     },
-    "node_modules/url-join": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
-      "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA=="
-    },
     "node_modules/url-parse": {
       "version": "1.5.10",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
@@ -19710,6 +19521,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
       "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+      "dev": true,
       "dependencies": {
         "iconv-lite": "0.6.3"
       },
@@ -25251,6 +25063,7 @@
       "version": "2.6.4",
       "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
       "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+      "dev": true,
       "requires": {
         "lodash": "^4.17.14"
       }
@@ -25495,14 +25308,6 @@
       "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz",
       "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A=="
     },
-    "basic-auth": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
-      "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
-      "requires": {
-        "safe-buffer": "5.1.2"
-      }
-    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -26114,11 +25919,6 @@
       "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
       "dev": true
     },
-    "corser": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/corser/-/corser-2.0.1.tgz",
-      "integrity": "sha512-utCYNzRSQIZNPIcGZdQc92UVJYAhtGAteCFg0yRaFm8f0P+CPtyGyHXJcGXnffjCybUCEx3FQ2G7U3/o9eIkVQ=="
-    },
     "crc-32": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
@@ -27716,7 +27516,8 @@
     "eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+      "dev": true
     },
     "events": {
       "version": "3.3.0",
@@ -28450,6 +28251,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
       "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+      "dev": true,
       "requires": {
         "whatwg-encoding": "^2.0.0"
       }
@@ -28477,16 +28279,6 @@
       "resolved": "https://registry.npmjs.org/http-https/-/http-https-1.0.0.tgz",
       "integrity": "sha512-o0PWwVCSp3O0wS6FvNr6xfBCHgt0m1tvPLFOCc2iFDKTRAXhB7m8klDf7ErowFH8POa6dVdGatKU5I1YYwzUyg=="
     },
-    "http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "requires": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      }
-    },
     "http-proxy-agent": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
@@ -28498,71 +28290,6 @@
         "debug": "4"
       }
     },
-    "http-server": {
-      "version": "14.1.1",
-      "resolved": "https://registry.npmjs.org/http-server/-/http-server-14.1.1.tgz",
-      "integrity": "sha512-+cbxadF40UXd9T01zUHgA+rlo2Bg1Srer4+B4NwIHdaGxAGGv59nYRnGGDJ9LBk7alpS0US+J+bLLdQOOkJq4A==",
-      "requires": {
-        "basic-auth": "^2.0.1",
-        "chalk": "^4.1.2",
-        "corser": "^2.0.1",
-        "he": "^1.2.0",
-        "html-encoding-sniffer": "^3.0.0",
-        "http-proxy": "^1.18.1",
-        "mime": "^1.6.0",
-        "minimist": "^1.2.6",
-        "opener": "^1.5.1",
-        "portfinder": "^1.0.28",
-        "secure-compare": "3.0.1",
-        "union": "~0.5.0",
-        "url-join": "^4.0.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -28605,6 +28332,7 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
       "requires": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       }
@@ -31449,11 +31177,6 @@
         }
       }
     },
-    "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
-    },
     "mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -31912,11 +31635,6 @@
         "is-wsl": "^2.1.1"
       }
     },
-    "opener": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
-      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A=="
-    },
     "optionator": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -32268,34 +31986,6 @@
       "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz",
       "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w=="
     },
-    "portfinder": {
-      "version": "1.0.32",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
-      "integrity": "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==",
-      "requires": {
-        "async": "^2.6.4",
-        "debug": "^3.2.7",
-        "mkdirp": "^0.5.6"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.6",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-          "requires": {
-            "minimist": "^1.2.6"
-          }
-        }
-      }
-    },
     "postcss": {
       "version": "8.4.20",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz",
@@ -32646,7 +32336,8 @@
     "qs": {
       "version": "6.5.3",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="
+      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+      "dev": true
     },
     "query-string": {
       "version": "7.1.3",
@@ -32913,7 +32604,8 @@
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
     },
     "resolve": {
       "version": "1.22.1",
@@ -33083,11 +32775,6 @@
         "node-gyp-build": "^4.2.0"
       }
     },
-    "secure-compare": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/secure-compare/-/secure-compare-3.0.1.tgz",
-      "integrity": "sha512-AckIIV90rPDcBcglUwXPF3kg0P0qmPsPXAj6BBEENQE1p5yA1xfmDJzfi1Tappj37Pv2mVbKpL3Z1T+Nn7k1Qw=="
-    },
     "secure-random": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/secure-random/-/secure-random-1.1.2.tgz",
@@ -34540,14 +34227,6 @@
       "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
       "dev": true
     },
-    "union": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/union/-/union-0.5.0.tgz",
-      "integrity": "sha512-N6uOhuW6zO95P3Mel2I2zMsbsanvvtgn6jVqJv4vbVcz/JN0OkL9suomjQGmWtxJQXOCqUJvquc1sMeNz/IwlA==",
-      "requires": {
-        "qs": "^6.4.0"
-      }
-    },
     "universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -34606,11 +34285,6 @@
         }
       }
     },
-    "url-join": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
-      "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA=="
-    },
     "url-parse": {
       "version": "1.5.10",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
@@ -35128,6 +34802,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
       "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+      "dev": true,
       "requires": {
         "iconv-lite": "0.6.3"
       }
diff --git a/package.json b/package.json
index 5089907a..3b486803 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,6 @@
     "eosjs": "^22.1.0",
     "eosjs-ecc": "^4.0.7",
     "ethers": "^5.4.0",
-    "http-server": "^14.1.1",
     "pvutils": "^1.0.17",
     "text-encoding": "^0.7.0",
     "tweetnacl": "^1.0.3",
@@ -110,4 +109,4 @@
   "browserslist": [
     "last 5 years"
   ]
-}
+}
\ No newline at end of file

From 82f2e03b1dc8900d5fcadee92d56d678cd4c901a Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Tue, 12 Sep 2023 16:15:27 +1000
Subject: [PATCH 36/46] added text configuration to all of active ui

---
 src/client/views/select-issuers.ts | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/client/views/select-issuers.ts b/src/client/views/select-issuers.ts
index 7b7fb634..106fb129 100644
--- a/src/client/views/select-issuers.ts
+++ b/src/client/views/select-issuers.ts
@@ -172,7 +172,7 @@ export class SelectIssuers extends AbstractView {
 		let buttonText = ''
 
 		// @ts-ignore
-		if (tokens?.length) buttonText = data?.fungible ? 'Balance found' : `${tokens.length} Token${tokens.length > 1 ? 's' : ''} available`
+		if (tokens?.length) buttonText = data?.fungible ? this.params.options.balanceFoundEvent ?? 'Balance found' : `${tokens.length} ${this.params.options.nftsFoundEvent ?? 'Token(s) Available'}`
 
 		return `
             <li class="issuer-connect-banner-tn" data-issuer="${issuer}" role="menuitem">
@@ -299,12 +299,6 @@ export class SelectIssuers extends AbstractView {
 		tokenBtn.style.display = 'block'
 		let issuers = this.client.getTokenStore().getCurrentIssuers()
 
-		// applyHTMLElementsInnerText(
-		// 	this.issuerListContainer,
-		// 	`[data-issuer="${issuer}"] .connect-btn-tn`,
-		// 	this.params.options.balanceFoundEvent ?? 'Balance found',
-		// )
-
 		tokenBtn.innerHTML =
 			tokens.length && issuers[issuer].fungible ? this.params.options.balanceFoundEvent ?? 'Balance found' : `${tokens.length} ${this.params.options.nftsFoundEvent ?? 'Token(s) Available'}`
 		tokenBtn.setAttribute('aria-label', `Navigate to select from ${tokens.length} of your ${issuer} tokens`)

From e763d0867f4c1af884186254ea2f3272ef273729 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Tue, 12 Sep 2023 17:42:03 +1000
Subject: [PATCH 37/46] added text configuration to all of active ui

---
 src/client/ui.ts                   | 10 +++++-----
 src/client/views/select-issuers.ts |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/client/ui.ts b/src/client/ui.ts
index 838c1881..a858e7e8 100644
--- a/src/client/ui.ts
+++ b/src/client/ui.ts
@@ -13,11 +13,11 @@ export type UItheme = 'light' | 'dark'
 export type ViewType = 'start' | 'main' | 'wallet' | string
 
 export interface UIOptionsInterface {
-	dismissAction: string
-	loadAction: string
-	noTokensFoundEvent: string
-	balancesFoundEvent: string
-	nftsFoundEvent: string
+	dismissAction?: string
+	loadAction?: string
+	noTokensFoundEvent?: string
+	balancesFoundEvent?: string
+	nftsFoundEvent?: string
 	uiType?: UIType
 	containerElement?: string
 	openingHeading?: string
diff --git a/src/client/views/select-issuers.ts b/src/client/views/select-issuers.ts
index 106fb129..cd7b6db5 100644
--- a/src/client/views/select-issuers.ts
+++ b/src/client/views/select-issuers.ts
@@ -172,7 +172,7 @@ export class SelectIssuers extends AbstractView {
 		let buttonText = ''
 
 		// @ts-ignore
-		if (tokens?.length) buttonText = data?.fungible ? this.params.options.balanceFoundEvent ?? 'Balance found' : `${tokens.length} ${this.params.options.nftsFoundEvent ?? 'Token(s) Available'}`
+		if (tokens?.length) buttonText = data?.fungible ? this.params.options.balanceFoundEvent ?? 'Balance found' : `${tokens.length} ${this.params.options?.nftsFoundEvent ?? 'Token(s) Available'}`
 
 		return `
             <li class="issuer-connect-banner-tn" data-issuer="${issuer}" role="menuitem">
@@ -300,7 +300,7 @@ export class SelectIssuers extends AbstractView {
 		let issuers = this.client.getTokenStore().getCurrentIssuers()
 
 		tokenBtn.innerHTML =
-			tokens.length && issuers[issuer].fungible ? this.params.options.balanceFoundEvent ?? 'Balance found' : `${tokens.length} ${this.params.options.nftsFoundEvent ?? 'Token(s) Available'}`
+			tokens.length && issuers[issuer].fungible ? this.params.options.balanceFoundEvent ?? 'Balance found' : `${tokens.length} ${this.params.options?.nftsFoundEvent ?? 'Token(s) Available'}`
 		tokenBtn.setAttribute('aria-label', `Navigate to select from ${tokens.length} of your ${issuer} tokens`)
 		tokenBtn.setAttribute('tabIndex', 1)
 

From af3ecb4e0cf8b5ec1559c96b5ff151459eeb514d Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Mon, 18 Sep 2023 12:18:18 +1000
Subject: [PATCH 38/46] oauth fixes

---
 index.html                       | 194 +++++++++++++++----------------
 src/client/index.ts              |  12 +-
 src/client/interface.ts          |   2 -
 src/wallet/Web3WalletProvider.ts |   7 ++
 4 files changed, 110 insertions(+), 105 deletions(-)

diff --git a/index.html b/index.html
index bf8759a3..c4fbcda7 100644
--- a/index.html
+++ b/index.html
@@ -20,104 +20,104 @@
       window.negotiator = new negotiator.Client({
         type: "active",
         issuers: [
-          {
-            onChain: true,
-            fungible: true,
-            chain: "eth",
-            blockchain: "evm",
-            collectionID: "socios",
-            contract: "0x3506424F91fD33084466F402d5D97f05F8e3b4AF",
-            oAuth2options: {
-              consumerKey: "PBK9Mx_ffFRUPHW9BLTxnGHRdywa",
-              partnerTag: "smarttokenlabs",
-              endpoints: {
-                redirectURI: {
-                  path: "http://localhost:5000/user-login-callback",
-                  params: {}
-                },
-                userBalance: {
-                  path: 'http://localhost:5000/user-balance',
-                  params: {}
-                },
-                userNfts: {
-                  path: 'http://localhost:5000/user-nfts',
-                  params: {}
-                },
-              },
-            },
-          },
-          {
-            hideToggle: true,
-            noTokenMsg:
-              "<p>If you hold a Devcon ticket, please visit your magicLink email again and open the link in this browser.</p><p>You may reload this page after and try again.</p>",
-            onChain: false,
-            tokenName: "devcon6",
-            collectionID: "devcon6",
-            title: "Devcon VI Ticket Attestation",
-            image: "https://devcon-vi.attest.tickets/img/nft_bg.png",
-            tokenOrigin: "https://devcon-vi.attest.tickets/outlet.html",
-            attestationOrigin: "https://test.attestation.id/",
-            tokenUrlName: "ticket",
-            cryptoVerify: "https://form.smarttokenlabs.com",
-            tokenSecretName: "secret",
-            tokenIdName: "mail",
-            unsignedTokenDataName: "ticket",
-            whitelistDialogRenderer: (permissionTxt, acceptBtn, denyBtn) => {
-              return `
-		<div class="tn-auth-box">
-			<div class="tn-auth-heading">
-				<img alt="devcon" src="img/FB_OG_Image.svg" style="width: 150px;" />
-			</div>
-			<div class="tn-auth-content">
-				<p>${permissionTxt}</p>
-				${acceptBtn}
-				${denyBtn}
-			</div>
-		</div>
-	`;
-            },
-            signedTokenWhitelist: [
-              "https://devcon-vi.attest.tickets/",
-              "https://dev.loc",
-              "https://devconnect.loc/",
-              "https://devconnect.antopolbus.rv.ua/",
-              "https://perks.antopolbus.rv.ua/",
-              "https://stage-perks.smarttokenlabs.com/",
-              "http://localhost:5000/",
+          // {
+          //   onChain: true,
+          //   fungible: true,
+          //   chain: "eth",
+          //   blockchain: "evm",
+          //   collectionID: "socios",
+          //   contract: "0x3506424F91fD33084466F402d5D97f05F8e3b4AF",
+          //   oAuth2options: {
+          //     consumerKey: "PBK9Mx_ffFRUPHW9BLTxnGHRdywa",
+          //     partnerTag: "smarttokenlabs",
+          //     endpoints: {
+          //       redirectURI: {
+          //         path: "http://localhost:5000/user-login-callback",
+          //         params: {}
+          //       },
+          //       userBalance: {
+          //         path: 'http://localhost:5000/user-balance',
+          //         params: {}
+          //       },
+          //       userNfts: {
+          //         path: 'http://localhost:5000/user-nfts',
+          //         params: {}
+          //       },
+          //     },
+          //   },
+          // },
+          //         {
+          //           hideToggle: true,
+          //           noTokenMsg:
+          //             "<p>If you hold a Devcon ticket, please visit your magicLink email again and open the link in this browser.</p><p>You may reload this page after and try again.</p>",
+          //           onChain: false,
+          //           tokenName: "devcon6",
+          //           collectionID: "devcon6",
+          //           title: "Devcon VI Ticket Attestation",
+          //           image: "https://devcon-vi.attest.tickets/img/nft_bg.png",
+          //           tokenOrigin: "https://devcon-vi.attest.tickets/outlet.html",
+          //           attestationOrigin: "https://test.attestation.id/",
+          //           tokenUrlName: "ticket",
+          //           cryptoVerify: "https://form.smarttokenlabs.com",
+          //           tokenSecretName: "secret",
+          //           tokenIdName: "mail",
+          //           unsignedTokenDataName: "ticket",
+          //           whitelistDialogRenderer: (permissionTxt, acceptBtn, denyBtn) => {
+          //             return `
+          // 	<div class="tn-auth-box">
+          // 		<div class="tn-auth-heading">
+          // 			<img alt="devcon" src="img/FB_OG_Image.svg" style="width: 150px;" />
+          // 		</div>
+          // 		<div class="tn-auth-content">
+          // 			<p>${permissionTxt}</p>
+          // 			${acceptBtn}
+          // 			${denyBtn}
+          // 		</div>
+          // 	</div>
+          // `;
+          //           },
+          //           signedTokenWhitelist: [
+          //             "https://devcon-vi.attest.tickets/",
+          //             "https://dev.loc",
+          //             "https://devconnect.loc/",
+          //             "https://devconnect.antopolbus.rv.ua/",
+          //             "https://perks.antopolbus.rv.ua/",
+          //             "https://stage-perks.smarttokenlabs.com/",
+          //             "http://localhost:5000/",
 
-              "https://hashkey.smarttokenlabs.com/",
-              "https://fayre-devcon.webflow.io/",
-              "https://fenbushi-devcon.webflow.io/",
-              "https://metasearch-devcon.webflow.io/",
-              "https://conspicuis-devcon.webflow.io/",
-              "https://devcon-vi.brandextender.io/",
-              "https://www.edcon.io/",
-            ],
-            itemStorageKey: "devconnectTokens",
-            base64senderPublicKeys: {
-              4: "MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAEAGJAHCiHbrCNAY9fAMdom4dGD6v/KkTIgRCkwLCjXFTkXWGrCEXHaZ8kWwdqlu0oYCrNQ2vdlqOl0s26/LzO8A==|MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAE-N-jGYo1OuO77XItd3zT-oIhZEVC44uqOhtJkmBsBNDTp3Seu_vmuLB-b4whNeFNBuJTsT7AHUiUe3JOwCcegA==",
-            },
-            base64attestorPubKey:
-              "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
-          },
-          {
-            collectionID: "devcon",
-            onChain: false,
-            title: "Devcon",
-            tokenIdName: "id",
-            image:
-              "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg",
-            tokenOrigin: "http://localhost:3002/",
-            attestationOrigin: "https://test.attestation.id/",
-            base64senderPublicKeys: {
-              6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
-              55: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
-            },
-            base64attestorPubKey:
-              "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
-            ticketIssuersUrlWebsitePrivateKey:
-              "MIICSwIBADCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBBIIBVTCCAVECAQEEIM/T+SzcXcdtcNIqo6ck0nJTYzKL5ywYBFNSpI7R8AuBoIHjMIHgAgEBMCwGByqGSM49AQECIQD////////////////////////////////////+///8LzBEBCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcEQQR5vmZ++dy7rFWgYpXOhwsHApv82y3OKNlZ8oFbFvgXmEg62ncmo8RlXaT7/A4RCKj9F7RIpoVUGZxH0I/7ENS4AiEA/////////////////////rqu3OavSKA7v9JejNA2QUECAQGhRANCAARjMR62qoIK9pHk17MyHHIU42Ix+Vl6Q2gTmIF72vNpinBpyoBkTkV0pnI1jdrLlAjJC0I91DZWQhVhddMCK65c",
-          },
+          //             "https://hashkey.smarttokenlabs.com/",
+          //             "https://fayre-devcon.webflow.io/",
+          //             "https://fenbushi-devcon.webflow.io/",
+          //             "https://metasearch-devcon.webflow.io/",
+          //             "https://conspicuis-devcon.webflow.io/",
+          //             "https://devcon-vi.brandextender.io/",
+          //             "https://www.edcon.io/",
+          //           ],
+          //           itemStorageKey: "devconnectTokens",
+          //           base64senderPublicKeys: {
+          //             4: "MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAEAGJAHCiHbrCNAY9fAMdom4dGD6v/KkTIgRCkwLCjXFTkXWGrCEXHaZ8kWwdqlu0oYCrNQ2vdlqOl0s26/LzO8A==|MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAE-N-jGYo1OuO77XItd3zT-oIhZEVC44uqOhtJkmBsBNDTp3Seu_vmuLB-b4whNeFNBuJTsT7AHUiUe3JOwCcegA==",
+          //           },
+          //           base64attestorPubKey:
+          //             "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
+          //         },
+          //         {
+          //           collectionID: "devcon",
+          //           onChain: false,
+          //           title: "Devcon",
+          //           tokenIdName: "id",
+          //           image:
+          //             "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg",
+          //           tokenOrigin: "http://localhost:3002/",
+          //           attestationOrigin: "https://test.attestation.id/",
+          //           base64senderPublicKeys: {
+          //             6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
+          //             55: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
+          //           },
+          //           base64attestorPubKey:
+          //             "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=",
+          //           ticketIssuersUrlWebsitePrivateKey:
+          //             "MIICSwIBADCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBBIIBVTCCAVECAQEEIM/T+SzcXcdtcNIqo6ck0nJTYzKL5ywYBFNSpI7R8AuBoIHjMIHgAgEBMCwGByqGSM49AQECIQD////////////////////////////////////+///8LzBEBCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcEQQR5vmZ++dy7rFWgYpXOhwsHApv82y3OKNlZ8oFbFvgXmEg62ncmo8RlXaT7/A4RCKj9F7RIpoVUGZxH0I/7ENS4AiEA/////////////////////rqu3OavSKA7v9JejNA2QUECAQGhRANCAARjMR62qoIK9pHk17MyHHIU42Ix+Vl6Q2gTmIF72vNpinBpyoBkTkV0pnI1jdrLlAjJC0I91DZWQhVhddMCK65c",
+          //         },
           // {
           //   collectionID: "devcon",
           //   onChain: false,
diff --git a/src/client/index.ts b/src/client/index.ts
index 03c45d44..36308163 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -11,7 +11,6 @@ import {
 } from '../utils'
 import { getNftCollection, getNftTokens } from '../utils/token/nftProvider'
 import { TokenStore } from './tokenStore'
-import { isCookieExpired } from './../utils'
 import {
 	OffChainTokenConfig,
 	OnChainTokenConfig,
@@ -293,11 +292,12 @@ export class Client {
 	public hasIssuerForBlockchain(blockchain: 'evm' | 'solana' | 'flow' | 'ultra', useOauth = false) {
 		return (
 			this.config.issuers.filter((issuer: OnChainTokenConfig) => {
-				if (blockchain === 'evm' && !issuer.onChain && !useOauth) return true
-				if (issuer.oAuth2options && useOauth) return true
-				if (blockchain === 'solana' && typeof window.solana === 'undefined') return false
-				if (blockchain === 'ultra' && typeof window.ultra === 'undefined') return false
-				return !issuer.oAuth2options && (issuer.blockchain ? issuer.blockchain.toLowerCase() : 'evm') === blockchain
+				const oAuthIssuerOrNotRequired = !useOauth || (useOauth && issuer.oAuth2options)
+				if (oAuthIssuerOrNotRequired && blockchain === 'evm' && !issuer.onChain) return true
+				if (oAuthIssuerOrNotRequired && blockchain === 'solana' && typeof window.solana === 'undefined') return false
+				if (oAuthIssuerOrNotRequired && blockchain === 'ultra' && typeof window.ultra === 'undefined') return false
+				const blockChainNameMatch = issuer.blockchain ? issuer.blockchain.toLowerCase() : 'evm' === blockchain
+				return oAuthIssuerOrNotRequired && blockChainNameMatch
 			}).length > 0
 		)
 	}
diff --git a/src/client/interface.ts b/src/client/interface.ts
index 7bf6e635..26277f4e 100644
--- a/src/client/interface.ts
+++ b/src/client/interface.ts
@@ -58,7 +58,6 @@ export interface Oauth2IssuerConfig {
 	blockchain?: SupportedBlockchainsParam
 	oAuth2options: {
 		consumerKey: string
-		redirectURI: string
 		partnerTag: string
 		returnToApplicationURL?: string
 		endpoints: {
@@ -90,7 +89,6 @@ export interface IssuerConfigInterface {
 	hideToggle?: boolean
 	fungible?: boolean
 	consumerKey?: string
-	redirectURI?: string
 	partnerTag?: string
 	serverEndPoint?: string
 	oAuth2options?: string
diff --git a/src/wallet/Web3WalletProvider.ts b/src/wallet/Web3WalletProvider.ts
index 58dc1d22..917fa57f 100644
--- a/src/wallet/Web3WalletProvider.ts
+++ b/src/wallet/Web3WalletProvider.ts
@@ -491,6 +491,13 @@ export class Web3WalletProvider {
 		}
 
 		if (isCookieMaxAgeExpired(`tn-oauth2-expiry-socios`)) {
+			// add the wallet connection.
+			this.registerNewOauth2WalletAddress(
+				'socios', // address id
+				'socios', // chain id
+				'Socios', // provider
+				'evm', // blockchain
+			)
 			// @ts-ignore
 			this.client.ui.showLoaderDelayed(['<h4>Connecting to Socios...</h4>'], 600, true)
 			window.location.href = `https://partner.socios.com/oauth2/authorize?response_type=code&client_id=${client_id}&redirect_uri=${redirect_uri}&partner_tag=${partner_tag}`

From f01be0820ce3115832ca3aaab46f71c64d231235 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Mon, 18 Sep 2023 15:00:36 +1000
Subject: [PATCH 39/46] fix to wallet filter

---
 index.html                       | 144 ++++++++++++++++---------------
 src/client/index.ts              |  16 ++--
 src/client/interface.ts          |   4 +
 src/wallet/Web3WalletProvider.ts |  15 +++-
 4 files changed, 101 insertions(+), 78 deletions(-)

diff --git a/index.html b/index.html
index c4fbcda7..031cb02d 100644
--- a/index.html
+++ b/index.html
@@ -20,32 +20,36 @@
       window.negotiator = new negotiator.Client({
         type: "active",
         issuers: [
-          // {
-          //   onChain: true,
-          //   fungible: true,
-          //   chain: "eth",
-          //   blockchain: "evm",
-          //   collectionID: "socios",
-          //   contract: "0x3506424F91fD33084466F402d5D97f05F8e3b4AF",
-          //   oAuth2options: {
-          //     consumerKey: "PBK9Mx_ffFRUPHW9BLTxnGHRdywa",
-          //     partnerTag: "smarttokenlabs",
-          //     endpoints: {
-          //       redirectURI: {
-          //         path: "http://localhost:5000/user-login-callback",
-          //         params: {}
-          //       },
-          //       userBalance: {
-          //         path: 'http://localhost:5000/user-balance',
-          //         params: {}
-          //       },
-          //       userNfts: {
-          //         path: 'http://localhost:5000/user-nfts',
-          //         params: {}
-          //       },
-          //     },
-          //   },
-          // },
+          {
+            onChain: true,
+            fungible: true,
+            chain: "eth",
+            blockchain: "evm",
+            collectionID: "socios",
+            contract: "0x3506424F91fD33084466F402d5D97f05F8e3b4AF",
+            oAuth2options: {
+              consumerKey: "PBK9Mx_ffFRUPHW9BLTxnGHRdywa",
+              partnerTag: "smarttokenlabs",
+              endpoints: {
+                redirectURI: {
+                  path: "http://localhost:5000/user-login-callback",
+                  params: {}
+                },
+                userBalance: {
+                  path: 'http://localhost:5000/user-balance',
+                  params: {}
+                },
+                userNfts: {
+                  path: 'http://localhost:5000/user-nfts',
+                  params: {}
+                },
+                userLogout: {
+                  path: 'http://localhost:5000/user-logout',
+                  params: {}
+                },
+              },
+            },
+          },
           //         {
           //           hideToggle: true,
           //           noTokenMsg:
@@ -178,62 +182,62 @@
           //     },
           // base64attestorPubKey: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ="
           // },
-          // {
-          //   collectionID: "crypto-cowboy-country",
-          //   tokenProgram: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
-          //   collectionAddress:
-          //     "bf0aae3dd0078a9feb975f1e3242ddcb7774d551c7fd2a3f07a89c827ed606b2",
-          //   updateAuthority: "CCCUzWanUNegjGby11DjujDvPaNN68jd9Rimwk2MZzqZ",
-          //   onChain: true,
-          //   symbol: "CCC",
-          //   chain: "mainnet",
-          //   blockchain: "solana",
-          // },
-          // {
-          //   collectionID: "penthouse-panther-club",
-          //   collectionAddress: "ff846ef2eed57e5367cf8826e63f4d53fe28d28aa67417accb6e4b48cbd19136",
-          //   updateAuthority: "92oYPmrr1BHznizuZmpKZ3MFRadMFYRTCxo9Pf34mZKX",
-          //   tokenProgram: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
-          //   onChain: true,
-          //   symbol: "PPC",
-          //   chain: "mainnet",
-          //   blockchain: "solana",
-          // },
-          // {
-          //   hideToggle : false,
-          //   collectionID: "pixel",
-          //   collectionAddress: "166424b16c4c7f40eb852f9eb2d0d6869a9ed7ac54a8e6afbd516676bfbbeb19",
-          //   onChain: true,
-          //   symbol: "PIXEL",
-          //   chain: "mainnet",
-          //   blockchain: "solana",
-          // },
           {
+            collectionID: "crypto-cowboy-country",
+            tokenProgram: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
+            collectionAddress:
+              "bf0aae3dd0078a9feb975f1e3242ddcb7774d551c7fd2a3f07a89c827ed606b2",
+            updateAuthority: "CCCUzWanUNegjGby11DjujDvPaNN68jd9Rimwk2MZzqZ",
             onChain: true,
-            collectionID: "expansion-punks",
-            contract: "0x0d0167a823c6619d430b1a96ad85b888bcf97c37",
-            chain: "eth",
-            blockchain: "evm",
+            symbol: "CCC",
+            chain: "mainnet",
+            blockchain: "solana",
           },
           {
+            collectionID: "penthouse-panther-club",
+            collectionAddress: "ff846ef2eed57e5367cf8826e63f4d53fe28d28aa67417accb6e4b48cbd19136",
+            updateAuthority: "92oYPmrr1BHznizuZmpKZ3MFRadMFYRTCxo9Pf34mZKX",
+            tokenProgram: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
             onChain: true,
-            collectionID: "fantom-collection-test",
-            contract: "0x94e22c14118353651636f9af43cd0a5a08b93da3",
-            chain: "fantom",
-            blockchain: "evm",
+            symbol: "PPC",
+            chain: "mainnet",
+            blockchain: "solana",
           },
           {
-            hideToggle: true,
-            noTokenMsg:
-              "<p>If you have a token please:</p><p>1. Open your magic link inside this browser.<br/>2. Refresh this page.</p>",
+            hideToggle: false,
+            collectionID: "pixel",
+            collectionAddress: "166424b16c4c7f40eb852f9eb2d0d6869a9ed7ac54a8e6afbd516676bfbbeb19",
             onChain: true,
-            collectionID: "bsc-collection-test",
-            contract: "0xF5db804101d8600c26598A1Ba465166c33CdAA4b",
-            chain: "bsc",
+            symbol: "PIXEL",
+            chain: "mainnet",
+            blockchain: "solana",
+          },
+          {
+            onChain: true,
+            collectionID: "expansion-punks",
+            contract: "0x0d0167a823c6619d430b1a96ad85b888bcf97c37",
+            chain: "eth",
             blockchain: "evm",
           },
           // {
           //   onChain: true,
+          //   collectionID: "fantom-collection-test",
+          //   contract: "0x94e22c14118353651636f9af43cd0a5a08b93da3",
+          //   chain: "fantom",
+          //   blockchain: "evm",
+          // },
+          // {
+          //   hideToggle: true,
+          //   noTokenMsg:
+          //     "<p>If you have a token please:</p><p>1. Open your magic link inside this browser.<br/>2. Refresh this page.</p>",
+          //   onChain: true,
+          //   collectionID: "bsc-collection-test",
+          //   contract: "0xF5db804101d8600c26598A1Ba465166c33CdAA4b",
+          //   chain: "bsc",
+          //   blockchain: "evm",
+          // },
+          // {
+          //   onChain: true,
           //   collectionID: "tt",
           //   contract: '0x76be3b62873462d2142405439777e971754e8e77',
           //   chain: 'eth',
diff --git a/src/client/index.ts b/src/client/index.ts
index 36308163..13bda61c 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -292,12 +292,18 @@ export class Client {
 	public hasIssuerForBlockchain(blockchain: 'evm' | 'solana' | 'flow' | 'ultra', useOauth = false) {
 		return (
 			this.config.issuers.filter((issuer: OnChainTokenConfig) => {
-				const oAuthIssuerOrNotRequired = !useOauth || (useOauth && issuer.oAuth2options)
-				if (oAuthIssuerOrNotRequired && blockchain === 'evm' && !issuer.onChain) return true
-				if (oAuthIssuerOrNotRequired && blockchain === 'solana' && typeof window.solana === 'undefined') return false
-				if (oAuthIssuerOrNotRequired && blockchain === 'ultra' && typeof window.ultra === 'undefined') return false
+				const oAuthIssuer = useOauth && issuer.oAuth2options
+				if (blockchain === 'evm' && !issuer.onChain) {
+					return true
+				}
+				if (blockchain === 'solana' && typeof window.solana === 'undefined') {
+					return false
+				}
+				if (blockchain === 'ultra' && typeof window.ultra === 'undefined') {
+					return false
+				}
 				const blockChainNameMatch = issuer.blockchain ? issuer.blockchain.toLowerCase() : 'evm' === blockchain
-				return oAuthIssuerOrNotRequired && blockChainNameMatch
+				return blockChainNameMatch && (oAuthIssuer || !issuer.oAuth2options)
 			}).length > 0
 		)
 	}
diff --git a/src/client/interface.ts b/src/client/interface.ts
index 26277f4e..5bb34a80 100644
--- a/src/client/interface.ts
+++ b/src/client/interface.ts
@@ -73,6 +73,10 @@ export interface Oauth2IssuerConfig {
 				path: string
 				params: object
 			}
+			userLogout?: {
+				path: string
+				params: object
+			}
 		}
 	}
 }
diff --git a/src/wallet/Web3WalletProvider.ts b/src/wallet/Web3WalletProvider.ts
index 917fa57f..779c4369 100644
--- a/src/wallet/Web3WalletProvider.ts
+++ b/src/wallet/Web3WalletProvider.ts
@@ -33,6 +33,7 @@ export interface WalletConnectionOauth2 {
 	providerType: string
 	meta?: any
 	expiryCookieName?: string
+	logoutEndPoint?: string
 }
 
 export enum SupportedWalletProviders {
@@ -120,6 +121,9 @@ export class Web3WalletProvider {
 							break
 						case 'socios':
 							deleteCookieByName(`tn-oauth2-expiry-socios`)
+							if (provider.logoutEndPoint) {
+								fetch(provider.logoutEndPoint, { method: 'POST' })
+							}
 							break
 					}
 				}
@@ -271,13 +275,14 @@ export class Web3WalletProvider {
 		}
 	}
 
-	public registerNewOauth2WalletAddress(address, chainId, oAuth2Provider, blockchain: SupportedBlockchainsParam) {
+	public registerNewOauth2WalletAddress(address, chainId, oAuth2Provider, blockchain: SupportedBlockchainsParam, logoutEndPoint?: string) {
 		this.connections[address] = {
 			address: address,
 			chainId: chainId,
 			providerType: oAuth2Provider,
 			provider: oAuth2Provider,
 			blockchain: blockchain,
+			logoutEndPoint: logoutEndPoint,
 		}
 		this.saveConnections()
 		this.emitSavedConnection(address)
@@ -480,12 +485,14 @@ export class Web3WalletProvider {
 		let client_id
 		let redirect_uri
 		let partner_tag
+		let logoutEndPoint
 		for (const issuer of this.client.config.issuers) {
 			const oauthIssuer = issuer as Oauth2IssuerConfig
 			if (oauthIssuer.oAuth2options.consumerKey) {
 				client_id = oauthIssuer.oAuth2options.consumerKey
 				redirect_uri = oauthIssuer.oAuth2options.endpoints.redirectURI.path
 				partner_tag = oauthIssuer.oAuth2options.partnerTag
+				logoutEndPoint = oauthIssuer.oAuth2options.endpoints?.userLogout.path
 				break
 			}
 		}
@@ -496,7 +503,8 @@ export class Web3WalletProvider {
 				'socios', // address id
 				'socios', // chain id
 				'Socios', // provider
-				'evm', // blockchain
+				'evm', // blockchain,
+				logoutEndPoint,
 			)
 			// @ts-ignore
 			this.client.ui.showLoaderDelayed(['<h4>Connecting to Socios...</h4>'], 600, true)
@@ -507,7 +515,8 @@ export class Web3WalletProvider {
 				'socios', // address id
 				'socios', // chain id
 				'Socios', // provider
-				'evm', // blockchain
+				'evm', // blockchain,
+				logoutEndPoint,
 			)
 		}
 		return 'socios'

From aa1ef5b6adad693c17263a0548dadce7d8d9b089 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 20 Sep 2023 11:06:26 +1000
Subject: [PATCH 40/46] addded a simple check to ensure that the url being
 navigated to via a tkn request is available

---
 index.html            |  2 +-
 src/client/index.ts   |  2 ++
 src/core/messaging.ts | 16 +++++++++++++++-
 src/version.ts        |  2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 62041080..e0c67cc2 100644
--- a/index.html
+++ b/index.html
@@ -107,7 +107,7 @@
             tokenIdName: "id",
             image:
               "https://raw.githubusercontent.com/TokenScript/token-negotiator/main/mock-images/devcon.svg",
-            tokenOrigin: "http://localhost:3002/",
+            tokenOrigin: "http://localhost:3000/",
             attestationOrigin: "https://test.attestation.id/",
             base64senderPublicKeys: {
               6: "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=",
diff --git a/src/client/index.ts b/src/client/index.ts
index 03c45d44..61ed6bba 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -91,11 +91,13 @@ export const enum UIUpdateEventType {
 export enum ClientError {
 	POPUP_BLOCKED = 'POPUP_BLOCKED',
 	USER_ABORT = 'USER_ABORT',
+	ISSUER_UNAVAILABLE = 'ISSUER_UNAVAILABLE',
 }
 
 export enum ClientErrorMessage {
 	POPUP_BLOCKED = 'Please add an exception to your popup blocker before continuing.',
 	USER_ABORT = 'The user aborted the process.',
+	ISSUER_UNAVAILABLE = 'The issuer is unavailable.',
 }
 
 export class Client {
diff --git a/src/core/messaging.ts b/src/core/messaging.ts
index cf7d0626..66f30695 100644
--- a/src/core/messaging.ts
+++ b/src/core/messaging.ts
@@ -42,6 +42,20 @@ export class Messaging {
 	iframe: any = null
 	listenerSet = false
 
+	async isWebsiteAvailable(url) {
+		return fetch(url, {
+			method: 'HEAD',
+			cache: 'no-store',
+		})
+			.then((response) => {
+				console.log('response', response)
+				return response.status === 200
+			})
+			.catch((error) => {
+				throw error
+			})
+	}
+
 	async sendMessage(
 		request: RequestInterfaceBase,
 		forceTab = false,
@@ -49,8 +63,8 @@ export class Messaging {
 	): Promise<ResponseInterfaceBase | void> {
 		logger(2, 'Send request: ')
 		logger(2, request)
-
 		if (redirectUrl) {
+			await this.isWebsiteAvailable(request.origin)
 			this.sendRedirect(request, redirectUrl)
 			return
 		}
diff --git a/src/version.ts b/src/version.ts
index ff2bdf6a..32ccf64c 100644
--- a/src/version.ts
+++ b/src/version.ts
@@ -1,2 +1,2 @@
 // modified by build process.
-export const VERSION = '3.0.2'
+export const VERSION = '3.1.0'

From a24004bffc12bd43ffe69b0a62ec9faf11bfdab5 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 20 Sep 2023 11:23:31 +1000
Subject: [PATCH 41/46] addded a simple check to ensure that the url being
 navigated to via a tkn request is available

---
 package-lock.json               | 37 +++++++++++++++++++++++++++++++--
 src/core/__tests__/core.spec.ts |  8 +++++++
 src/core/messaging.ts           | 18 +++++++---------
 3 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d70ab699..2b756e00 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@tokenscript/token-negotiator",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@tokenscript/token-negotiator",
-      "version": "3.0.2",
+      "version": "3.1.0",
       "license": "MIT",
       "dependencies": {
         "@onflow/fcl": "^1.3.2",
@@ -48,6 +48,7 @@
         "husky": "^8.0.0",
         "jest": "^28.1.3",
         "jest-environment-jsdom": "^29.5.0",
+        "jest-fetch-mock": "^3.0.3",
         "jest-junit": "^16.0.0",
         "jest-location-mock": "^1.0.9",
         "loader-utils": "^3.2.1",
@@ -12596,6 +12597,16 @@
         "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
+    "node_modules/jest-fetch-mock": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/jest-fetch-mock/-/jest-fetch-mock-3.0.3.tgz",
+      "integrity": "sha512-Ux1nWprtLrdrH4XwE7O7InRY6psIi3GOsqNESJgMJ+M5cv4A8Lh7SN9d2V2kKRZ8ebAfcd1LNyZguAOb6JiDqw==",
+      "dev": true,
+      "dependencies": {
+        "cross-fetch": "^3.0.4",
+        "promise-polyfill": "^8.1.3"
+      }
+    },
     "node_modules/jest-get-type": {
       "version": "28.0.2",
       "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz",
@@ -15966,6 +15977,12 @@
       "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-1.0.0.tgz",
       "integrity": "sha512-du4wfLyj4yCZq1VupnVSZmRsPJsNuxoDQFdCFHLaYiEbFBD7QE0a+I4D7hOxrVnh78QE/YipFAj9lXHiXocV+Q=="
     },
+    "node_modules/promise-polyfill": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.3.0.tgz",
+      "integrity": "sha512-H5oELycFml5yto/atYqmjyigJoAo3+OXwolYiH7OfQuYlAqhxNvTfiNMbV9hsC6Yp83yE5r2KTVmtrG6R9i6Pg==",
+      "dev": true
+    },
     "node_modules/promise-to-callback": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/promise-to-callback/-/promise-to-callback-1.0.0.tgz",
@@ -29519,6 +29536,16 @@
         "jest-util": "^28.1.3"
       }
     },
+    "jest-fetch-mock": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/jest-fetch-mock/-/jest-fetch-mock-3.0.3.tgz",
+      "integrity": "sha512-Ux1nWprtLrdrH4XwE7O7InRY6psIi3GOsqNESJgMJ+M5cv4A8Lh7SN9d2V2kKRZ8ebAfcd1LNyZguAOb6JiDqw==",
+      "dev": true,
+      "requires": {
+        "cross-fetch": "^3.0.4",
+        "promise-polyfill": "^8.1.3"
+      }
+    },
     "jest-get-type": {
       "version": "28.0.2",
       "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz",
@@ -32107,6 +32134,12 @@
       "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-1.0.0.tgz",
       "integrity": "sha512-du4wfLyj4yCZq1VupnVSZmRsPJsNuxoDQFdCFHLaYiEbFBD7QE0a+I4D7hOxrVnh78QE/YipFAj9lXHiXocV+Q=="
     },
+    "promise-polyfill": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.3.0.tgz",
+      "integrity": "sha512-H5oELycFml5yto/atYqmjyigJoAo3+OXwolYiH7OfQuYlAqhxNvTfiNMbV9hsC6Yp83yE5r2KTVmtrG6R9i6Pg==",
+      "dev": true
+    },
     "promise-to-callback": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/promise-to-callback/-/promise-to-callback-1.0.0.tgz",
diff --git a/src/core/__tests__/core.spec.ts b/src/core/__tests__/core.spec.ts
index 3194144c..a7d9323b 100644
--- a/src/core/__tests__/core.spec.ts
+++ b/src/core/__tests__/core.spec.ts
@@ -10,6 +10,14 @@ window.location = { assign: assignMock }
 describe('Redirect flow', () => {
 	const { location } = window
 
+	global.fetch = jest.fn();
+
+	const mockResponse = {
+		ok: true
+	};
+
+	global.fetch.mockResolvedValue(mockResponse);
+
 	beforeAll(() => {
 		delete window.location
 		window.location = { hash: '' }
diff --git a/src/core/messaging.ts b/src/core/messaging.ts
index 66f30695..de97431c 100644
--- a/src/core/messaging.ts
+++ b/src/core/messaging.ts
@@ -43,17 +43,15 @@ export class Messaging {
 	listenerSet = false
 
 	async isWebsiteAvailable(url) {
-		return fetch(url, {
-			method: 'HEAD',
-			cache: 'no-store',
-		})
-			.then((response) => {
-				console.log('response', response)
-				return response.status === 200
-			})
-			.catch((error) => {
-				throw error
+		try {
+			const response = await fetch(url, {
+				method: 'HEAD',
+				cache: 'no-store',
 			})
+			return response.status === 200
+		} catch (error) {
+			throw new Error(error)
+		}
 	}
 
 	async sendMessage(

From 6527e34c0911e2126a6c58590e7b779cefc9f04d Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 20 Sep 2023 12:01:11 +1000
Subject: [PATCH 42/46] removed simple check to see if site is available

---
 src/core/messaging.ts | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/core/messaging.ts b/src/core/messaging.ts
index de97431c..afa3bf6c 100644
--- a/src/core/messaging.ts
+++ b/src/core/messaging.ts
@@ -42,18 +42,6 @@ export class Messaging {
 	iframe: any = null
 	listenerSet = false
 
-	async isWebsiteAvailable(url) {
-		try {
-			const response = await fetch(url, {
-				method: 'HEAD',
-				cache: 'no-store',
-			})
-			return response.status === 200
-		} catch (error) {
-			throw new Error(error)
-		}
-	}
-
 	async sendMessage(
 		request: RequestInterfaceBase,
 		forceTab = false,
@@ -62,7 +50,6 @@ export class Messaging {
 		logger(2, 'Send request: ')
 		logger(2, request)
 		if (redirectUrl) {
-			await this.isWebsiteAvailable(request.origin)
 			this.sendRedirect(request, redirectUrl)
 			return
 		}

From 1ebe5d7b34a2d30aa8f194785a524cfb985b5ad4 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 20 Sep 2023 12:02:51 +1000
Subject: [PATCH 43/46] removed simple check to see if site is available

---
 src/core/messaging.ts | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/core/messaging.ts b/src/core/messaging.ts
index de97431c..afa3bf6c 100644
--- a/src/core/messaging.ts
+++ b/src/core/messaging.ts
@@ -42,18 +42,6 @@ export class Messaging {
 	iframe: any = null
 	listenerSet = false
 
-	async isWebsiteAvailable(url) {
-		try {
-			const response = await fetch(url, {
-				method: 'HEAD',
-				cache: 'no-store',
-			})
-			return response.status === 200
-		} catch (error) {
-			throw new Error(error)
-		}
-	}
-
 	async sendMessage(
 		request: RequestInterfaceBase,
 		forceTab = false,
@@ -62,7 +50,6 @@ export class Messaging {
 		logger(2, 'Send request: ')
 		logger(2, request)
 		if (redirectUrl) {
-			await this.isWebsiteAvailable(request.origin)
 			this.sendRedirect(request, redirectUrl)
 			return
 		}

From 7d01fe612e2490c168b619ebe505136f0f226c3a Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 20 Sep 2023 12:03:53 +1000
Subject: [PATCH 44/46] removed simple check to see if site is available

---
 src/core/__tests__/core.spec.ts | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/core/__tests__/core.spec.ts b/src/core/__tests__/core.spec.ts
index a7d9323b..4f4c2847 100644
--- a/src/core/__tests__/core.spec.ts
+++ b/src/core/__tests__/core.spec.ts
@@ -2,22 +2,11 @@
 
 import { Messaging } from '../messaging'
 
-let assignMock = jest.fn()
-
 delete window.location
-window.location = { assign: assignMock }
 
 describe('Redirect flow', () => {
 	const { location } = window
 
-	global.fetch = jest.fn();
-
-	const mockResponse = {
-		ok: true
-	};
-
-	global.fetch.mockResolvedValue(mockResponse);
-
 	beforeAll(() => {
 		delete window.location
 		window.location = { hash: '' }

From 96871bc5b9580192f79a4e76aa9e548e6c15bae4 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Wed, 20 Sep 2023 13:53:54 +1000
Subject: [PATCH 45/46] ensure a toggle index is present with custom tokens

---
 src/client/views/select-issuers.ts | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/client/views/select-issuers.ts b/src/client/views/select-issuers.ts
index cd7b6db5..68e4cf29 100644
--- a/src/client/views/select-issuers.ts
+++ b/src/client/views/select-issuers.ts
@@ -186,11 +186,10 @@ export class SelectIssuers extends AbstractView {
 					data-issuer="${issuer}"
 					${this.client.issuersLoaded === true ? '' : 'disabled'}
 				>
-				${
-					this.client.issuersLoaded === true
-						? this.params.options.loadAction ?? 'Load'
-						: '<div class="lds-ellipsis lds-ellipsis-sm" style=""><div></div><div></div><div></div><div></div></div>'
-				}
+				${this.client.issuersLoaded === true
+				? this.params.options.loadAction ?? 'Load'
+				: '<div class="lds-ellipsis lds-ellipsis-sm" style=""><div></div><div></div><div></div><div></div></div>'
+			}
 			  </button>
               <button aria-label="tokens available from token issuer ${issuer}" 
 										  aria-haspopup="true"
@@ -220,7 +219,7 @@ export class SelectIssuers extends AbstractView {
 						this.issuerListContainer,
 						`[data-issuer="${issuer}"] .connect-btn-tn`,
 						this.params.options.loadAction ?? 'Load',
-					) 
+					)
 					return
 				}
 
@@ -251,7 +250,7 @@ export class SelectIssuers extends AbstractView {
 				this.issuerListContainer,
 				`[data-issuer="${issuer}"] .connect-btn-tn`,
 				this.params.options.repeatAction ?? 'Try Again',
-			) 
+			)
 			return
 		}
 
@@ -259,7 +258,7 @@ export class SelectIssuers extends AbstractView {
 
 		if (!tokens?.length) {
 			this.ui.showError(`
-			${this.params.options.noTokensFoundEvent ?? 'No tokens found! ' }
+			${this.params.options.noTokensFoundEvent ?? 'No tokens found! '}
 			${this.client.getNoTokenMsg(issuer)}`)
 			applyHTMLElementsInnerText(
 				this.issuerListContainer,
@@ -344,11 +343,11 @@ export class SelectIssuers extends AbstractView {
 
 			if (config.onChain === false) {
 				const { title, image } = config
-
+				const tokenId = t.tokenId ?? t.ticketId ?? i.toString();
 				tokens.push(<TokenListItemInterface>{
 					data: t,
 					tokenIssuerKey: issuer,
-					index: t.ticketId,
+					index: tokenId,
 					title: title,
 					image: image,
 					toggleState: isSelected,
@@ -356,7 +355,6 @@ export class SelectIssuers extends AbstractView {
 				})
 			} else {
 				const tokenId = t.tokenId ?? i.toString()
-
 				tokens.push({
 					data: t,
 					tokenIssuerKey: issuer,

From b9f49e965e7334d394fe453d79c50f27279f6ad7 Mon Sep 17 00:00:00 2001
From: Nick Taras <nicktaras@Nicks-MacBook-Pro-3.local>
Date: Thu, 21 Sep 2023 11:21:50 +1000
Subject: [PATCH 46/46] updated change log in prep for release

---
 CHANGELOG.md | 15 +++++++++------
 index.html   |  8 ++++++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba138791..6a2e0f1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,10 @@
 > Description
 
-Patch release to support the upgrade of attestations. 
+Feature release to support Socios OAuth2 Wallet Provider, additional configuration options and improvments.
 
 ### Upgrade Steps
 
-- Update NPM package to version 3.0.2
+- Update NPM package to version 3.1.0
 
 ### Breaking Changes
 
@@ -12,12 +12,15 @@ Patch release to support the upgrade of attestations.
 
 ### New Features
 
-[none]
+- Added new configuration text to active mode ui options
+- Off chain Token user flows now default to re-direct mode, due to all major browsers by default denying to cross origin local storage access via Iframes.
+- Added Socios OAuth2 Wallet Provider support via compatbility with a new NPM package (https://www.npmjs.com/package/@tokenscript/token-negotiator-server)
 
 ### Bug Fixes
 
-- 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)
+- Fix to ensure the validity of attestations when expired
+- Show retry for on chain tokens when they fail to resolve the first time
+- Off Chain Attestation Toggle button UX fix (for custom EAS tokens)
 
 ### Performance Improvements
 
@@ -25,4 +28,4 @@ Patch release to support the upgrade of attestations.
 
 **Full Change log**:
 
-https://github.com/TokenScript/token-negotiator/compare/v3.0.1...v3.0.2
+https://github.com/TokenScript/token-negotiator/compare/v3.0.2...v3.1.0
diff --git a/index.html b/index.html
index e0c67cc2..21972878 100644
--- a/index.html
+++ b/index.html
@@ -28,8 +28,8 @@
             collectionID: "socios",
             contract: "0x3506424F91fD33084466F402d5D97f05F8e3b4AF",
             oAuth2options: {
-              consumerKey: "PBK9Mx_ffFRUPHW9BLTxnGHRdywa",
-              partnerTag: "smarttokenlabs",
+              consumerKey: "YOUR_CONSUMER_KEY",
+              partnerTag: "YOUR_PARTNER_TAG",
               endpoints: {
                 redirectURI: {
                   path: "http://localhost:5000/user-login-callback",
@@ -43,6 +43,10 @@
                   path: 'http://localhost:5000/user-nfts',
                   params: {}
                 },
+                userLogout: {
+                  path: 'http://localhost:5000/user-logout',
+                  params: {}
+                },
               },
             },
           },