mimic-protocol · ncomerci · Dec 19, 2025 · Dec 4, 2025 · Dec 4, 2025 · Dec 4, 2025
diff --git a/.changeset/spicy-flowers-end.md b/.changeset/spicy-flowers-end.md
@@ -0,0 +1,7 @@
+---
+"@mimicprotocol/test-ts": patch
+"@mimicprotocol/lib-ts": patch
+"@mimicprotocol/cli": patch
+---
+
+Handle oracle query errors
diff --git a/packages/cli/src/lib/AbisInterfaceGenerator/FunctionHandler.ts b/packages/cli/src/lib/AbisInterfaceGenerator/FunctionHandler.ts
@@ -89,21 +89,21 @@ export default class FunctionHandler {
       isPayable ? `${methodParams.length > 0 ? ', ' : ''}value: ${LibTypes.BigInt}` : ''
     )
 
-    lines.push(`  ${methodName}(${fullMethodParams}): ${returnType} {`)
+    lines.push(`${methodName}(${fullMethodParams}): ${returnType} {`)
 
     lines.push(
-      `    const encodedData = ${contractName}Utils.encode${capitalizedName}(${inputs.map((p) => p.escapedName!).join(', ')})`
+      `const encodedData = ${contractName}Utils.encode${capitalizedName}(${inputs.map((p) => p.escapedName!).join(', ')})`
     )
 
     importManager.addType(LibTypes.Bytes)
     importManager.addType('EvmCallBuilder')
     if (isPayable) importManager.addType(LibTypes.BigInt)
 
     lines.push(
-      `    return EvmCallBuilder.forChain(this._chainId).addCall(this._address, encodedData${isPayable ? ', value' : ''})`
+      `return EvmCallBuilder.forChain(this._chainId).addCall(this._address, encodedData${isPayable ? ', value' : ''})`
     )
 
-    lines.push(`  }`)
+    lines.push(`}`)
     lines.push('')
   }
 
@@ -122,23 +122,33 @@ export default class FunctionHandler {
     const methodName = fn.escapedName || fn.name
     const capitalizedName = this.getCapitalizedName(fn)
 
-    lines.push(`  ${methodName}(${methodParams}): ${returnType} {`)
+    importManager.addType('environment')
+    importManager.addType('Result')
+    const isVoid = returnType === 'void'
+    if (isVoid) importManager.addType(LibTypes.Void)
+
+    const resultReturnType = isVoid ? `Result<${LibTypes.Void}, string>` : `Result<${returnType}, string>`
+    lines.push(`${methodName}(${methodParams}): ${resultReturnType} {`)
 
     lines.push(
-      `    const encodedData = ${contractName}Utils.encode${capitalizedName}(${inputs.map((p) => p.escapedName!).join(', ')})`
+      `const encodedData = ${contractName}Utils.encode${capitalizedName}(${inputs.map((p) => p.escapedName!).join(', ')})`
     )
 
-    importManager.addType('environment')
     const contractCallLine = `environment.evmCallQuery(this._address, this._chainId, encodedData.toHexString(), this._timestamp)`
 
-    if (returnType === 'void') {
-      lines.push(`    ${contractCallLine}`)
+    lines.push(`const response = ${contractCallLine}`)
+    lines.push(
+      `if (response.isError) return Result.err<${isVoid ? LibTypes.Void : returnType}, string>(response.error)`
+    )
+
+    if (isVoid) {
+      lines.push(`return Result.ok<${LibTypes.Void}, string>(new ${LibTypes.Void}())`)
     } else {
-      lines.push(`    const response = ${contractCallLine}`)
-      lines.push(`    return ${contractName}Utils.decode${capitalizedName}(response)`)
+      lines.push(`const decoded = ${contractName}Utils.decode${capitalizedName}(response.value)`)
+      lines.push(`return Result.ok<${returnType}, string>(decoded)`)
     }
 
-    lines.push(`  }`)
+    lines.push(`}`)
     lines.push('')
   }
 }
