Merge pull request #102 from CheesecakeLabs/fix_contracts_restore

fix restore contract data
CheesecakeLabs · Feb 1, 2024 · e48061f · e48061f
2 parents 1e01588 + 9255413
commit e48061f
Show file tree

Hide file tree

Showing 6 changed files with 272 additions and 136 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -51,7 +51,7 @@
     "react-slick": "^0.29.0",
     "react-timeago": "^7.1.0",
     "sass": "~1.59.2",
-    "stellar-plus": "^0.5.6",
+    "stellar-plus": "^0.5.7",
     "swiper": "^10.2.0",
     "typescript": "~4.9.5",
     "web-vitals": "~3.3.0",

diff --git a/frontend/src/app/core/pages/contracts-detail/index.tsx b/frontend/src/app/core/pages/contracts-detail/index.tsx
@@ -6,12 +6,12 @@ import { useNavigate, useParams } from 'react-router-dom'
 import { useAuth } from 'hooks/useAuth'
 import { useContracts } from 'hooks/useContracts'
 import { useTransactions } from 'hooks/useTransactions'
+import { ContractsService } from 'soroban/contracts-service'
 import { MessagesError } from 'utils/constants/messages-error'
 
 import { PathRoute } from 'components/enums/path-route'
 import { Sidebar } from 'components/organisms/sidebar'
 import { ContractsDetailTemplate } from 'components/templates/contracts-detail'
