Fix at+get fns

packages/contract/src/contract/storage.ts

@@ -140,7 +140,7 @@ export function getStorageKeyAndType(
         }
 
         const rootKeyReversed = reverseHexString(rootKey.slice(2))
-        const item = get<PortableType>(abi.registry.lookup.types, storage.layout.leaf.ty)
+        const item = at(abi.registry.lookup.types, parseInt(storage.layout.leaf.ty))
         return {
             storageType: item,
             storageKey: rootKeyReversed,

packages/detector/src/index.d.ts

@@ -1,3 +1,16 @@
+// Copyright 2021-2024 Prosopo (UK) Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 export function isBot(): Promise<{
     fingerprint: {
         resistance:
@@ -6,7 +19,7 @@
                   security: undefined
                   mode: undefined
                   extension: undefined
                   engine: any
               }
             | undefined
         headlessFeaturesFingerprint:
@@ -15,7 +28,7 @@
                   headlessRating: number
                   stealthRating: number
                   systemFonts: string
                   platformEstimate: any[]
                   chromium: boolean
                   likeHeadless: {
                       noChrome: boolean
@@ -24,28 +37,28 @@
                       noMimeTypes: boolean
                       notificationIsDenied: boolean
                       hasKnownBgColor: boolean
                       prefersLightColor: any
                       uaDataIsBlank: boolean
                       pdfIsDisabled: boolean
                       noTaskbar: boolean
                       hasVvpScreenRes: boolean
                       hasSwiftShader: any
                       noWebShare: any
                       noContentIndex: boolean
                       noContactsManager: boolean
                       noDownlinkMax: boolean
                   }
                   headless: {
                       webDriverIsOn: any
                       hasHeadlessUA: any
                       hasHeadlessWorkerUA: any
                   }
                   stealth: {
                       hasIframeProxy: boolean
                       hasHighChromeIndex: any
                       hasBadChromeRuntime: boolean
                       hasToStringProxy: boolean
                       hasBadWebGL: any
                   }
               }
             | undefined

packages/procaptcha/src/modules/Manager.ts

@@ -308,7 +308,7 @@ export function Manager(
             const blockNumber = getBlockNumber()
             const signer = getExtension(account).signer
 
-            const first = at<CaptchaWithProof>(challenge.captchas, 0)
+            const first = at(challenge.captchas, 0)
             if (!first.captcha.datasetId) {
                 throw new ProsopoDatasetError('CAPTCHA.INVALID_CAPTCHA_ID', {
                     context: { error: 'No datasetId set for challenge' },
@@ -384,7 +384,7 @@ export function Manager(
         }
         const index = state.index
         const solutions = state.solutions
-        const solution = at<string[]>(solutions, index)
+        const solution = at(solutions, index)
         if (solution.includes(hash)) {
             // remove the hash from the solution
             solution.splice(solution.indexOf(hash), 1)

packages/util/src/at.ts

@@ -16,20 +16,28 @@ export type AtOptions = {
     noWrap?: boolean // whether to wrap the index around the bounds of the array (true == no wrap, false == wrap indices)
 }
 // Get an element from an array, throwing an error if it's index is out of bounds or if the element is undefined or null (can be overridden with the options)
+
 export function at(str: string, index: number, options: AtOptions & { optional: true }): string | undefined
 export function at(str: string, index: number, options?: AtOptions): string
-export function at<T>(items: T[] | string, index: number, options: AtOptions & { optional: false }): T
-export function at<T>(
-    items: (T | undefined)[] | string,
+export function at<T extends readonly unknown[]>(
+    items: T,
     index: number,
     options: AtOptions & { optional: true }
-): T | undefined
-export function at<T>(items: T[], index: number, options?: AtOptions): T
-export function at<T>(items: T[] | string, index: number, options?: AtOptions): T {
+): T[number] | undefined
+export function at<T extends readonly unknown[]>(
+    items: T,
+    index: number,
+    options?: AtOptions
+): Exclude<T[number], undefined>
+export function at<T extends readonly unknown[]>(items: T | string, index: number, options?: AtOptions): T[number] {
     if (items.length === 0) {
         throw new Error('Array is empty')
     }
 
+    if (!isFinite(index)) {
+        throw new Error(`Index ${index} is not a finite number`)
+    }
+
     if (!options?.noWrap) {
         if (index > 0) {
             index = index % items.length

packages/util/src/get.ts

@@ -11,10 +11,9 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-export function get<T>(obj: T, key: unknown, required?: true): Exclude<T[keyof T], undefined>
-export function get<T>(obj: T, key: unknown, required: false): T[keyof T] | undefined
-export function get<T>(obj: unknown, key: string | number | symbol, required?: true): Exclude<T, undefined>
-export function get<T>(obj: unknown, key: string | number | symbol, required: false): T | undefined
+
+export function get<T>(obj: T, key: string | number | symbol, required?: true): Exclude<T[keyof T], undefined>
+export function get<T>(obj: T, key: string | number | symbol, required: false): T[keyof T] | undefined
 export function get<T, V>(obj: T, key: unknown, required = true): V {
     const value = obj[key as unknown as keyof T]
     if (required && value === undefined) {

packages/util/src/tests/at.test.ts

@@ -34,9 +34,17 @@ describe('at', () => {
         const a5: string = at('abc', 0)
         const a10: string = at('abc', 0, { optional: false })
         const a11: string | undefined = at('abc', 0, { optional: true })
-        const a12: undefined = at([undefined, undefined, undefined], 0)
+        const a12: never = at([undefined, undefined, undefined], 0)
         const a13: undefined = at([undefined, undefined, undefined], 0, { optional: true })
         const a14: undefined = at([undefined, undefined, undefined], 0, { optional: false })
+
+        const a15: string = at(['a', 'b', 'c'] as readonly string[], 0)
+    })
+
+    test('infinite index', () => {
+        expect(() => at([1, 2, 3], Infinity)).to.throw()
+        expect(() => at([1, 2, 3], -Infinity)).to.throw()
+        expect(() => at([1, 2, 3], NaN)).to.throw()
     })
 
     test('compatible with string', () => {