diff --git a/packages/cli/src/lib/AbisInterfaceGenerator/types.ts b/packages/cli/src/lib/AbisInterfaceGenerator/types.ts
@@ -8,6 +8,8 @@ export type ImportedTypes =
   | 'EvmDecodeParam'
   | 'JSON'
   | 'EvmCallBuilder'
+  | 'Result'
+
 export type MapBaseTypeCallback = (param: AbiParameter) => string
 export type TupleDefinition = {
   className: string

diff --git a/packages/cli/src/types.ts b/packages/cli/src/types.ts
@@ -29,6 +29,7 @@ export enum LibTypes {
   Bytes = 'Bytes',
   ChainId = 'ChainId',
   TokenAmount = 'TokenAmount',
+  Void = 'Void',
 }
 
 export enum AssemblyPrimitiveTypes {

diff --git a/packages/cli/tests/AbisInterfaceGenerator.spec.ts b/packages/cli/tests/AbisInterfaceGenerator.spec.ts
@@ -99,7 +99,7 @@ describe('AbisInterfaceGenerator', () => {
 
       const result = AbisInterfaceGenerator.generate(abi, CONTRACT_NAME)
 
-      expect(result).to.contain(`getData(): ${LibTypes.BigInt} {`)
+      expect(result).to.contain(`getData(): Result<${LibTypes.BigInt}, string> {`)
       expect(result).to.contain(`getData_1(id: ${LibTypes.BigInt}): EvmCallBuilder {`)
       expect(result).to.contain(
         `getData_2(id: ${LibTypes.BigInt}, flag: ${AssemblyPrimitiveTypes.bool}, value: ${LibTypes.BigInt}): EvmCallBuilder {`
@@ -120,10 +120,10 @@ describe('AbisInterfaceGenerator', () => {
 
       const result = AbisInterfaceGenerator.generate(abi, CONTRACT_NAME)
 
-      expect(result).to.contain(`getBalance(): ${LibTypes.BigInt} {`)
+      expect(result).to.contain(`getBalance(): Result<${LibTypes.BigInt}, string> {`)
       expect(result).to.contain(`transfer(to: ${LibTypes.Address}): EvmCallBuilder {`)
-      expect(result).to.contain(`getBalance_1(owner: ${LibTypes.Address}): ${LibTypes.BigInt} {`)
-      expect(result).to.contain(`getName(): ${AssemblyPrimitiveTypes.string} {`)
+      expect(result).to.contain(`getBalance_1(owner: ${LibTypes.Address}): Result<${LibTypes.BigInt}, string> {`)
+      expect(result).to.contain(`getName(): Result<${AssemblyPrimitiveTypes.string}, string> {`)
       expect(result).to.contain(
         `transfer_1(to: ${LibTypes.Address}, amount: ${LibTypes.BigInt}, value: ${LibTypes.BigInt}): EvmCallBuilder {`
       )
@@ -137,7 +137,7 @@ describe('AbisInterfaceGenerator', () => {
 
       const result = AbisInterfaceGenerator.generate(abi, CONTRACT_NAME)
 
-      expect(result).to.contain(`constructor_(): ${LibTypes.BigInt} {`)
+      expect(result).to.contain(`constructor_(): Result<${LibTypes.BigInt}, string> {`)
       expect(result).to.contain(`constructor_1(value: ${LibTypes.BigInt}): EvmCallBuilder {`)
     })
   })
@@ -239,7 +239,9 @@ describe('AbisInterfaceGenerator', () => {
       expect(result).to.contain(
         `const response = environment.evmCallQuery(this._address, this._chainId, encodedData.toHexString(), this._timestamp)`
       )
-      expect(result).to.contain(`return ${CONTRACT_NAME}Utils.decodeGetBalance(response)`)
+      expect(result).to.contain(`if (response.isError) return Result.err<${LibTypes.BigInt}, string>(response.error)`)
+      expect(result).to.contain(`const decoded = ${CONTRACT_NAME}Utils.decodeGetBalance(response.value)`)
+      expect(result).to.contain(`return Result.ok<${LibTypes.BigInt}, string>(decoded)`)
       expect(result).to.contain(`export class ${CONTRACT_NAME}Utils {`)
       expect(result).to.contain(`static encodeGetBalance(owner: Address): Bytes {`)
       expect(result).to.contain(`static decodeGetBalance(encodedResponse: string): BigInt {`)
@@ -311,12 +313,14 @@ describe('AbisInterfaceGenerator', () => {
 
       const selector = getFunctionSelector(abi[0])
 
-      expect(result).to.contain(`${functionName}(): void {`)
+      expect(result).to.contain(`${functionName}(): Result<Void, string> {`)
       expect(result).to.contain(`static encodeNoReturn(): Bytes {`)
       expect(result).to.contain(`return ${LibTypes.Bytes}.fromHexString('${selector}')`)
       expect(result).to.contain(
         `environment.evmCallQuery(this._address, this._chainId, encodedData.toHexString(), this._timestamp)`
       )
+      expect(result).to.contain(`if (response.isError) return Result.err<Void, string>(response.error)`)
+      expect(result).to.contain(`return Result.ok<Void, string>(new Void())`)
       expect(result).not.to.contain(`_decodeNoReturnResponse`)
     })
   })
@@ -341,6 +345,7 @@ describe('AbisInterfaceGenerator', () => {
       expect(importMatch).to.contain('EvmDecodeParam')
       expect(importMatch).to.contain('evm')
       expect(importMatch).to.contain('environment')
+      expect(importMatch).to.contain('Result')
     })
   })
 
@@ -863,7 +868,7 @@ describe('AbisInterfaceGenerator', () => {
 
       expect(result).to.contain('static encodeGetBalance(owner: Address): Bytes {')
       expect(result).to.contain('static decodeGetBalance(encodedResponse: string): BigInt {')
-      expect(result).to.contain('getBalance(owner: Address): BigInt {')
+      expect(result).to.contain('getBalance(owner: Address): Result<BigInt, string> {')
     })
 
     it('should generate encoded data method for write functions', () => {
@@ -887,7 +892,7 @@ describe('AbisInterfaceGenerator', () => {
       const result = AbisInterfaceGenerator.generate(abi, CONTRACT_NAME)
 
       expect(result).to.contain('static encodeValidate(data: Bytes): Bytes {')
-      expect(result).to.contain('validate(data: Bytes): void {')
+      expect(result).to.contain('validate(data: Bytes): Result<Void, string> {')
       expect(result).not.to.contain('_decodeValidateResponse')
     })
 
@@ -901,7 +906,9 @@ describe('AbisInterfaceGenerator', () => {
 
       // Read function should call both helpers
       expect(result).to.contain(`const encodedData = ${CONTRACT_NAME}Utils.encodeGetValue()`)
-      expect(result).to.contain(`return ${CONTRACT_NAME}Utils.decodeGetValue(response)`)
+      expect(result).to.contain(`if (response.isError) return Result.err<${LibTypes.BigInt}, string>(response.error)`)
+      expect(result).to.contain(`const decoded = ${CONTRACT_NAME}Utils.decodeGetValue(response.value)`)
+      expect(result).to.contain(`return Result.ok<${LibTypes.BigInt}, string>(decoded)`)
 
       // Write function should call encoded data helper
       expect(result).to.contain(`const encodedData = ${CONTRACT_NAME}Utils.encodeSetValue(value)`)

diff --git a/packages/integration/tests/005-get-price-query/mock.json b/packages/integration/tests/005-get-price-query/mock.json
@@ -3,10 +3,10 @@
     "_tokenPriceQuery": {
       "log": true,
       "paramResponse": {
-        "{\"address\":\"0x2260fac5e5542a773aa44fbcfedf7c193bc2c599\",\"chainId\":1}": "[\"90000000000000000000000\"]",
-        "{\"address\":\"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48\",\"chainId\":1}": "[\"1000000000000000000\"]",
-        "{\"address\":\"0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee\",\"chainId\":1}": "[\"2000000000000000000000\"]",
-        "{\"address\":\"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48\",\"chainId\":1,\"timestamp\":1744818017000}": "[\"1000000000000000000\"]"
+        "{\"address\":\"0x2260fac5e5542a773aa44fbcfedf7c193bc2c599\",\"chainId\":1}": "{\"success\":\"true\",\"data\":[\"90000000000000000000000\"],\"error\":\"\"}",
+        "{\"address\":\"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48\",\"chainId\":1}": "{\"success\":\"true\",\"data\":[\"1000000000000000000000\"],\"error\":\"\"}",
+        "{\"address\":\"0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee\",\"chainId\":1}": "{\"success\":\"true\",\"data\":[\"2000000000000000000000\"],\"error\":\"\"}",
+        "{\"address\":\"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48\",\"chainId\":1,\"timestamp\":1744818017000}": "{\"success\":\"true\",\"data\":[\"1000000000000000000000\"],\"error\":\"\"}"
       }
     }
   }

diff --git a/packages/integration/tests/005-get-price-query/src/task.ts b/packages/integration/tests/005-get-price-query/src/task.ts
@@ -7,7 +7,7 @@ export default function main(): void {
 
   // Convert X amount of USDC to USD
   const usdcAmount = TokenAmount.fromStringDecimal(Ethereum.USDC, '1000.2')
-  usdcAmount.toUsd().toString()
+  usdcAmount.toUsd()
 
   // Convert USDC to ETH
   usdcAmount.toTokenAmount(Ethereum.ETH)

diff --git a/packages/integration/tests/006-get-relevant-tokens-query/mock.json b/packages/integration/tests/006-get-relevant-tokens-query/mock.json
@@ -2,7 +2,7 @@
   "environment": {
     "_relevantTokensQuery": {
       "log": true,
-      "default": "[]"
+      "default": "{\"success\":\"true\",\"data\":[],\"error\":\"\"}"
     }
   }
 }
diff --git a/packages/integration/tests/007-read-contract-calls-tests/mock.json b/packages/integration/tests/007-read-contract-calls-tests/mock.json
@@ -2,7 +2,7 @@
   "environment": {
     "_evmCallQuery": {
       "log": true,
-      "default": "0x047be3bb46f9416732fe39a05134f20235c19334"
+      "default": "{\"success\":\"true\",\"data\":\"0x047be3bb46f9416732fe39a05134f20235c19334\",\"error\":\"\"}"
     }
   },
   "evm": {

diff --git a/packages/integration/tests/008-write-contract-calls-tests/mock.json b/packages/integration/tests/008-write-contract-calls-tests/mock.json
@@ -2,10 +2,10 @@
   "environment": {
     "_evmCallQuery": {
       "log": true,
-      "default": "0x047be3bb46f9416732fe39a05134f20235c19334"
+      "default": "{\"success\":\"true\",\"data\":\"0x047be3bb46f9416732fe39a05134f20235c19334\",\"error\":\"\"}"
     },
     "_getContext": "{ \"timestamp\": 1438223173000, \"consensusThreshold\": 1, \"user\": \"0x756f45e3fa69347a9a973a725e3c98bc4db0b5a0\", \"settlers\": [{\"address\": \"0xdcf1d9d12a0488dfb70a8696f44d6d3bc303963d\", \"chainId\": 10}], \"configSig\": \"682ec8210b1ce912da4d2952\"}",
-    "_relevantTokensQuery": "[{\"timestamp\":1438223173000,\"balances\":[{\"token\":{\"address\":\"0x625e7708f30ca75bfd92586e17077590c60eb4cd\",\"chainId\":10},\"balance\":\"100000000\"}]}]",
+    "_relevantTokensQuery": "{\"success\":\"true\",\"data\":[{\"timestamp\":1438223173000,\"balances\":[{\"token\":{\"address\":\"0x625e7708f30ca75bfd92586e17077590c60eb4cd\",\"chainId\":10},\"balance\":\"100000000\"}]}],\"error\":\"\"}",
     "_call": {
       "log": true,
       "default": ""

diff --git a/packages/integration/tests/008-write-contract-calls-tests/src/task.ts b/packages/integration/tests/008-write-contract-calls-tests/src/task.ts
@@ -14,7 +14,16 @@ export default function main(): void {
 
   const context = environment.getContext()
 
-  const userTokens = environment.relevantTokensQuery(context.user, [chainId], USD.zero(), [aUSDC], ListType.AllowList)
+  const userTokensResult = environment.relevantTokensQuery(
+    context.user,
+    [chainId],
+    USD.zero(),
+    [aUSDC],
+    ListType.AllowList
+  )
+  if (userTokensResult.isError) throw new Error(userTokensResult.error)
+
+  const userTokens = userTokensResult.value
 
   const feeUsdt = TokenAmount.fromStringDecimal(USDT, inputs.usdFeeAmount)
 

diff --git a/packages/lib-ts/as-pect.config.js b/packages/lib-ts/as-pect.config.js
@@ -69,25 +69,33 @@ export default {
           const timestamp = params.timestamp
           const key = `_tokenPriceQuery:${address}:${chainId}${timestamp ? `:${timestamp}` : ''}`
 
-          if (store.has(key)) return exports.__newString(`["${store.get(key)}"]`)
-          throw new Error(`Price not found for key: ${key}`)
+          if (store.has(key)) {
+            const response = JSON.stringify(Result.ok([store.get(key).toString()]))
+            return exports.__newString(response)
+          }
+          return exports.__newString(JSON.stringify(Result.err(`Price not found for key: ${key}`)))
         },
         _evmCallQuery: (paramsPtr) => {
           const paramsStr = exports.__getString(paramsPtr)
           const params = JSON.parse(paramsStr)
           const key = `_evmCallQuery:${params.to.toLowerCase()}:${params.chainId}:${params.data.toLowerCase()}`
 
-          if (store.has(key)) return exports.__newString(store.get(key))
-          throw new Error(`Contract call result not found for key: ${key}`)
+          if (store.has(key)) return exports.__newString(JSON.stringify(Result.ok(store.get(key))))
+          return exports.__newString(JSON.stringify(Result.err(`Contract call result not found for key: ${key}`)))
         },
         _svmAccountsInfoQuery: (paramsPtr) => {
           const paramsStr = exports.__getString(paramsPtr)
           const params = JSON.parse(paramsStr)
           const publicKeys = params.publicKeys.join(',')
           const key = `_svmAccountsInfoQuery:${publicKeys}`
 
-          if (store.has(key)) return exports.__newString(store.get(key))
-          throw new Error(`Get accounts info result not found for key: ${key}`)
+          if (store.has(key)) {
+            const storedValue = store.get(key)
+            const accountsInfoData = typeof storedValue === 'string' ? JSON.parse(storedValue) : storedValue
+            return exports.__newString(JSON.stringify(Result.ok(accountsInfoData)))
+          }
+
+          return exports.__newString(JSON.stringify(Result.err(`Get accounts info result not found for key: ${key}`)))
         },
         _getContext: () => {
           const key = `_getContext`
@@ -168,3 +176,19 @@ export default {
    */
   outputBinary: false,
 }
+
+class Result {
+  constructor(success, data, error) {
+    this.success = success
+    this.data = data
+    this.error = error
+  }
+
+  static ok(data) {
+    return new Result(true, data, '')
+  }
+
+  static err(error) {
+    return new Result(false, '', error)
+  }
+}