- ${
- this.params.viewOptions.backButtonView
- ? `
+ ${this.params.viewOptions.backButtonView
+ ? `
`
- : ''
- }
+ : ''
+ }
Select Wallet
diff --git a/src/client/views/utils/issuers.ts b/src/client/views/utils/issuers.ts
new file mode 100644
index 00000000..b9de67c9
--- /dev/null
+++ b/src/client/views/utils/issuers.ts
@@ -0,0 +1,16 @@
+export const hasIssuerForBlockchain = (config, blockchain: 'evm' | 'solana' | 'flow' | 'ultra', useOauth = false) => {
+ const _blockchain = blockchain.toLocaleLowerCase()
+ return (
+ config.issuers.filter((issuer: any) => {
+ const issuerBlockChain = issuer.blockchain?.toLocaleLowerCase()
+ const blockChainUsed = issuerBlockChain === blockchain
+ const solanaEnabled = blockChainUsed && _blockchain === 'solana' && typeof window.solana !== 'undefined'
+ const ultraEnabled = blockChainUsed && _blockchain === 'ultra' && typeof window.ultra !== 'undefined'
+ const flowEnabled = blockChainUsed && _blockchain === 'flow'
+ const evmEnabled = blockChainUsed && _blockchain === 'evm' && !issuer.oAuth2options && !useOauth
+ const sociosEnabled = blockChainUsed && _blockchain === 'evm' && issuer.oAuth2options && useOauth
+ const fallBackToEVM = _blockchain === 'evm' && !issuerBlockChain && !useOauth
+ return solanaEnabled || ultraEnabled || evmEnabled || sociosEnabled || flowEnabled || fallBackToEVM
+ }).length > 0
+ )
+}
\ No newline at end of file
diff --git a/src/client/views/utils/wallet-info.ts b/src/client/views/utils/wallet-info.ts
index 00c3127b..e358498b 100644
--- a/src/client/views/utils/wallet-info.ts
+++ b/src/client/views/utils/wallet-info.ts
@@ -228,13 +228,13 @@ function getEvmInjectedProviderInfo() {
function getSolanaInjectedProviderInfo() {
return window.solana?.isBraveWallet
? {
- name: SupportedWalletProviders.Phantom_Brave,
- label: 'Phantom (Brave)',
- imgBig: braveWallet.imgBig,
- }
+ name: SupportedWalletProviders.Phantom_Brave,
+ label: 'Phantom (Brave)',
+ imgBig: braveWallet.imgBig,
+ }
: {
- name: SupportedWalletProviders.Phantom,
- label: 'Phantom',
- imgBig: phantomSVG,
- }
+ name: SupportedWalletProviders.Phantom,
+ label: 'Phantom',
+ imgBig: phantomSVG,
+ }
}
diff --git a/src/core/messaging.ts b/src/core/messaging.ts
index afa3bf6c..0ca175c8 100644
--- a/src/core/messaging.ts
+++ b/src/core/messaging.ts
@@ -1,9 +1,6 @@
import { attachPostMessageListener, logger, removePostMessageListener } from '../utils'
import { ClientError } from '../client'
import { browserBlocksIframeStorage } from '../utils/support/getBrowserData'
-import { VERSION } from '../version'
-
-// TODO move Message related interfaces/enum in to shared location /core
export interface RequestInterfaceBase {
action: string
@@ -55,10 +52,6 @@ export class Messaging {
}
if (!forceTab && this.iframeStorageSupport === null) {
- // TODO: temp to test safari top level context access.
- // TODO do we need this verificaton?
- // if (window.location.hash !== "#safari-iframe-test")
-
this.iframeStorageSupport = !browserBlocksIframeStorage()
}
@@ -155,19 +148,6 @@ export class Messaging {
received = true
- // TODO: revert to tab when requestStorageAccess error is encountered in outlet - but only for browsers that support new tabs (no wallet dapp browsers)
- /* if (response.evt === ResponseActionBase.COOKIE_CHECK){
- if (!this.iframe || this.iframeStorageSupport === true)
- return;
-
- this.iframeStorageSupport = !!response?.data?.thirdPartyCookies;
- if (!this.iframeStorageSupport){
- afterResolveOrError();
- reject("IFRAME_STORAGE");
- }
- return;
- }*/
-
if (response.evt === ResponseActionBase.ERROR) {
if (response.errors[0] === 'IFRAME_STORAGE') {
this.iframeStorageSupport = false
diff --git a/src/outlet/__tests__/outlet.spec.ts b/src/outlet/__tests__/outlet.spec.ts
index 06ccfa21..98ff89ee 100644
--- a/src/outlet/__tests__/outlet.spec.ts
+++ b/src/outlet/__tests__/outlet.spec.ts
@@ -1,11 +1,7 @@
import { Outlet } from '../index'
import { TicketStorage } from '../ticketStorage'
-import { base64toBase64Url, hexStringToBase64Url } from '@tokenscript/attestation/dist/libs/utils'
-import { Ticket } from '@tokenscript/attestation/dist/Ticket'
-import { KeyPair } from '@tokenscript/attestation/dist/libs/KeyPair'
-import { ethers } from 'ethers'
-import { EasTicketAttestation } from '@tokenscript/attestation/dist/eas/EasTicketAttestation'
import { TextEncoder, TextDecoder } from 'util'
+import { createIssuerHashArray } from './../../utils/index'
Object.assign(global, { TextDecoder, TextEncoder })
const _issuers = [
@@ -66,105 +62,67 @@ const outlet = new Outlet({
},
})
-const EASContractAddress = '0xC2679fBD37d54388Ce493F1DB75320D236e1815e' // Sepolia v0.26
-const SEPOLIA_RPC = 'https://rpc.sepolia.org/'
-
-export const EAS_CONFIG = {
- address: EASContractAddress,
- version: '0.26',
- chainId: 11155111,
-}
-
-const EAS_TICKET_SCHEMA = {
- fields: [
- { name: 'devconId', type: 'string' },
- { name: 'ticketId', type: 'string' },
- { name: 'ticketClass', type: 'uint8' },
- { name: 'commitment', type: 'bytes', isCommitment: true },
- ],
-}
-
-// Commented for now to enable the build. Uncomment when needed.
-// async function createTestMagicLink(ticketType, ticketId, ticketClass) {
-// let ticketInUrl, secret
-
-// const email = 'test@test.com'
-// const issuerPrivKey =
-// 'MIICSwIBADCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBBIIBVTCCAVECAQEEIM/T+SzcXcdtcNIqo6ck0nJTYzKL5ywYBFNSpI7R8AuBoIHjMIHgAgEBMCwGByqGSM49AQECIQD////////////////////////////////////+///8LzBEBCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcEQQR5vmZ++dy7rFWgYpXOhwsHApv82y3OKNlZ8oFbFvgXmEg62ncmo8RlXaT7/A4RCKj9F7RIpoVUGZxH0I/7ENS4AiEA/////////////////////rqu3OavSKA7v9JejNA2QUECAQGhRANCAARjMR62qoIK9pHk17MyHHIU42Ix+Vl6Q2gTmIF72vNpinBpyoBkTkV0pnI1jdrLlAjJC0I91DZWQhVhddMCK65c'
-
-// if (ticketType === 'eas') {
-// const provider = new ethers.providers.JsonRpcProvider(SEPOLIA_RPC)
-// const wallet = new ethers.Wallet(KeyPair.privateFromPEM(issuerPrivKey).getPrivateAsHexString(), provider)
-
-// const attestationManager = new EasTicketAttestation(EAS_TICKET_SCHEMA, {
-// EASconfig: EAS_CONFIG,
-// signer: wallet,
-// })
-
-// await attestationManager.createEasAttestation({
-// devconId: '6',
-// ticketIdString: ticketId,
-// ticketClass: ticketClass,
-// commitment: email,
-// })
-
-// ticketInUrl = base64toBase64Url(attestationManager.getEncoded())
-// secret = attestationManager.getEasJson().secret
-// } else {
-// secret = BigInt(45845870684)
-
-// let ticket = Ticket.createWithMail(email, '6', ticketId, ticketClass, { '6': KeyPair.privateFromPEM(issuerPrivKey) }, secret)
-
-// if (!ticket.checkValidity()) {
-// throw new Error('Ticket validity check failed')
-// }
-
-// if (!ticket.verify()) {
-// throw new Error('Ticket verify failed')
-// }
+describe('Issuer Client to Outlet check', () => {
+ test('can create an issuer hash implementation of config', async () => {
+ expect(outlet.getHashToConfigMap()).toEqual({ "0x0915bb6dcd508278764d9bfff6ba113c87c761ed78e84ed238811f2264a83a05": { "attestationOrigin": "https://test.attestation.id/", "base64attestorPubKey": "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=", "base64senderPublicKeys": { "6": "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=" }, "collectionID": "devcon", "title": "Devcon", "tokenOrigin": "http://localhost:3002/", "whitelist": [] }, "0x55592fab10cace25a4b34b07aa8741dc3ae50100f73e2997619a5ccc82f62810": { "attestationOrigin": "https://test.attestation.id/", "base64attestorPubKey": "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=", "base64senderPublicKeys": { "7": "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABAjUvEi8UYyC+0rSFu+IwRBos/DEC6YMJV+eCnoYOC4nZU7uayKDJmBxVnmTOSwaM4+gufLbeqqxuovyF5gI3TQ=" }, "collectionID": "test-3", "title": "Test Event 3", "tokenOrigin": "http://localhost:3002/" }, "0x595e334142dd2a9ac6ce2195e560ac1efd926b9632ef10cc7dcf31fe1cb68863": { "attestationOrigin": "https://test.attestation.id/", "base64attestorPubKey": "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=", "base64senderPublicKeys": { "6": "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABAjUvEi8UYyC+0rSFu+IwRBos/DEC6YMJV+eCnoYOC4nZU7uayKDJmBxVnmTOSwaM4+gufLbeqqxuovyF5gI3TQ=" }, "collectionID": "test-2", "title": "Test Event 2", "tokenOrigin": "http://localhost:3002/", "whitelist": [] } });
+ })
-// ticketInUrl = hexStringToBase64Url(ticket.getDerEncoding())
-// }
+ test('can build an issuer list', async () => {
+ const hashToConfigMap = outlet.getHashToConfigMap();
+ const requestHashes = {
+ attestationDao: [
+ '0x0915bb6dcd508278764d9bfff6ba113c87c761ed78e84ed238811f2264a83a05',
+ '0x76d49eaf820fc5313a752214192a223511244124e188557fe84d88d8ff8c3a2f',
+ ],
+ devcon: [
+ '0x0915bb6dcd508278764d9bfff6ba113c87c761ed78e84ed238811f2264a83a05',
+ '0x76d49eaf820fc5313a752214192a223511244124e188557fe84d88d8ff8c3a2f',
+ ],
+ }
+ expect(outlet.getRequestIssuerList(requestHashes, hashToConfigMap)).toEqual([{ "attestationOrigin": "https://test.attestation.id/", "base64attestorPubKey": "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABL+y43T1OJFScEep69/yTqpqnV/jzONz9Sp4TEHyAJ7IPN9+GHweCX1hT4OFxt152sBN3jJc1s0Ymzd8pNGZNoQ=", "base64senderPublicKeys": { "6": "MIIBMzCB7AYHKoZIzj0CATCB4AIBATAsBgcqhkjOPQEBAiEA/////////////////////////////////////v///C8wRAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBEEEeb5mfvncu6xVoGKVzocLBwKb/NstzijZWfKBWxb4F5hIOtp3JqPEZV2k+/wOEQio/Re0SKaFVBmcR9CP+xDUuAIhAP////////////////////66rtzmr0igO7/SXozQNkFBAgEBA0IABGMxHraqggr2keTXszIcchTjYjH5WXpDaBOYgXva82mKcGnKgGRORXSmcjWN2suUCMkLQj3UNlZCFWF10wIrrlw=" }, "collectionID": "devcon", "title": "Devcon", "tokenOrigin": "http://localhost:3002/", "whitelist": [] }]);
+ })
+ test('can build a filtered issuer list', async () => {
+ const hashToConfigMap = outlet.getHashToConfigMap();
+ const requestHashes = {
+ attestationDao: [
+ '0x0915bb6dcd508278764d9bfff6ba113c87c761ed78e84ed238811f2264a83a05',
+ '0x76d49eaf820fc5313a752214192a223511244124e188557fe84d88d8ff8c3a2f',
+ ],
+ devcon: [
+ '0x0915bb6dcd508278764d9bfff6ba113c87c761ed78e84ed238811f2264a83a05',
+ '0x76d49eaf820fc5313a752214192a223511244124e188557fe84d88d8ff8c3a2f',
+ ],
+ }
+ expect(outlet.getFilteredRequestHashes(requestHashes, hashToConfigMap, ['devcon', 'attestationDao'])).toEqual({ "attestationDao": ["0x0915bb6dcd508278764d9bfff6ba113c87c761ed78e84ed238811f2264a83a05"], "devcon": ["0x0915bb6dcd508278764d9bfff6ba113c87c761ed78e84ed238811f2264a83a05"] });
+ })
+ test('can build an empty filtered issuer list', async () => {
+ const hashToConfigMap = outlet.getHashToConfigMap();
+ const requestHashes = {
+ attestationDao: [
+ '0x0915bb6dcd508278764d9bfff6ba113c87c761ed78e84ed238811f2264a83a05',
+ '0x76d49eaf820fc5313a752214192a223511244124e188557fe84d88d8ff8c3a2f',
+ ],
+ devcon: [
+ '0x0915bb6dcd508278764d9bfff6ba113c87c761ed78e84ed238811f2264a83a05',
+ '0x76d49eaf820fc5313a752214192a223511244124e188557fe84d88d8ff8c3a2f',
+ ],
+ }
+ expect(outlet.getFilteredRequestHashes(requestHashes, hashToConfigMap, [])).toEqual(
+ {
+ "attestationDao": [],
+ "devcon": [],
+ }
+ )
+ })
+})
-// return new URLSearchParams(new URL(`http://127.0.0.1?type=${ticketType}&ticket=${ticketInUrl}&secret=${secret}&mail=${email}`).search)
-// }
describe('Test TicketStorage', () => {
// @ts-ignore
- const storage = new TicketStorage(outlet.tokenConfig.issuers)
-
+ new TicketStorage(outlet.tokenConfig.issuers)
test('storage has the correct data from given input', async () => {
// @ts-ignore
expect(outlet.tokenConfig.issuers).toEqual(_issuers)
})
-
- // test('Store ASN ticket', async () => {
- // await storage.importTicketFromMagicLink(await createTestMagicLink('asn', '1', 2))
- // const request = {
- // 'devcon': ['0x0915bb6dcd508278764d9bfff6ba113c87c761ed78e84ed238811f2264a83a05'],
- // 'test-2': ['0x595e334142dd2a9ac6ce2195e560ac1efd926b9632ef10cc7dcf31fe1cb68863'],
- // 'test-3': ['0x55592fab10cace25a4b34b07aa8741dc3ae50100f73e2997619a5ccc82f62810'],
- // }
- // expect((await storage.getDecodedTokens(request)).length).toBe(1)
- // })
- // test('Store EAS ticket', async () => {
- // await storage.importTicketFromMagicLink(await createTestMagicLink('eas', '2', 2))
- // const request = {
- // 'devcon': ['0x0915bb6dcd508278764d9bfff6ba113c87c761ed78e84ed238811f2264a83a05'],
- // 'test-2': ['0x595e334142dd2a9ac6ce2195e560ac1efd926b9632ef10cc7dcf31fe1cb68863'],
- // 'test-3': ['0x55592fab10cace25a4b34b07aa8741dc3ae50100f73e2997619a5ccc82f62810'],
- // }
- // expect((await storage.getDecodedTokens(request)).length).toBe(2)
- // })
- // test('Ensure already added tickets are overwritten', async () => {
- // await storage.importTicketFromMagicLink(await createTestMagicLink('eas', '1', 2))
- // await storage.importTicketFromMagicLink(await createTestMagicLink('asn', '2', 2))
- // expect((await storage.getDecodedTokens()).length).toBe(2)
- // })
- // test('Locate token via decoded data', async () => {
- // const decToken = (await storage.getDecodedTokens())[0]
- // const token = await storage.getStoredTicketFromDecodedToken(decToken)
- // expect(token.tokenId).toBe(`${decToken.devconId}-${decToken.ticketId}`)
- // })
})
diff --git a/src/outlet/index.ts b/src/outlet/index.ts
index d0a6a66a..191450db 100644
--- a/src/outlet/index.ts
+++ b/src/outlet/index.ts
@@ -93,7 +93,7 @@ export class Outlet extends LocalOutlet {
if (this.getDataFromQuery('localClient') === 'true') {
return
}
- await this.processAttestationIdCallback(evtid)
+ this.processAttestationIdCallback(evtid)
break
}
case OutletAction.GET_PROOF: {
@@ -274,47 +274,60 @@ export class Outlet extends LocalOutlet {
}
}
- // TODO: Consolidate redirect callback for tokens, proof & errors into the sendMessageResponse function to remove duplication
- private async sendTokens(evtid: any) {
- const requestHashes = JSON.parse(this.getDataFromQuery('request')) as IssuerHashMap
-
- if (!requestHashes) return
-
- // Create a map of outlet hashes to issuer config
- const hashToConfigMap = {}
+ getRequestHashes() {
+ return JSON.parse(this.getDataFromQuery('request')) as IssuerHashMap
+ }
+ getHashToConfigMap() {
+ let hashToConfigMap = {}
for (const issuer of this.tokenConfig.issuers) {
const hashes = createIssuerHashArray(issuer)
for (const hash of hashes) {
hashToConfigMap[hash] = issuer
}
}
+ return hashToConfigMap
+ }
+ getRequestIssuerList(requestHashes, hashToConfigMap) {
const reqIssuers: OutletIssuerInterface[] = []
-
- // Loop through client request hashes & create an array of issuers for whitelist processing
for (const issuer in requestHashes) {
for (const hash of requestHashes[issuer]) {
- if (hashToConfigMap[hash]) {
- if (reqIssuers.indexOf(hashToConfigMap[hash]) === -1) reqIssuers.push(hashToConfigMap[hash])
+ if (hashToConfigMap[hash] && reqIssuers.indexOf(hashToConfigMap[hash]) === -1) {
+ reqIssuers.push(hashToConfigMap[hash])
}
}
}
+ return reqIssuers
+ }
- const whitelistedIssuers = await this.whitelist.whitelistCheck(reqIssuers, false)
-
- // Remove hashes that don't exist in outlets own config and non-whitelisted issuers
+ getFilteredRequestHashes(requestHashes, hashToConfigMap, whitelistedIssuers) {
for (const issuer in requestHashes) {
- const filteredHashes = []
+ const configAndWhiteListHashes = []
for (const hash of requestHashes[issuer]) {
if (hashToConfigMap[hash] && whitelistedIssuers.indexOf(hashToConfigMap[hash].collectionID) > -1) {
- filteredHashes.push(hash)
+ configAndWhiteListHashes.push(hash)
}
}
- requestHashes[issuer] = filteredHashes
+ requestHashes[issuer] = configAndWhiteListHashes
}
+ return requestHashes
+ }
+
+ private async sendTokens(evtid: any) {
+ const requestHashes = this.getRequestHashes()
+
+ if (!requestHashes) return
+
+ const hashToConfigMap = this.getHashToConfigMap()
+
+ const reqIssuers = this.getRequestIssuerList(requestHashes, hashToConfigMap)
+
+ const whitelistedIssuers = await this.whitelist.whitelistCheck(reqIssuers, false)
+
+ const filteredRequestHashes = this.getFilteredRequestHashes(requestHashes, hashToConfigMap, whitelistedIssuers)
- let issuerTokens = await this.ticketStorage.getDecodedTokens(requestHashes)
+ let issuerTokens = await this.ticketStorage.getDecodedTokens(filteredRequestHashes)
logger(2, 'issuerTokens: (Outlet.sendTokens)', issuerTokens)
@@ -324,7 +337,6 @@ export class Outlet extends LocalOutlet {
const params = new URLSearchParams(url.hash.substring(1))
params.set(this.getCallbackUrlKey('action'), OutletAction.GET_ISSUER_TOKENS + '-response')
- // params.set(this.getCallbackUrlKey('issuer'), this.tokenConfig.collectionID)
params.set(this.getCallbackUrlKey('tokens'), JSON.stringify(issuerTokens))
url.hash = '#' + params.toString()
@@ -345,7 +357,6 @@ export class Outlet extends LocalOutlet {
evtid: evtid,
evt: OutletResponseAction.ISSUER_TOKENS,
data: {
- // issuer: this.tokenConfig.collectionID,
tokens: issuerTokens,
},
})
diff --git a/src/utils/__tests__/util.spec.ts b/src/utils/__tests__/util.spec.ts
index 78c4b9f3..100edbc8 100644
--- a/src/utils/__tests__/util.spec.ts
+++ b/src/utils/__tests__/util.spec.ts
@@ -2,9 +2,6 @@
window.DISPLAY_DEBUG_LEVEL = 1
import { TextEncoder, TextDecoder } from 'util'
-Object.assign(global, { TextDecoder, TextEncoder })
-
-import { hasUncaughtExceptionCaptureCallback } from 'process'
import {
createIssuerHashMap,
createIssuerHashArray,
@@ -17,10 +14,8 @@ import {
removeUrlSearchParams,
} from './../index'
import { errorHandler } from '../index'
-import { toExpression } from '@babel/types'
-// TODO: add unit tests for the following functions:
-// logger, requiredParams, asyncHandle, attachPostMessageListener.
+Object.assign(global, { TextDecoder, TextEncoder })
describe('util Spec object comparison', () => {
test('expect a to be b shallow comparison', () => {
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 9b1e33d3..1d210fe0 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -4,8 +4,6 @@ import { sha256 } from 'ethers/lib/utils'
import { OffChainTokenConfig } from '../client/interface'
import { OutletIssuerInterface } from '../outlet/interfaces'
import { DEFAULT_SCHEMA_UIDS } from '../outlet/ticketStorage'
-import { DecodedToken } from '../outlet/ticketStorage'
-import { TokenData } from '../client/tokenStore'
export interface IssuerHashMap {
[collectionId: string]: string[]
diff --git a/src/utils/token/__tests__/onchaintoken.spec.ts b/src/utils/token/__tests__/onchaintoken.spec.ts
index 6e6cad75..38ef429b 100644
--- a/src/utils/token/__tests__/onchaintoken.spec.ts
+++ b/src/utils/token/__tests__/onchaintoken.spec.ts
@@ -266,36 +266,6 @@ it('get evm Nft Collection Url', async () => {
)
})
-/* it('get evm fungible tokens', async () => {
- global.fetch = jest.fn(() =>
- Promise.resolve({ status: 200, json: () => Promise.resolve(mockFungibleTokensResponse) }),
- )
- const evmtokens = await getEvmFungibleTokensBalance({
- contract: '0xe0ad1806fd3e7edf6ff52fdb822432e847411033',
- chain: 'eth',
- erc: 200,
- }, "0x52459834ca561cb55411699e9c2143683bcf865f")
- expect(evmtokens).toEqual(
- 'https://api.token-discovery.tokenscript.org/get-owner-fungible-tokens?addresses=0x52459834ca561cb55411699e9c2143683bcf865f&chain=eth&blockchain=evm',
- )
-})
-
-it('get solana fungible tokens', async () => {
- global.fetch = jest.fn(() =>
- Promise.resolve({ status: 200, json: () => Promise.resolve(mockFungibleTokensResponse) }),
- )
- const solanatokens = await getSolanaFungibleTokensBalance({
- collectionAddress: '0x52459834ca561cb55411699e9c2143683bcf865f',
- chain: 'eth',
- blockchain: 'solana',
- erc: 200,
- })
- expect(solanatokens).toEqual(
- 'https://api.token-discovery.tokenscript.org/get-owner-fungible-tokens?addresses=0x52459834ca561cb55411699e9c2143683bcf865f&chain=eth&blockchain=solana',
- )
-})*/
-
-// TODO: This test doesn't test anything since fetch is hardcoded to return the exact result the test expects
it('get fungible tokens', async () => {
global.fetch = jest.fn(() => Promise.resolve({ status: 200, json: () => Promise.resolve(mockFungibleTokensResponse) }))
const tokens = await getFungibleTokenBalances(
diff --git a/src/version.ts b/src/version.ts
index 124b6660..cbae52a8 100644
--- a/src/version.ts
+++ b/src/version.ts
@@ -1,2 +1,2 @@
// modified by build process.
-export const VERSION = '3.2.0'
+export const VERSION = '3.2.1'
diff --git a/src/wallet/Web3WalletProvider.ts b/src/wallet/Web3WalletProvider.ts
index e56dc4ef..61eff045 100644
--- a/src/wallet/Web3WalletProvider.ts
+++ b/src/wallet/Web3WalletProvider.ts
@@ -417,7 +417,7 @@ export class Web3WalletProvider {
})
})
- universalWalletConnect.on('session_delete', ({ id, topic }: { id: number; topic: string }) => {
+ universalWalletConnect.on('session_delete', () => {
// TODO: There is currently a bug in the universal provider that prevents this handler from being called.
// After this is fixed, this should handle the event correctly
// https://github.com/WalletConnect/walletconnect-monorepo/issues/1772
diff --git a/src/wallet/__test__/wallet.spec.ts b/src/wallet/__test__/wallet.spec.ts
index 0f6af4be..d5635b95 100644
--- a/src/wallet/__test__/wallet.spec.ts
+++ b/src/wallet/__test__/wallet.spec.ts
@@ -1,12 +1,12 @@
/* eslint-disable no-mixed-spaces-and-tabs */
-import { ethers } from 'ethers'
import { TextDecoder, TextEncoder } from 'text-encoding'
-global.TextEncoder = TextEncoder
-global.TextDecoder = TextDecoder
import { Client } from '../../client/index'
-import { SafeConnectOptions, SafeConnectProvider } from '../SafeConnectProvider'
+import { SafeConnectProvider } from '../SafeConnectProvider'
import { Web3WalletProvider } from '../Web3WalletProvider'
+global.TextEncoder = TextEncoder
+global.TextDecoder = TextDecoder
+
let tokenNegotiatorClient = new Client({
type: 'active',
issuers: [
@@ -98,14 +98,7 @@ describe('Provider tests', () => {
test('web3WalletProvider connect with void method for ETH connnection register wallet address', async () => {
web3WalletProvider = new Web3WalletProvider(tokenNegotiatorClient, null, null)
window.ethereum = {
- enable: () => ['0x1263b90F4e1DFe89A8f9E623FF57adb252851fC3'],
- // provider: {
- // events: {
- // accountsChanged: () => {},
- // chainChanged: () => {},
- // disconnect: () => {},
- // },
- // },
+ enable: () => ['0x1263b90F4e1DFe89A8f9E623FF57adb252851fC3']
}
web3WalletProvider.registerNewWalletAddress(
'0x1263b90F4e1DFe89A8f9E623FF57adb252851fC3'.toLocaleLowerCase(),
diff --git a/webpack.config.js b/webpack.config.js
index ab49251c..e37b003a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -79,4 +79,4 @@ module.exports = {
minimize: true,
minimizer: [new TerserPlugin()],
},
-};
+};
\ No newline at end of file