-import { ContractsService } from 'soroban/contracts-service'
 
 export const ContractsDetail: React.FC = () => {
   const {
@@ -107,7 +107,7 @@ export const ContractsDetail: React.FC = () => {
         let timeLeft = contractData?.timeLeft
 
         await ContractsService.validateContract(sponsor, contract.address)
-        
+
         const position =
           Number(
             (await getPosition(wallet, contract.address, wallet, sponsor)) || 0

diff --git a/frontend/src/components/templates/contracts-detail/index.tsx b/frontend/src/components/templates/contracts-detail/index.tsx
@@ -54,7 +54,7 @@ export const ContractsDetailTemplate: React.FC<IContractsDetailTemplate> = ({
   currentInVault,
   hasAssetInVault,
   hasWallet,
-  timerCounter
+  timerCounter,
 }) => {
   return (
     <Flex flexDir="column" w="full">
@@ -111,7 +111,9 @@ export const ContractsDetailTemplate: React.FC<IContractsDetailTemplate> = ({
                   onSubmit={onSubmitWithdraw}
                   contract={contract}
                   loading={isWithdrawing}
-                  isDone={!timerCounter || timerCounter === 0}
+                  isDone={
+                    contractData.timeLeft ? contractData.timeLeft < 0 : false
+                  }
                   withdrawValue={
                     contractData.timeLeft && contractData.timeLeft > 0
                       ? Number(contractData.estimatedPrematureWithdraw)

diff --git a/frontend/src/hooks/useContracts/context.tsx b/frontend/src/hooks/useContracts/context.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { createContext, useCallback, useState } from 'react'
 
 import freighter from '@stellar/freighter-api'
@@ -7,6 +8,12 @@ import { CustomAccountHandler } from 'soroban'
 import { STELLAR_NETWORK, WASM_HASH, vcRpcHandler } from 'soroban/constants'
 import { BUMP_FEE, ContractsService } from 'soroban/contracts-service'
 import { StellarPlus } from 'stellar-plus'
+import { ContractEngineErrorCodes } from 'stellar-plus/lib/stellar-plus/core/contract-engine/errors'
+import { StellarPlusError } from 'stellar-plus/lib/stellar-plus/error'
+import {
+  SimulationErrorInfo,
+  restoreData,
+} from 'stellar-plus/lib/stellar-plus/error/helpers/soroban-rpc'
 import { CertificateOfDepositClient } from 'stellar-plus/lib/stellar-plus/soroban/contracts/certificate-of-deposit'
 import {
   FeeBumpTransaction,
@@ -145,7 +152,10 @@ export const ContractsProvider: React.FC<IProps> = ({ children }) => {
     [getAccountData]
   )
 
-  const getContractData = (contractId: string, sponsorPK: string): CertificateOfDepositClient => {
+  const getContractData = (
+    contractId: string,
+    sponsorPK: string
+  ): CertificateOfDepositClient => {
     const opex = ContractsService.loadAccount(sponsorPK)
     const restoreTxInvocation = ContractsService.getTxInvocation(opex, BUMP_FEE)
 
@@ -211,21 +221,46 @@ export const ContractsProvider: React.FC<IProps> = ({ children }) => {
     }
   }
 
+  const restoreData = async (
+    sponsorPk: string,
+    stellarPlusError: StellarPlusError,
+    contract: CertificateOfDepositClient
+  ): Promise<void> => {
+    const opex = ContractsService.loadAccount(sponsorPk)
+    const restoreTxInvocation = ContractsService.getTxInvocation(opex, BUMP_FEE)
+    const restoreData = stellarPlusError.meta
+      ?.sorobanSimulationData as restoreData
+
+    await contract.restoreFootprint({
+      ...restoreTxInvocation,
+      restorePreamble: restoreData.restorePreamble,
+    })
+  }
+
   const getPosition = async (
     address: string,
     contractId: string,
     sourcePk: string,
     sponsorPk: string
   ): Promise<number | undefined> => {
+    const contract = getContractData(contractId, sponsorPk)
     try {
-      const contract = getContractData(contractId, sponsorPk)
-
-      return contract.getPosition({
+      const result = await contract.getPosition({
         address: address,
         ...userTxInvocation(sourcePk),
       })
+      return result
     } catch (e) {
-      return
+      const stellarPlusError = e as StellarPlusError
+      if (stellarPlusError.code === ContractEngineErrorCodes.CE102) {
+        restoreData(sponsorPk, stellarPlusError, contract)
+      }
+
+      const result = await contract.getPosition({
+        address: address,
+        ...userTxInvocation(sourcePk),
+      })
+      return result
     }
   }
 
@@ -235,14 +270,24 @@ export const ContractsProvider: React.FC<IProps> = ({ children }) => {
     sourcePk: string,
     sponsorPk: string
   ): Promise<number | undefined> => {
+    const contract = getContractData(contractId, sponsorPk)
     try {
-      const contract = getContractData(contractId, sponsorPk)
-      return contract.getEstimatedYield({
+      const result = await contract.getEstimatedYield({
         address: address,
         ...userTxInvocation(sourcePk),
       })
+      return result
     } catch (e) {
-      return
+      const stellarPlusError = e as StellarPlusError
+      if (stellarPlusError.code === ContractEngineErrorCodes.CE102) {
+        restoreData(sponsorPk, stellarPlusError, contract)
+      }
+
+      const result = await contract.getEstimatedYield({
+        address: address,
+        ...userTxInvocation(sourcePk),
+      })
+      return result
     }
   }
 
@@ -252,14 +297,24 @@ export const ContractsProvider: React.FC<IProps> = ({ children }) => {
     sourcePk: string,
     sponsorPk: string
   ): Promise<number | undefined> => {
+    const contract = getContractData(contractId, sponsorPk)
     try {
-      const contract = getContractData(contractId, sponsorPk)
-      return contract.getEstimatedPrematureWithdraw({
+      const result = await contract.getEstimatedPrematureWithdraw({
         address: address,
         ...userTxInvocation(sourcePk),
       })
+      return result
     } catch (e) {
-      return
+      const stellarPlusError = e as StellarPlusError
+      if (stellarPlusError.code === ContractEngineErrorCodes.CE102) {
+        restoreData(sponsorPk, stellarPlusError, contract)
+      }
+
+      const result = await contract.getEstimatedPrematureWithdraw({
+        address: address,
+        ...userTxInvocation(sourcePk),
+      })
+      return result
     }
   }
 
@@ -269,14 +324,24 @@ export const ContractsProvider: React.FC<IProps> = ({ children }) => {
     sourcePk: string,
     sponsorPk: string
   ): Promise<number | undefined> => {
+    const contract = getContractData(contractId, sponsorPk)
     try {
-      const contract = getContractData(contractId, sponsorPk)
-      return contract.getTimeLeft({
+      const result = await contract.getTimeLeft({
         address: address,
         ...userTxInvocation(sourcePk),
       })
+      return result
     } catch (e) {
-      return
+      const stellarPlusError = e as StellarPlusError
+      if (stellarPlusError.code === ContractEngineErrorCodes.CE102) {
+        restoreData(sponsorPk, stellarPlusError, contract)
+      }
+
+      const result = await contract.getTimeLeft({
+        address: address,
+        ...userTxInvocation(sourcePk),
+      })
+      return result
     }
   }
 

diff --git a/frontend/src/soroban/constants.ts b/frontend/src/soroban/constants.ts
@@ -3,7 +3,7 @@ import { StellarPlus } from "stellar-plus";
 export const STELLAR_NETWORK = StellarPlus.Constants.testnet
 
 export const WASM_HASH =
-  '6cc0156febf6f2b83fa46f5b5ec58f516a05e7921dbe4d33398e735e3af203d8'
+  '3e74bccc06fba85a5e0f25cb0488754ef4224d1cd44ed1c409e032abc46fe4fd'
 
 export const vcRpcHandler = new StellarPlus.RPC.ValidationCloudRpcHandler(
   STELLAR_NETWORK,