Merge pull request #41 from Piyushbijarania/ABI

Sync and add contract ABIs with base updates

Author: Zahnentferner

app/[oracleId]/InteractionClient.tsx

@@ -36,7 +36,7 @@ function isHexAddress(value: string | null): value is `0x${string}` {
 
 type PriceHistoryResult = readonly [readonly bigint[], readonly bigint[], readonly bigint[]]
 
-const PRICE_DECIMALS = 8
+const PRICE_DECIMALS = 18
 const DISPLAY_PRECISION = 6
 const MAX_PRICE_POINTS = 20
 
@@ -202,10 +202,10 @@ export default function OracleInteractionPage() {
     query: { enabled: !!oracleAddress && !!userAddress }
   })
 
-  const { data: lastSubmissionTimeData } = useReadContract({
+  const { data: lastUpdatedData } = useReadContract({
     address: oracleAddress || undefined,
     abi: OracleAbi,
-    functionName: 'lastSubmissionTime',
+    functionName: 'lastUpdated',
     query: { enabled: !!oracleAddress }
   })
 
@@ -380,8 +380,8 @@ export default function OracleInteractionPage() {
     if (tokenAllowanceData !== undefined) {
       setTokenAllowance(formatTokenAmount(tokenAllowanceData as bigint, 4))
     }
-    if (lastSubmissionTimeData) {
-      const timestamp = Number(lastSubmissionTimeData as bigint)
+    if (lastUpdatedData) {
+      const timestamp = Number(lastUpdatedData as bigint)
       const now = Math.floor(Date.now() / 1000)
       const diff = now - timestamp
       if (diff < 60) {
@@ -439,7 +439,7 @@ export default function OracleInteractionPage() {
       }
     }
 
-  }, [lockedTokensData, unlockedTokensData, userTokenBalanceData, tokenAllowanceData, formatTokenAmount, weightTokenDecimals, lastSubmissionTimeData, rewardData, halfLifeSecondsData, quorumData, operationLockingPeriodData, withdrawalLockingPeriodData, alphaData, depositTimestampData, lastOperationTimestampData])
+  }, [lockedTokensData, unlockedTokensData, userTokenBalanceData, tokenAllowanceData, formatTokenAmount, weightTokenDecimals, lastUpdatedData, rewardData, halfLifeSecondsData, quorumData, operationLockingPeriodData, withdrawalLockingPeriodData, alphaData, depositTimestampData, lastOperationTimestampData])
 
   // Early validation before calling the hook
   if (!oracleAddress || !chainIdValid) {
@@ -553,14 +553,11 @@ export default function OracleInteractionPage() {
 
     try {
       setIsSubmitting(true)
-      // Convert to int256 - the value should be a scaled integer
-      // For example, if submitting 2500, multiply by 1e8 to get proper precision
-      const valueAsFloat = parseFloat(submitValue)
-      const valueAsInt = BigInt(Math.floor(valueAsFloat * (10**PRICE_DECIMALS)))
+      // Parse to bigint using exact decimals to prevent JS precision loss
+      const valueAsInt = parseUnits(submitValue, PRICE_DECIMALS)
 
       console.log('Submitting value:', {
         original: submitValue,
-        asFloat: valueAsFloat,
         asInt: valueAsInt.toString(),
         oracleAddress: oracleAddress,
         userAddress: userAddress
@@ -891,7 +888,7 @@ export default function OracleInteractionPage() {
       }
 
       const attempt = async (account?: `0x${string}`) => {
-        const { result } = await publicClient.simulateContract({
+        const result = await publicClient.readContract({
           address: oracleAddress,
           abi: OracleAbi,
           functionName: fnName,

components/createOracle.tsx

@@ -31,6 +31,7 @@ export default function CreateOracleIntegrated() {
   const [depositLock, setDepositLock] = useState<string>('3600')
   const [withdrawLock, setWithdrawLock] = useState<string>('3600')
   const [alpha, setAlpha] = useState<string>('1')
+  const [defaultSampleSize, setDefaultSampleSize] = useState<string>('100')
 
   // UI state
   const [loadingCreation, setLoadingCreation] = useState<boolean>(false)
@@ -51,6 +52,7 @@ export default function CreateOracleIntegrated() {
     depositLock?: string
     withdrawLock?: string
     alpha?: string
+    defaultSampleSize?: string
   }>({})
 
   // Pre-fill owner with connected wallet address
@@ -77,9 +79,10 @@ export default function CreateOracleIntegrated() {
       BigInt(Number(depositLock || 0)),                                           // depositLockingPeriod
       BigInt(Number(withdrawLock || 0)),                                          // withdrawalLockingPeriod
       BigInt(Number(reward || 0)),                                                // rewardBps
-      BigInt(alpha || "0"),                                                       // gamma
+      BigInt(alpha && /^\d+$/.test(alpha) ? alpha : "0"),                         // gamma
+      BigInt(defaultSampleSize && /^\d+$/.test(defaultSampleSize) ? defaultSampleSize : "100"), // defaultSampleSize
     ] as const
-  }, [name, description, weightToken, reward, halfLifeSeconds, quorumBps, depositLock, withdrawLock, alpha])
+  }, [name, description, weightToken, reward, halfLifeSeconds, quorumBps, depositLock, withdrawLock, alpha, defaultSampleSize])
 
   const validateInputs = () => {
     const newErrors: any = {}
@@ -94,8 +97,10 @@ export default function CreateOracleIntegrated() {
     if (!depositLock) newErrors.depositLock = 'Deposit lock period is required'
     if (!withdrawLock) newErrors.withdrawLock = 'Withdrawal lock period is required'
     if (!alpha) newErrors.alpha = 'Alpha is required'
+    if (!defaultSampleSize) newErrors.defaultSampleSize = 'Default sample size is required'
 
     if (Number(reward) < 0) newErrors.reward = 'Reward cannot be negative'
+    if (Number(defaultSampleSize) <= 0) newErrors.defaultSampleSize = 'Default sample size must be greater than 0'
     if (Number(quorumBps) < 0 || Number(quorumBps) > 10000) newErrors.quorumBps = 'Quorum must be between 0 and 10000'
 
     setErrors(newErrors)
@@ -607,6 +612,39 @@ export default function CreateOracleIntegrated() {
               />
               {errors.alpha && <p className="text-red-400 text-xs">{errors.alpha}</p>}
             </div>
+
+            <div className="space-y-1">
+              <div className="flex items-center gap-2 mb-2">
+                <Label htmlFor="defaultSampleSize" className="text-slate-100 text-md">
+                  Default Lookback Sample Size *
+                </Label>
+                <button
+                  type="button"
+                  className="text-slate-300 hover:text-slate-100 transition-colors"
+                  onMouseEnter={() => setShowTooltip('defaultSampleSize')}
+                  onMouseLeave={() => setShowTooltip(null)}
+                >
+                  <Info className="h-3 w-3" />
+                </button>
+                {showTooltip === 'defaultSampleSize' && (
+                  <div className="absolute z-10 bg-slate-800 text-slate-100 text-xs p-2 rounded shadow-lg mt-6">
+                    The default number of historical price points used for min/max calculations
+                  </div>
+                )}
+              </div>
+              <Input
+                id="defaultSampleSize"
+                type="number"
+                min={1}
+                step={1}
+                placeholder="100"
+                value={defaultSampleSize}
+                onChange={(e) => setDefaultSampleSize(e.target.value)}
+                required
+                className={`border-0 bg-slate-800/50 text-slate-100 placeholder:text-slate-400 text-md border border-blue-100 ${errors.defaultSampleSize ? 'border-red-500' : ''}`}
+              />
+              {errors.defaultSampleSize && <p className="text-red-400 text-xs">{errors.defaultSampleSize}</p>}
+            </div>
           </CardContent>
         </Card>
 

components/oracle-card.tsx

@@ -38,7 +38,7 @@ export function OracleCard({ oracle }: OracleCardProps) {
           <div className="space-y-3 text-xs text-muted-foreground">
             <div className="flex items-center justify-between">
               <span className="uppercase tracking-wide text-muted-foreground/70">Last Submission</span>
-              <span className="text-foreground/90 font-medium">{oracle.lastSubmissionTime}</span>
+              <span className="text-foreground/90 font-medium">{oracle.lastUpdated}</span>
             </div>
             <div className="flex items-center justify-between">
               <span className="uppercase tracking-wide text-muted-foreground/70">Last Activity</span>

hooks/useOracles.ts

@@ -32,7 +32,7 @@ export interface Oracle {
   updateFrequency: string
   accuracy: string
   lastUpdate: string
-  lastSubmissionTime: string
+  lastUpdated: string
   lastTimestamp: string
 }
 
@@ -74,7 +74,7 @@ export function useOracles() {
         const oraclePromises = oracleInfos.map(async (info: any, index: number) => {
           try {
             // Read oracle name and description from the contract
-            const [name, description, lastSubmissionTime, lastTimestamp] = await Promise.all([
+            const [name, description, lastUpdated, lastTimestamp] = await Promise.all([
               readContract(config, {
                 address: info.oracle as `0x${string}`,
                 abi: OracleAbi,
@@ -88,7 +88,7 @@ export function useOracles() {
               readContract(config, {
                 address: info.oracle as `0x${string}`,
                 abi: OracleAbi,
-                functionName: 'lastSubmissionTime',
+                functionName: 'lastUpdated',
               }).catch(() => BigInt(0)),
               readContract(config, {
                 address: info.oracle as `0x${string}`,
@@ -109,7 +109,7 @@ export function useOracles() {
               updateFrequency: '1min',
               accuracy: '99.9%',
               lastUpdate: new Date().toISOString(),
-              lastSubmissionTime: formatTimestamp(lastSubmissionTime as bigint),
+              lastUpdated: formatTimestamp(lastUpdated as bigint),
               lastTimestamp: formatTimestamp(lastTimestamp as bigint),
             }
           } catch (err) {
@@ -126,7 +126,7 @@ export function useOracles() {
               updateFrequency: 'Unknown',
               accuracy: 'Unknown',
               lastUpdate: new Date().toISOString(),
-              lastSubmissionTime: '—',
+              lastUpdated: '—',
               lastTimestamp: '—',
             }
           }
@@ -185,7 +185,7 @@ export function useOracle(oracleAddress: string, targetChainId?: number) {
 
       try {
         // Read oracle details from the contract
-        const [name, description, lastSubmissionTime, lastTimestamp] = await Promise.all([
+        const [name, description, lastUpdated, lastTimestamp] = await Promise.all([
           readContract(config, {
             address: oracleAddress as `0x${string}`,
             abi: OracleAbi,
@@ -199,7 +199,7 @@ export function useOracle(oracleAddress: string, targetChainId?: number) {
           readContract(config, {
             address: oracleAddress as `0x${string}`,
             abi: OracleAbi,
-            functionName: 'lastSubmissionTime',
+            functionName: 'lastUpdated',
           }).catch(() => BigInt(0)),
           readContract(config, {
             address: oracleAddress as `0x${string}`,
@@ -220,7 +220,7 @@ export function useOracle(oracleAddress: string, targetChainId?: number) {
           updateFrequency: '1min',
           accuracy: '99.9%',
           lastUpdate: new Date().toISOString(),
-          lastSubmissionTime: formatTimestamp(lastSubmissionTime as bigint),
+          lastUpdated: formatTimestamp(lastUpdated as bigint),
           lastTimestamp: formatTimestamp(lastTimestamp as bigint),
         })
       } catch (err) {
@@ -238,7 +238,7 @@ export function useOracle(oracleAddress: string, targetChainId?: number) {
           updateFrequency: 'Unknown',
           accuracy: 'Unknown',
           lastUpdate: new Date().toISOString(),
-          lastSubmissionTime: '—',
+          lastUpdated: '—',
           lastTimestamp: '—',
         })
       } finally {

utils/abi/ComposedOracle.ts

@@ -0,0 +1,41 @@
+export const ComposedOracleAbi = [
+  {
+    "type": "constructor",
+    "inputs": [
+      { "name": "_feedA", "type": "address", "internalType": "address" },
+      { "name": "_feedB", "type": "address", "internalType": "address" },
+      { "name": "_invertResult", "type": "bool", "internalType": "bool" },
+      { "name": "_defaultSampleSize", "type": "uint256", "internalType": "uint256" }
+    ],
+    "stateMutability": "nonpayable"
+  },
+
+  // Public immutable config
+  { "type": "function", "name": "feedA", "inputs": [], "outputs": [{ "type": "address", "internalType": "address" }], "stateMutability": "view" },
+  { "type": "function", "name": "feedB", "inputs": [], "outputs": [{ "type": "address", "internalType": "address" }], "stateMutability": "view" },
+  { "type": "function", "name": "invertResult", "inputs": [], "outputs": [{ "type": "bool", "internalType": "bool" }], "stateMutability": "view" },
+  { "type": "function", "name": "defaultSampleSize", "inputs": [], "outputs": [{ "type": "uint256", "internalType": "uint256" }], "stateMutability": "view" },
+
+  // Core view actions
+  { "type": "function", "name": "readValue", "inputs": [], "outputs": [{ "type": "uint256", "internalType": "uint256" }], "stateMutability": "view" },
+  { "type": "function", "name": "readLatestValue", "inputs": [], "outputs": [{ "type": "uint256", "internalType": "uint256" }], "stateMutability": "view" },
+  {
+    "type": "function",
+    "name": "readValueInterval",
+    "inputs": [],
+    "outputs": [
+      { "name": "minValue", "type": "uint256", "internalType": "uint256" },
+      { "name": "maxValue", "type": "uint256", "internalType": "uint256" }
+    ],
+    "stateMutability": "view"
+  },
+  { "type": "function", "name": "lastUpdated", "inputs": [], "outputs": [{ "type": "uint256", "internalType": "uint256" }], "stateMutability": "view" },
+  { "type": "function", "name": "isBlacklisted", "inputs": [{ "name": "target", "type": "address", "internalType": "address" }], "outputs": [{ "type": "bool", "internalType": "bool" }], "stateMutability": "view" },
+
+  // Errors
+  { "type": "error", "name": "DivisionByZero", "inputs": [] },
+  { "type": "error", "name": "InvalidFeedAddress", "inputs": [] },
+  { "type": "error", "name": "BlacklistedCaller", "inputs": [] },
+  { "type": "error", "name": "EmptyHistory", "inputs": [] },
+  { "type": "error", "name": "InvalidSampleSize", "inputs": [] }
+] as const;