From 15c0a256842d929e6fd45a6a3d4828248266deb7 Mon Sep 17 00:00:00 2001
From: Lucas Magnus <lucasmagnusdasilva@gmail.com>
Date: Fri, 5 Jan 2024 08:46:45 -0300
Subject: [PATCH] feat: refactor stellar-plus

---
 frontend/.idea/workspace.xml                  |   8 +-
 frontend/package-lock.json                    | 227 +++++++------
 frontend/package.json                         |   2 +-
 .../app/core/pages/contracts-create/index.tsx | 205 ++++++------
 frontend/src/hooks/useContracts/context.tsx   |  50 ++-
 frontend/src/interfaces/http/index.ts         |   2 +-
 frontend/src/soroban/Freighter.tsx            |  88 -----
 frontend/src/soroban/StellarHelpers.tsx       |  40 ---
 .../certificate-of-deposit/constants.ts       |  33 +-
 .../soroban/certificate-of-deposit/index.ts   | 245 ++++----------
 frontend/src/soroban/constants.ts             | 111 +------
 frontend/src/soroban/deployer/constants.ts    |  17 -
 frontend/src/soroban/deployer/index.ts        |  52 ---
 frontend/src/soroban/index.ts                 | 302 ------------------
 14 files changed, 343 insertions(+), 1039 deletions(-)
 delete mode 100644 frontend/src/soroban/Freighter.tsx
 delete mode 100644 frontend/src/soroban/StellarHelpers.tsx
 delete mode 100644 frontend/src/soroban/deployer/constants.ts
 delete mode 100644 frontend/src/soroban/deployer/index.ts
 delete mode 100644 frontend/src/soroban/index.ts

diff --git a/frontend/.idea/workspace.xml b/frontend/.idea/workspace.xml
index 60437f27..bf7627f6 100644
--- a/frontend/.idea/workspace.xml
+++ b/frontend/.idea/workspace.xml
@@ -4,9 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3170048c-93bf-4f45-9082-dcbf1deeed4f" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-    </list>
+    <list default="true" id="3170048c-93bf-4f45-9082-dcbf1deeed4f" name="Changes" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -29,6 +27,9 @@
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>
+  <component name="ProjectColorInfo"><![CDATA[{
+  "associatedIndex": 2
+}]]></component>
   <component name="ProjectId" id="2UL9FbTdEVJYYq9wrGas4Za4tP5" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
@@ -40,6 +41,7 @@
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "git-widget-placeholder": "feat__manage__asset",
+    "last_opened_file_path": "/Users/lucasmagnus/Projects/Stellar-Asset-Sandbox/frontend",
     "node.js.selected.package.tslint": "(autodetect)",
     "ts.external.directory.path": "/Users/marcosviniciusthomaz/Documents/projects/cheesecake_labs/backend/token-factory-v2/frontend/node_modules/typescript/lib"
   }
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index d9374f56..a5b5ad1d 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -19,6 +19,7 @@
         "@sentry/react": "^7.43.0",
         "@sentry/tracing": "^7.43.0",
         "@stellar/freighter-api": "^1.6.0",
+        "@stellar/stellar-sdk": "^11.1.0",
         "@storybook/react": "~6.5.16",
         "@types/react-dom": "~18.0.11",
         "apexcharts": "^3.41.1",
@@ -55,7 +56,6 @@
         "react-slick": "^0.29.0",
         "react-timeago": "^7.1.0",
         "sass": "~1.59.2",
-        "soroban-client": "^1.0.0",
         "swiper": "^10.2.0",
         "typescript": "~4.9.5",
         "web-vitals": "~3.3.0",
@@ -6477,6 +6477,59 @@
       "resolved": "https://registry.npmjs.org/@stellar/js-xdr/-/js-xdr-3.0.1.tgz",
       "integrity": "sha512-dp5Eh7Nr1YjiIeqpdkj2cQYxfoPudDAH3ck8MWggp48Htw66Z/hUssNYUQG/OftLjEmHT90Z/dtey2Y77DOxIw=="
     },
+    "node_modules/@stellar/stellar-base": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/@stellar/stellar-base/-/stellar-base-10.0.1.tgz",
+      "integrity": "sha512-BDbx7VHOEQh+4J3Q+gStNXgPaNckVFmD4aOlBBGwxlF6vPFmVnW8IoJdkX7T58zpX55eWI6DXvEhDBlrqTlhAQ==",
+      "dependencies": {
+        "@stellar/js-xdr": "^3.0.1",
+        "base32.js": "^0.1.0",
+        "bignumber.js": "^9.1.2",
+        "buffer": "^6.0.3",
+        "sha.js": "^2.3.6",
+        "tweetnacl": "^1.0.3"
+      },
+      "optionalDependencies": {
+        "sodium-native": "^4.0.1"
+      }
+    },
+    "node_modules/@stellar/stellar-sdk": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/@stellar/stellar-sdk/-/stellar-sdk-11.1.0.tgz",
+      "integrity": "sha512-Ufw+4udr7lqyzPIhqSAzBTgcl/YlgFZLgeBlDr5ZZy1v+g7AT4dOZFurcCrHt7Pz8DGtVcxNX7GLxYLdOC3GIg==",
+      "dependencies": {
+        "@stellar/stellar-base": "10.0.1",
+        "axios": "^1.6.0",
+        "bignumber.js": "^9.1.2",
+        "eventsource": "^2.0.2",
+        "randombytes": "^2.1.0",
+        "toml": "^3.0.0",
+        "urijs": "^1.19.1"
+      }
+    },
+    "node_modules/@stellar/stellar-sdk/node_modules/axios": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.3.tgz",
+      "integrity": "sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==",
+      "dependencies": {
+        "follow-redirects": "^1.15.0",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
+      }
+    },
+    "node_modules/@stellar/stellar-sdk/node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/@storybook/addon-a11y": {
       "version": "6.5.16",
       "resolved": "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-6.5.16.tgz",
@@ -18691,6 +18744,14 @@
         "node": ">=0.8.x"
       }
     },
+    "node_modules/eventsource": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz",
+      "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/evp_bytestokey": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
@@ -33023,41 +33084,6 @@
         "node-gyp-build": "^4.6.0"
       }
     },
-    "node_modules/soroban-client": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/soroban-client/-/soroban-client-1.0.0.tgz",
-      "integrity": "sha512-dflXkSBpgmke9ATSaXdka4mvHOz9EyUFioho7ffLj0FwzwOMapSjFnE2TpQTrDKnV9C3HuAO44c8Fhl6IewebQ==",
-      "dependencies": {
-        "axios": "^1.6.0",
-        "bignumber.js": "^9.1.1",
-        "buffer": "^6.0.3",
-        "stellar-base": "10.0.0",
-        "urijs": "^1.19.1"
-      }
-    },
-    "node_modules/soroban-client/node_modules/axios": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
-      "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
-      "dependencies": {
-        "follow-redirects": "^1.15.0",
-        "form-data": "^4.0.0",
-        "proxy-from-env": "^1.1.0"
-      }
-    },
-    "node_modules/soroban-client/node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -33316,22 +33342,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/stellar-base": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/stellar-base/-/stellar-base-10.0.0.tgz",
-      "integrity": "sha512-WQhxGXQLSwwmIxWbZqv0HcJtlSOiaUgv7yKCCEwP+OoYDHKBjPjQiZWyAkuEY+mRFX9L+hnejLaBorc3P2rk0g==",
-      "dependencies": {
-        "@stellar/js-xdr": "^3.0.1",
-        "base32.js": "^0.1.0",
-        "bignumber.js": "^9.1.2",
-        "buffer": "^6.0.3",
-        "sha.js": "^2.3.6",
-        "tweetnacl": "^1.0.3"
-      },
-      "optionalDependencies": {
-        "sodium-native": "^4.0.1"
-      }
-    },
     "node_modules/stop-iteration-iterator": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
@@ -34507,6 +34517,11 @@
         "node": ">=0.6"
       }
     },
+    "node_modules/toml": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz",
+      "integrity": "sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w=="
+    },
     "node_modules/toposort": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
@@ -41519,6 +41534,56 @@
       "resolved": "https://registry.npmjs.org/@stellar/js-xdr/-/js-xdr-3.0.1.tgz",
       "integrity": "sha512-dp5Eh7Nr1YjiIeqpdkj2cQYxfoPudDAH3ck8MWggp48Htw66Z/hUssNYUQG/OftLjEmHT90Z/dtey2Y77DOxIw=="
     },
+    "@stellar/stellar-base": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/@stellar/stellar-base/-/stellar-base-10.0.1.tgz",
+      "integrity": "sha512-BDbx7VHOEQh+4J3Q+gStNXgPaNckVFmD4aOlBBGwxlF6vPFmVnW8IoJdkX7T58zpX55eWI6DXvEhDBlrqTlhAQ==",
+      "requires": {
+        "@stellar/js-xdr": "^3.0.1",
+        "base32.js": "^0.1.0",
+        "bignumber.js": "^9.1.2",
+        "buffer": "^6.0.3",
+        "sha.js": "^2.3.6",
+        "sodium-native": "^4.0.1",
+        "tweetnacl": "^1.0.3"
+      }
+    },
+    "@stellar/stellar-sdk": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/@stellar/stellar-sdk/-/stellar-sdk-11.1.0.tgz",
+      "integrity": "sha512-Ufw+4udr7lqyzPIhqSAzBTgcl/YlgFZLgeBlDr5ZZy1v+g7AT4dOZFurcCrHt7Pz8DGtVcxNX7GLxYLdOC3GIg==",
+      "requires": {
+        "@stellar/stellar-base": "10.0.1",
+        "axios": "^1.6.0",
+        "bignumber.js": "^9.1.2",
+        "eventsource": "^2.0.2",
+        "randombytes": "^2.1.0",
+        "toml": "^3.0.0",
+        "urijs": "^1.19.1"
+      },
+      "dependencies": {
+        "axios": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.3.tgz",
+          "integrity": "sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==",
+          "requires": {
+            "follow-redirects": "^1.15.0",
+            "form-data": "^4.0.0",
+            "proxy-from-env": "^1.1.0"
+          }
+        },
+        "form-data": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+          "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.8",
+            "mime-types": "^2.1.12"
+          }
+        }
+      }
+    },
     "@storybook/addon-a11y": {
       "version": "6.5.16",
       "resolved": "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-6.5.16.tgz",
@@ -50728,6 +50793,11 @@
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
     },
+    "eventsource": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz",
+      "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA=="
+    },
     "evp_bytestokey": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
@@ -61272,40 +61342,6 @@
         "node-gyp-build": "^4.6.0"
       }
     },
-    "soroban-client": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/soroban-client/-/soroban-client-1.0.0.tgz",
-      "integrity": "sha512-dflXkSBpgmke9ATSaXdka4mvHOz9EyUFioho7ffLj0FwzwOMapSjFnE2TpQTrDKnV9C3HuAO44c8Fhl6IewebQ==",
-      "requires": {
-        "axios": "^1.6.0",
-        "bignumber.js": "^9.1.1",
-        "buffer": "^6.0.3",
-        "stellar-base": "10.0.0",
-        "urijs": "^1.19.1"
-      },
-      "dependencies": {
-        "axios": {
-          "version": "1.6.2",
-          "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
-          "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
-          "requires": {
-            "follow-redirects": "^1.15.0",
-            "form-data": "^4.0.0",
-            "proxy-from-env": "^1.1.0"
-          }
-        },
-        "form-data": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-          "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.8",
-            "mime-types": "^2.1.12"
-          }
-        }
-      }
-    },
     "source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -61517,20 +61553,6 @@
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
       "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
     },
-    "stellar-base": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/stellar-base/-/stellar-base-10.0.0.tgz",
-      "integrity": "sha512-WQhxGXQLSwwmIxWbZqv0HcJtlSOiaUgv7yKCCEwP+OoYDHKBjPjQiZWyAkuEY+mRFX9L+hnejLaBorc3P2rk0g==",
-      "requires": {
-        "@stellar/js-xdr": "^3.0.1",
-        "base32.js": "^0.1.0",
-        "bignumber.js": "^9.1.2",
-        "buffer": "^6.0.3",
-        "sha.js": "^2.3.6",
-        "sodium-native": "^4.0.1",
-        "tweetnacl": "^1.0.3"
-      }
-    },
     "stop-iteration-iterator": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
@@ -62407,6 +62429,11 @@
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
     },
+    "toml": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz",
+      "integrity": "sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w=="
+    },
     "toposort": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 05eac890..90e42ab9 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -15,6 +15,7 @@
     "@sentry/react": "^7.43.0",
     "@sentry/tracing": "^7.43.0",
     "@stellar/freighter-api": "^1.6.0",
+    "@stellar/stellar-sdk": "^11.1.0",
     "@storybook/react": "~6.5.16",
     "@types/react-dom": "~18.0.11",
     "apexcharts": "^3.41.1",
@@ -51,7 +52,6 @@
     "react-slick": "^0.29.0",
     "react-timeago": "^7.1.0",
     "sass": "~1.59.2",
-    "soroban-client": "^1.0.0",
     "swiper": "^10.2.0",
     "typescript": "~4.9.5",
     "web-vitals": "~3.3.0",
diff --git a/frontend/src/app/core/pages/contracts-create/index.tsx b/frontend/src/app/core/pages/contracts-create/index.tsx
index 102fcba7..849ca2c8 100644
--- a/frontend/src/app/core/pages/contracts-create/index.tsx
+++ b/frontend/src/app/core/pages/contracts-create/index.tsx
@@ -3,21 +3,15 @@ import React, { useEffect, useState } from 'react'
 import { FieldValues } from 'react-hook-form'
 import { useNavigate } from 'react-router-dom'
 
+import { FeeBumpTransaction, Transaction } from '@stellar/stellar-sdk'
+import { Buffer } from 'buffer'
 import { useAssets } from 'hooks/useAssets'
 import { useContracts } from 'hooks/useContracts'
-import { useHorizon } from 'hooks/useHorizon'
 import { useTransactions } from 'hooks/useTransactions'
 import { useVaults } from 'hooks/useVaults'
-import { SorobanService } from 'soroban'
-import * as SorobanClient from 'soroban-client'
-import { sorobanConfig } from 'soroban/constants'
-import { deployerClient } from 'soroban/deployer'
-import {
-  allowancePeriod,
-  codSalt,
-  codWasmHash,
-} from 'soroban/deployer/constants'
-import { MessagesError } from 'utils/constants/messages-error'
+import { STELLAR_NETWORK, codWasmHash, vcRpcHandler } from 'soroban/constants'
+import { StellarPlus } from 'stellar-plus'
+import { TransactionXdr } from 'stellar-plus/lib/stellar-plus/types'
 
 import { PathRoute } from '../../../../components/enums/path-route'
 import { Sidebar } from 'components/organisms/sidebar'
@@ -26,17 +20,22 @@ import { TSelectCompoundType } from 'components/templates/contracts-create/compo
 
 export const ContractsCreate: React.FC = () => {
   const [creatingContract, setCreatingContract] = useState(false)
-  const [isGeneratedContractId, setGeneratedContractId] = useState(false)
 
   const { loadingAssets, assets, getAssets, updateContractId } = useAssets()
   const { createContract } = useContracts()
   const { vaults, loadingVaults, getVaults } = useVaults()
-  const { sign, submit, getSponsorPK } = useTransactions()
-  const { getLatestSequenceLedger } = useHorizon()
+  const { sign, getSponsorPK } = useTransactions()
 
   const toast = useToast()
   const navigate = useNavigate()
 
+  const customSign = async (
+    tx: Transaction | FeeBumpTransaction
+  ): Promise<TransactionXdr> => {
+    const signedTransaction = await sign({ envelope: tx.toXDR() })
+    return signedTransaction?.envelope || ''
+  }
+
   const onSubmit = async (
     data: FieldValues,
     asset: Hooks.UseAssetsTypes.IAssetDto,
@@ -50,16 +49,13 @@ export const ContractsCreate: React.FC = () => {
     try {
       setCreatingContract(true)
 
-      const contractId = asset.contract_id
-        ? asset.contract_id
-        : SorobanService.getContractId({
-            assetCode: asset.code,
-            assetIssuerPk: asset.issuer.key.publicKey,
-          })
+      const token = new StellarPlus.Asset.SACHandler({
+        code: asset.code,
+        issuerPublicKey: asset.issuer.key.publicKey,
+        network: STELLAR_NETWORK,
+      })
 
-      if (!asset.contract_id) {
-        await updateContractId(asset.id, contractId)
-      }
+      let contractId = asset.contract_id
 
       const termToSeconds = Number(data.term || 0) * 86400
       const yieldRate = Number(data.yield_rate || 0) * 100
@@ -70,98 +66,105 @@ export const ContractsCreate: React.FC = () => {
         throw new Error('Invalid sponsor!')
       }
 
-      const sourceAccount = await SorobanService.getSourceAccount(sponsorPK)
-
-      const operation = SorobanService.getContractOperation({
-        assetCode: asset.code,
-        assetIssuerPk: asset.issuer.key.publicKey,
+      const opex = new StellarPlus.Account.CustomAccountHandler({
+        STELLAR_NETWORK,
+        customSign: customSign,
+        publicKey: sponsorPK,
       })
 
-      if (!asset.contract_id && !isGeneratedContractId) {
-        const preppedTx = await SorobanService.wrapClassicAsset(
-          operation,
-          sourceAccount
-        )
-
-        const signedTransaction = await sign({ envelope: preppedTx })
-        if (signedTransaction) {
-          const resultEnvelope = await submit({
-            envelope: signedTransaction.envelope,
-          })
-
-          if (resultEnvelope) {
-            const transaction = new SorobanClient.Transaction(
-              resultEnvelope,
-              sorobanConfig.network.passphrase
-            )
-            await SorobanService.submitSoroban(transaction)
-          }
+      const opexTxInvocation = {
+        header: {
+          source: opex.getPublicKey(),
+          fee: '10000000', //1 XLM as maximum fee
+          timeout: 30,
+        },
+        signers: [opex],
+      }
+      
+      if (!contractId) {
+
+        await token.wrapAndDeploy(opexTxInvocation)
+        contractId = token.sorobanTokenHandler.getContractId()
+
+        if (!contractId) {
+          throw new Error('Error creating contract id')
         }
-        setGeneratedContractId(true)
+
+        await updateContractId(asset.id, contractId)
       }
 
-      const latestSequenceLedger = await getLatestSequenceLedger()
+      const codVault = new StellarPlus.Account.CustomAccountHandler({
+        STELLAR_NETWORK,
+        customSign: customSign,
+        publicKey: vault.wallet.key.publicKey,
+      })
 
-      if (!latestSequenceLedger) {
-        throw new Error('Invalid latest sequence ledger!')
+      const codTxInvocation = {
+        header: {
+          source: vault.wallet.key.publicKey,
+          fee: '1000000', //0.1 XLM as maximum fee
+          timeout: 30,
+        },
+        signers: [codVault],
+        feeBump: opexTxInvocation,
       }
 
-      const transactionResult = await deployerClient.deploy({
-        wasm_hash: codWasmHash,
-        salt: codSalt(),
+      const codClient = new StellarPlus.Contracts.CertificateOfDeposit({
+        network: STELLAR_NETWORK,
+        wasmHash: codWasmHash,
+        wasm: Buffer.from(codWasmHash),
+        contractId: contractId,
+        rpcHandler: vcRpcHandler
+      })
+
+      await codClient.uploadWasm(codTxInvocation)
+      await codClient.deploy(codTxInvocation)
+
+      const sorobanHandler = new StellarPlus.SorobanHandler(STELLAR_NETWORK)
+      const expirationLedger =
+        (await sorobanHandler.server.getLatestLedger()).sequence + 200000
+
+      const codParams = {
         admin: vault.wallet.key.publicKey,
-        asset: contractId,
+        asset: asset.contract_id
+          ? asset.contract_id
+          : token.sorobanTokenHandler.getContractId(),
         term: BigInt(termToSeconds),
-        compound_step: BigInt(
+        compoundStep: BigInt(
           compoundType === 'Compound interest' ? compound : 0
         ),
-        yield_rate: BigInt(yieldRate),
-        min_deposit: BigInt(Number(data.min_deposit || 0) * 10000000),
-        penalty_rate: BigInt(penaltyRate),
-        allowance_period: latestSequenceLedger + allowancePeriod,
-        signerSecret: vault.wallet.key.publicKey,
-      })
-
-      if (transactionResult.status === 'SUCCESS') {
-        const transactionSuccess =
-          transactionResult as SorobanClient.SorobanRpc.GetSuccessfulTransactionResponse
-
-        const xdr = transactionSuccess.returnValue?.toXDR('base64')
-        if (!xdr) {
-          throw new Error('Invalid transaction XDR')
-        }
+        yieldRate: BigInt(yieldRate),
+        minDeposit: BigInt(Number(data.min_deposit || 0) * 10000000),
+        penaltyRate: BigInt(penaltyRate),
+        allowancePeriod: expirationLedger,
+      }
 
-        const scVal = SorobanClient.xdr.ScVal.fromXDR(xdr, 'base64')
-        const contractAddress =
-          SorobanClient.Address.fromScVal(scVal).toString()
-
-        const contract = {
-          name: 'Contract',
-          asset_id: asset.id.toString(),
-          vault_id: vault.id.toString(),
-          address: contractAddress,
-          yield_rate: yieldRate,
-          term: termToSeconds,
-          min_deposit: Number(data.min_deposit || 0),
-          penalty_rate: penaltyRate,
-          compound: compoundType === 'Compound interest' ? compound : 0,
-        }
+      await codClient.initialize({ ...codParams, ...codTxInvocation })
+
+      const contract = {
+        name: 'Contract',
+        asset_id: asset.id.toString(),
+        vault_id: vault.id.toString(),
+        address: token.sorobanTokenHandler.getContractId() || '',
+        yield_rate: yieldRate,
+        term: termToSeconds,
+        min_deposit: Number(data.min_deposit || 0),
+        penalty_rate: penaltyRate,
+        compound: compoundType === 'Compound interest' ? compound : 0,
+      }
 
-        const contractCreated = await createContract(contract)
-
-        if (contractCreated) {
-          toast({
-            title: 'Contract created!',
-            status: 'success',
-            duration: 9000,
-            isClosable: true,
-            position: 'top-right',
-          })
-          navigate(`${PathRoute.CONTRACT_DETAIL}/${contractCreated.id}`)
-          return
-        }
-      } else {
-        toastError(MessagesError.errorOccurred)
+      const contractCreated = await createContract(contract)
+
+      if (contractCreated) {
+        toast({
+          title: 'Contract created!',
+          status: 'success',
+          duration: 9000,
+          isClosable: true,
+          position: 'top-right',
+        })
+        navigate(`${PathRoute.CONTRACT_DETAIL}/${contractCreated.id}`)
+        return
       }
 
       setCreatingContract(false)
diff --git a/frontend/src/hooks/useContracts/context.tsx b/frontend/src/hooks/useContracts/context.tsx
index e1f34387..d71d4c3d 100644
--- a/frontend/src/hooks/useContracts/context.tsx
+++ b/frontend/src/hooks/useContracts/context.tsx
@@ -133,12 +133,12 @@ export const ContractsProvider: React.FC<IProps> = ({ children }) => {
   ): Promise<boolean> => {
     setIsDepositing(true)
     try {
-      const result = await certificateOfDepositClient.deposit({
-        amount: amount * BigInt(10000000),
-        address: address,
-        contractId: contractId,
-        sourcePk: sourcePk,
-      })
+      const result = await certificateOfDepositClient.deposit(
+        amount * BigInt(10000000),
+        address,
+        contractId,
+        sourcePk
+      )
       setIsDepositing(false)
       setDepositConfirmed(true)
       setTimeout(() => setDepositConfirmed(false), 5000)
@@ -173,10 +173,10 @@ export const ContractsProvider: React.FC<IProps> = ({ children }) => {
     contractId: string
   ): Promise<bigint | undefined> => {
     try {
-      const result = await certificateOfDepositClient.getEstimatedYield({
-        address: address,
-        contractId: contractId,
-      })
+      const result = await certificateOfDepositClient.getEstimatedYield(
+        address,
+        contractId
+      )
       return result
     } catch (e) {
       return
@@ -189,10 +189,10 @@ export const ContractsProvider: React.FC<IProps> = ({ children }) => {
   ): Promise<bigint | undefined> => {
     try {
       const result =
-        await certificateOfDepositClient.getEstimatedPrematureWithdraw({
-          address: address,
-          contractId: contractId,
-        })
+        await certificateOfDepositClient.getEstimatedPrematureWithdraw(
+          address,
+          contractId
+        )
       return result
     } catch (e) {
       return
@@ -204,10 +204,10 @@ export const ContractsProvider: React.FC<IProps> = ({ children }) => {
     contractId: string
   ): Promise<bigint | undefined> => {
     try {
-      const result = await certificateOfDepositClient.getTimeLeft({
-        address: address,
-        contractId: contractId,
-      })
+      const result = await certificateOfDepositClient.getTimeLeft(
+        address,
+        contractId
+      )
       return result
     } catch (e) {
       return
@@ -224,16 +224,14 @@ export const ContractsProvider: React.FC<IProps> = ({ children }) => {
     address: string,
     premature: boolean,
     contractId: string,
-    signerSecret?: string
   ): Promise<boolean> => {
     setIsWithdrawing(true)
     try {
-      const result = await certificateOfDepositClient.withdraw({
-        address: address,
-        accept_premature_withdraw: premature,
-        contractId: contractId,
-        signerSecret: signerSecret,
-      })
+      const result = await certificateOfDepositClient.withdraw(
+        address,
+        premature,
+        contractId
+      )
 
       const xdr = result.returnValue?.toXDR('base64')
       if (!xdr) {
@@ -338,7 +336,7 @@ export const ContractsProvider: React.FC<IProps> = ({ children }) => {
         getHistory,
         addContractHistory,
         updateContractHistory,
-        getPagedContracts
+        getPagedContracts,
       }}
     >
       {children}
diff --git a/frontend/src/interfaces/http/index.ts b/frontend/src/interfaces/http/index.ts
index 8793a319..46ffed8b 100644
--- a/frontend/src/interfaces/http/index.ts
+++ b/frontend/src/interfaces/http/index.ts
@@ -2,7 +2,7 @@ import axios from 'axios'
 
 import Authentication from 'app/auth/services/auth'
 
-export const BASE_URL = process.env.REACT_APP_API_URL || 'http://localhost:3000'
+export const BASE_URL = process.env.REACT_APP_API_URL || 'http://127.0.0.1:8080/v1'
 
 const http = axios.create({
   baseURL: BASE_URL,
diff --git a/frontend/src/soroban/Freighter.tsx b/frontend/src/soroban/Freighter.tsx
deleted file mode 100644
index b0d19d75..00000000
--- a/frontend/src/soroban/Freighter.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import {
-  isAllowed,
-  isConnected,
-  getPublicKey,
-  signTransaction,
-  setAllowed,
-  getNetworkDetails,
-} from '@stellar/freighter-api'
-
-import { SELECTED_NETWORK, SELECTED_NETWORK as network } from './StellarHelpers'
-import { MessagesError } from 'utils/constants/messages-error'
-
-const getUserWallet = async (
-  onPublicKeyReceived: (key: string) => void
-): Promise<string | undefined> => {
-  const authorized = await validateFreighterPermissions(onPublicKeyReceived)
-
-  if (authorized) {
-    try {
-      const publicKey = await getPublicKey()
-      onPublicKeyReceived(publicKey)
-
-      return publicKey
-    } catch (e) {
-      throw new Error(MessagesError.errorOccurred)
-    }
-  }
-}
-
-async function validateFreighterPermissions(
-  onPublicKeyReceived: (key: string) => void
-): Promise<boolean> {
-  // Validates if Freighter is installed and allowed
-
-  const connected = await isConnected()
-  if (!connected) {
-    alert("Ooops, seems like you don't have Freighter extension yet!")
-    return false
-  }
-
-  // REVIEW: From what I have read from the docs, we don't need both isAllowed and setAllowed
-  const allowed = await isAllowed()
-  if (!allowed) {
-    setAllowed().then(() => {
-      getUserWallet(onPublicKeyReceived)
-    })
-
-    // alert("Please allow  our app to access Freighter.");
-    return false
-  }
-
-  const networkDetails = await getNetworkDetails()
-
-  if (networkDetails.networkPassphrase !== network.passphrase) {
-    alert(`You need to be in ${network.name} to connect to this application.`)
-    return false
-  }
-
-  return true
-}
-
-const signWithFreighter = async (
-  tx: string,
-  accountToSign?: string,
-  networkPassphrase?: string
-): Promise<string> => {
-  return signTransaction(tx, {
-    networkPassphrase: networkPassphrase
-      ? networkPassphrase
-      : SELECTED_NETWORK.passphrase,
-    accountToSign,
-  })
-}
-
-const verifyConnectedUser = async (
-  userPk: string,
-  onPublicKeyReceived: (key: string) => void
-): Promise<string | undefined> => {
-  if ((await getPublicKey()) !== userPk) {
-    return getUserWallet(onPublicKeyReceived)
-  }
-}
-
-export const FREIGHTER = {
-  signWithFreighter,
-  getUserWallet,
-  verifyConnectedUser,
-}
diff --git a/frontend/src/soroban/StellarHelpers.tsx b/frontend/src/soroban/StellarHelpers.tsx
deleted file mode 100644
index e83a28cf..00000000
--- a/frontend/src/soroban/StellarHelpers.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-export const networks = {
-  futurenet: {
-    name: 'Futurenet',
-    passphrase: 'Test SDF Future Network ; October 2022',
-    rpc: 'https://rpc-futurenet.stellar.org:443',
-    friendbot: 'https://friendbot-futurenet.stellar.org',
-    horizon: 'https://horizon-futurenet.stellar.org',
-  },
-  testnet: {
-    name: 'Testnet',
-    passphrase:
-      'Test SDF Network ; September 2015',
-    rpc: 'https://soroban-testnet.stellar.org:443',
-    friendbot: 'https://friendbot.stellar.org',
-    horizon: 'https://horizon-testnet.stellar.org',
-  },
-}
-
-export const SELECTED_NETWORK = networks.testnet
-
-export interface IDemoUser {
-  pk: string
-  sk: string
-}
-
-export const fundAccountWithFriendBot = async (
-  pk: string
-): Promise<boolean> => {
-  try {
-    const response = await fetch(
-      `${SELECTED_NETWORK.friendbot}?addr=${encodeURIComponent(pk)}`
-    )
-
-    await response.json()
-
-    return true
-  } catch (e) {
-    throw new Error('Error while initializing account with friendbot.')
-  }
-}
diff --git a/frontend/src/soroban/certificate-of-deposit/constants.ts b/frontend/src/soroban/certificate-of-deposit/constants.ts
index 8e9afea1..4ca02f77 100644
--- a/frontend/src/soroban/certificate-of-deposit/constants.ts
+++ b/frontend/src/soroban/certificate-of-deposit/constants.ts
@@ -1,18 +1,4 @@
-import { ContractSpec } from 'soroban-client'
-
-import { I128, U64, Address } from '../constants'
-
-export enum Methods {
-  deposit = 'deposit',
-  withdraw = 'withdraw',
-  getEstimatedYield = 'get_estimated_yield',
-  getPosition = 'get_position',
-  getEstimatedPrematureWithdraw = 'get_estimated_premature_withdraw',
-  getTimeLeft = 'get_time_left',
-  extendContractValidity = 'extend_contract_validity',
-}
-
-export const spec = new ContractSpec([
+export const spec = [
   'AAAAAAAAAAAAAAAKaW5pdGlhbGl6ZQAAAAAABwAAAAAAAAAFYWRtaW4AAAAAAAATAAAAAAAAAAVhc3NldAAAAAAAABMAAAAAAAAABHRlcm0AAAAGAAAAAAAAAA1jb21wb3VuZF9zdGVwAAAAAAAABgAAAAAAAAAKeWllbGRfcmF0ZQAAAAAABgAAAAAAAAALbWluX2RlcG9zaXQAAAAACwAAAAAAAAAMcGVuYWx0eV9yYXRlAAAABgAAAAA=',
   'AAAAAAAAAAAAAAAHZGVwb3NpdAAAAAACAAAAAAAAAAZhbW91bnQAAAAAAAsAAAAAAAAAB2FkZHJlc3MAAAAAEwAAAAA=',
   'AAAAAAAAAAAAAAAId2l0aGRyYXcAAAACAAAAAAAAAAdhZGRyZXNzAAAAABMAAAAAAAAAGWFjY2VwdF9wcmVtYXR1cmVfd2l0aGRyYXcAAAAAAAABAAAAAA==',
@@ -23,19 +9,4 @@ export const spec = new ContractSpec([
   'AAAAAAAAAAAAAAAYZXh0ZW5kX2NvbnRyYWN0X3ZhbGlkaXR5AAAAAAAAAAA=',
   'AAAAAQAAAAAAAAAAAAAAC0RlcG9zaXREYXRhAAAAAAIAAAAAAAAABmFtb3VudAAAAAAACwAAAAAAAAAJdGltZXN0YW1wAAAAAAAABg==',
   'AAAAAgAAAAAAAAAAAAAAB0RhdGFLZXkAAAAACAAAAAAAAAAAAAAABUFkbWluAAAAAAAAAAAAAAAAAAAFQXNzZXQAAAAAAAAAAAAAAAAAAAxDb21wb3VuZFN0ZXAAAAAAAAAAAAAAAARUZXJtAAAAAAAAAAAAAAAJWWllbGRSYXRlAAAAAAAAAAAAAAAAAAAKTWluRGVwb3NpdAAAAAAAAAAAAAAAAAALUGVuYWx0eVJhdGUAAAAAAQAAAAAAAAAHRGVwb3NpdAAAAAABAAAAEw==',
-])
-
-export interface IDepositData {
-  amount: I128
-  timestamp: U64
-}
-
-export type DataKey =
-  | { tag: 'Admin'; values: void }
-  | { tag: 'Asset'; values: void }
-  | { tag: 'CompoundStep'; values: void }
-  | { tag: 'Term'; values: void }
-  | { tag: 'YieldRate'; values: void }
-  | { tag: 'MinDeposit'; values: void }
-  | { tag: 'PenaltyRate'; values: void }
-  | { tag: 'Deposit'; values: readonly [Address] }
+]
diff --git a/frontend/src/soroban/certificate-of-deposit/index.ts b/frontend/src/soroban/certificate-of-deposit/index.ts
index 42450127..6769c0c2 100644
--- a/frontend/src/soroban/certificate-of-deposit/index.ts
+++ b/frontend/src/soroban/certificate-of-deposit/index.ts
@@ -1,201 +1,97 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import * as SorobanClient from 'soroban-client'
-
-import { Address, I128 } from '../constants'
-import { IInvokeSorobanArgs, SorobanService } from '../index'
-import { Methods, spec } from './constants'
-
-const deposit = async (rawArgs: {
-  amount: I128
-  address: string
-  contractId: string
-  sourcePk: string
-}): Promise<any> => {
-  const args = {
-    address: new Address(rawArgs.address),
-    amount: rawArgs.amount,
-  }
-
-  let invokeArgs: IInvokeSorobanArgs = {
-    contractId: rawArgs.contractId,
-    spec,
-    method: Methods.deposit,
-    sourcePk: rawArgs.sourcePk,
-  }
-
-  invokeArgs = args ? { ...invokeArgs, ...{ args: args as any } } : invokeArgs
-
-  invokeArgs = rawArgs.sourcePk
-    ? { ...invokeArgs, ...{ sourceSk: rawArgs.sourcePk } }
-    : invokeArgs
-
-  return SorobanService.invokeSoroban(invokeArgs)
+import * as StellarSdk from '@stellar/stellar-sdk'
+import { StellarPlus } from 'stellar-plus'
+import { CertificateOfDepositClient } from 'stellar-plus/lib/stellar-plus/soroban/contracts/certificate-of-deposit'
+
+import { I128, STELLAR_NETWORK, codWasmHash } from '../constants'
+import { spec } from './constants'
+
+const getContract = (contractId: string): CertificateOfDepositClient => {
+  return new StellarPlus.Contracts.CertificateOfDeposit({
+    network: STELLAR_NETWORK,
+    spec: new StellarSdk.ContractSpec(spec),
+    contractId: contractId,
+    wasmHash: codWasmHash,
+  })
 }
 
-const withdraw = async (rawArgs: {
-  address: string
-  accept_premature_withdraw: boolean
-  contractId: string
-  signerSecret?: string
-}): Promise<any> => {
-  const args = {
-    address: new Address(rawArgs.address),
-    accept_premature_withdraw: rawArgs.accept_premature_withdraw,
-  }
-
-  let invokeArgs: IInvokeSorobanArgs = {
-    contractId: rawArgs.contractId,
-    spec,
-    method: Methods.withdraw,
-    sourcePk: rawArgs.address,
+const userTxInvocation = (sourcePk: string): any => {
+  return {
+    header: {
+      source: sourcePk,
+      timeout: 30,
+    },
+    signers: [sourcePk],
   }
+}
 
-  invokeArgs = args ? { ...invokeArgs, ...{ args: args as any } } : invokeArgs
-
-  invokeArgs = rawArgs.signerSecret
-    ? { ...invokeArgs, ...{ sourceSk: rawArgs.signerSecret } }
-    : invokeArgs
-
-  return SorobanService.invokeSoroban(invokeArgs)
+const deposit = async (
+  amount: I128,
+  address: string,
+  contractId: string,
+  sourcePk: string
+): Promise<any> => {
+  const contract = getContract(contractId)
+
+  await contract.deposit({
+    address: address,
+    amount: amount,
+    ...userTxInvocation(sourcePk),
+  })
 }
 
-const getEstimatedYield = async (rawArgs: {
-  address: string
+const withdraw = async (
+  address: string,
+  accept_premature_withdraw: boolean,
   contractId: string
-  sourcePk?: string
-}): Promise<any> => {
-  const args = {
-    address: new Address(rawArgs.address),
-  }
-
-  let invokeArgs: IInvokeSorobanArgs = {
-    contractId: rawArgs.contractId,
-    spec,
-    method: Methods.getEstimatedYield,
-    sourcePk: rawArgs.address,
-  }
-
-  invokeArgs = args ? { ...invokeArgs, ...{ args: args as any } } : invokeArgs
-
-  invokeArgs = rawArgs.sourcePk
-    ? { ...invokeArgs, ...{ sourcePk: rawArgs.sourcePk } }
-    : invokeArgs
+): Promise<any> => {
+  const contract = getContract(contractId)
 
-  return SorobanService.simulatedValue(
-    invokeArgs,
-    (xdr: SorobanClient.xdr.ScVal): I128 => {
-      return spec.funcResToNative('get_estimated_yield', xdr)
-    }
-  )
+  await contract.withdraw({
+    address: address,
+    acceptPrematureWithdraw: accept_premature_withdraw,
+  })
 }
 
-const getPosition = async (rawArgs: {
-  address: string
+const getEstimatedYield = async (
+  address: string,
   contractId: string
-  sourcePk?: string
-}): Promise<any> => {
-  const args = {
-    address: new Address(rawArgs.address),
-  }
-
-  let invokeArgs: IInvokeSorobanArgs = {
-    contractId: rawArgs.contractId,
-    spec,
-    method: Methods.getPosition,
-    sourcePk: rawArgs.address,
-  }
-
-  invokeArgs = args ? { ...invokeArgs, ...{ args: args as any } } : invokeArgs
-
-  invokeArgs = rawArgs.sourcePk
-    ? { ...invokeArgs, ...{ sourceSk: rawArgs.sourcePk } }
-    : invokeArgs
-
-  return SorobanService.simulatedValue(
-    invokeArgs,
-    (xdr: SorobanClient.xdr.ScVal): I128 => {
-      return spec.funcResToNative('get_position', xdr)
-    }
-  )
+): Promise<any> => {
+  const contract = getContract(contractId)
+  return contract.getEstimatedYield({
+    address: address,
+  })
 }
 
-const getEstimatedPrematureWithdraw = async (rawArgs: {
+const getPosition = async (rawArgs: {
   address: string
   contractId: string
-  signerSecret?: string
 }): Promise<any> => {
-  const args = {
-    address: new Address(rawArgs.address),
-  }
-
-  let invokeArgs: IInvokeSorobanArgs = {
-    contractId: rawArgs.contractId,
-    spec,
-    method: Methods.getEstimatedPrematureWithdraw,
-    sourcePk: rawArgs.address,
-  }
-
-  invokeArgs = args ? { ...invokeArgs, ...{ args: args as any } } : invokeArgs
+  const contract = getContract(rawArgs.contractId)
 
-  invokeArgs = rawArgs.signerSecret
-    ? { ...invokeArgs, ...{ sourceSk: rawArgs.signerSecret } }
-    : invokeArgs
-
-  return SorobanService.simulatedValue(
-    invokeArgs,
-    (xdr: SorobanClient.xdr.ScVal): I128 => {
-      return spec.funcResToNative('get_estimated_premature_withdraw', xdr)
-    }
-  )
+  return contract.getPosition({
+    address: rawArgs.address,
+  })
 }
 
-const getTimeLeft = async (rawArgs: {
+const getEstimatedPrematureWithdraw = async (
+  contractId: string,
   address: string
-  contractId: string
-  signerSecret?: string
-}): Promise<any> => {
-  const args = {
-    address: new Address(rawArgs.address),
-  }
-
-  let invokeArgs: IInvokeSorobanArgs = {
-    contractId: rawArgs.contractId,
-    spec,
-    method: Methods.getTimeLeft,
-    sourcePk: rawArgs.address,
-  }
-
-  invokeArgs = args ? { ...invokeArgs, ...{ args: args as any } } : invokeArgs
-
-  invokeArgs = rawArgs.signerSecret
-    ? { ...invokeArgs, ...{ sourceSk: rawArgs.signerSecret } }
-    : invokeArgs
-
-  return SorobanService.simulatedValue(
-    invokeArgs,
-    (xdr: SorobanClient.xdr.ScVal): I128 => {
-      return spec.funcResToNative('get_time_left', xdr)
-    }
-  )
+): Promise<any> => {
+  const contract = getContract(contractId)
+  return contract.getEstimatedPrematureWithdraw({
+    address: address,
+  })
 }
 
-const extendContractValidity = async (rawArgs: {
-  address: string
+const getTimeLeft = async (
+  address: string,
   contractId: string
-  signerSecret?: string
-}): Promise<any> => {
-  let invokeArgs: IInvokeSorobanArgs = {
-    contractId: rawArgs.contractId,
-    spec,
-    method: Methods.getEstimatedPrematureWithdraw,
-    sourcePk: rawArgs.address,
-  }
-
-  invokeArgs = rawArgs.signerSecret
-    ? { ...invokeArgs, ...{ sourceSk: rawArgs.signerSecret } }
-    : invokeArgs
-
-  return SorobanService.invokeSoroban(invokeArgs)
+): Promise<any> => {
+  const contract = getContract(contractId)
+  return contract.getEstimatedPrematureWithdraw({
+    address: address,
+  })
 }
 
 export const certificateOfDepositClient = {
@@ -205,5 +101,4 @@ export const certificateOfDepositClient = {
   getPosition,
   getEstimatedPrematureWithdraw,
   getTimeLeft,
-  extendContractValidity,
 }
diff --git a/frontend/src/soroban/constants.ts b/frontend/src/soroban/constants.ts
index d5f9eca2..da1f6a31 100644
--- a/frontend/src/soroban/constants.ts
+++ b/frontend/src/soroban/constants.ts
@@ -1,107 +1,14 @@
-import { Address } from "soroban-client";
-import { networks } from "./StellarHelpers";
+import { StellarPlus } from "stellar-plus";
 
-const admin = {
-  pk: "GALIALRZJ5EU2IJJSIQEA3D3ZIEHK5HPBHZJFUEPTGQU3MYEKKIUINTY",
-  sk: "SCVCU3KWSSLML7MVWKJJB5VKK6R3CMILO5733IBJJ3C5APBWJUOCDUVY",
-};
+export const STELLAR_NETWORK = StellarPlus.Constants.testnet
 
-export const sorobanConfig = {
-  network: { ...networks.testnet },
-  txTimeout: 30,
-  fee: "1000000000",
-  retryTime: 1, //seconds
-  admin,
-} as const;
+export const vcRpcHandler = new StellarPlus.RPC.ValidationCloudRpcHandler(
+  StellarPlus.Constants.testnet,
+  'R5T1w4Gss5hHDnBpGHip30yzsvcATdLBgQYGvXQIxq8'
+)
 
-export type U32 = number;
-export type I32 = number;
-export type U64 = bigint;
-export type I64 = bigint;
-export type U128 = bigint;
 export type I128 = bigint;
-export type U256 = bigint;
-export type I256 = bigint;
-export type Option<T> = T | undefined;
-export type Typepoint = bigint;
-export type Duration = bigint;
-export { Address };
 
-export const channelAccounts = [
-  {
-    pk: "GCPA2DDXEJUUF7YFZIJCSXGJLSM35XQDVDBUG4UAJMVJUCXS5YPKHUQX",
-    sk: "SDRK4XIIS45SNHAHRD542QJI5KMV2N52TYYCYW7GFMPD3UAQYJHOG7FV",
-  },
-  {
-    pk: "GASSOO3IDX6COD7VN2XJHUNKAQ5RPFICEEDAA2HUZKSBBZ7XTUPGIPBA",
-    sk: "SDTMXUSBMYAF5SPX5C5VOSVXG27YJYPL4EJZD5O3QJ5JLVSP332FNRPJ",
-  },
-  {
-    pk: "GBNPANUNDNLO66SE65JPBMY7J2CKQ36EPPWGDZC2INL2CRP6QSABI7F2",
-    sk: "SB7W2PCK5OIBQFZZJ6AZXQO2ACUKZC7RRWNHOZKMCIZ4AUFEBUUA7UTR",
-  },
-  {
-    pk: "GCKJ6XOFTXH5WC2MLMOJ4WQOAJMLVT776P2FU354UIEYWNSS4LOO6I5H",
-    sk: "SBGGL53BE5CVJVHISC53WYYPMQLHCM7AYPNBRLYYKXA4T4GJJD33QNF5",
-  },
-  {
-    pk: "GAVMDAC5WDB5MZ7U3SLDQ4QZQXPMSO7WJPXMWWST7PQ2IGMGFIC3DBDN",
-    sk: "SDZV3LSHWLLVSLUIIVRRDT7SIJIILS7IUNVNVCQIGJXRBLZHT2IDVOMP",
-  },
-  {
-    pk: "GD5UHQ2ENZ65ZBPB3V2SJJQ2UKAKKXAIY6GZEK6STRW2QAMTKZ6P2ZE2",
-    sk: "SDXMATRTVSTUXETECXS2RYO7HKB37J5UFF6FZFZKK6XZPX77GJIZ36T3",
-  },
-  {
-    pk: "GBRGNDP3LSI7AJJ6J7YXWU3T6ZIROCJCRLKDMMDB6H45EHGKXOJ54HLQ",
-    sk: "SBBQVM7JUGRMRJJAIQ7AC3NQUV462P6FQRAXIHKCVX4AHJGUGG5KLLST",
-  },
-  {
-    pk: "GBRKPZXUP4LE3F7KOZSFFGVO2U2SDLSUSQWXYUNIMHOXNBFQ567SVUNO",
-    sk: "SATJ6PL2AFTJII2WJATDN2NGID2H2ZFTSI754UMBGWUQNQF3KTWTUR6Q",
-  },
-  {
-    pk: "GABHI2QOYRPVKP4HUNEDPJ4AYOGBQOBWKJHOYKFXDDFKDCRWEPNVNMWV",
-    sk: "SDD6UOKJT2BIVRNPCR2VFNOEOSQBKR7HEE6EZF3SWTZV37HHBDPVS3KW",
-  },
-  {
-    pk: "GA6PNAWI5KHHVQLC6F6GDM4XU64XYGM3S3GUSFBAYQMLBUKFVUOM633W",
-    sk: "SCQKKRFMTCA265MAUX2OQPLM2KTLTKMYNTQTR2FAHFGWEFYRFCCRZ6MR",
-  },
-  {
-    pk: "GAZ32ZQ2LBZN3HUGWYR44YSBAFI564CAAU6WXJBSQAIPXAGFIVKHTUZS",
-    sk: "SDMSETWUXG66DX3GVD64HTO2YWLZLT7DYBQPIQ3QDM2MPECKHWLDPX6A",
-  },
-  {
-    pk: "GDBO5MJKCB64SYWCSWH247T7TMXSH7A375SLSX3WII5QAW4GFKAC2F4P",
-    sk: "SD6J2ACHDWVN5MG6GCKVBUYU6CI7EJKEYFMKWVCU5E66ZHDWEOEHJ5X4",
-  },
-  {
-    pk: "GANJDJXRNJMSO2P6EFIMQ63WVKNMPLNFE6LEGAYU2UI6KWP4TE25IQFR",
-    sk: "SCYX2HDYDAFFN5TWUJCU4OFQNTUCF3DCNR4FHUURCART3ENGRQTEP4XB",
-  },
-  {
-    pk: "GCNKGOZ6BU57W5Z63AZI54YHKVTB2GT5XDPLLPQLY4WO4XK3MTHERMJG",
-    sk: "SA325H66ABDL6SVQAQ2TW7HQC67IIDERQZBKRAFBJSIVUJTSKYGZRW7G",
-  },
-  {
-    pk: "GDRVKVE3RZ2QMC2WNQWTJQYQ6CQGRF6BJZLMX2TKOHWF2ACCE4B2N5KT",
-    sk: "SCHQLBCGYL5HIWOR2HX4QMQI644BVVDFGZJY6HPKC4LYGIUNKX7S4Q5X",
-  },
-  {
-    pk: "GBDVPUQXACXWOXFEZJ6NNCLJVVHWQ7EJAQJILWUL35HLTCY6H3OI76L4",
-    sk: "SD7P5K6XGOPRSJZE33FWFPVJVLFASIN4MGVFOKQ6Y6Q7JVMUA2LWIVXD",
-  },
-  {
-    pk: "GDXNJWQUEKMONNCRRATYORCABJL5VXRMX2D6UBYJAPSLKF4CWHBX6EWU",
-    sk: "SC56HSYBKNG4SRLIO7R4FOOVBPBNDEINERZ4AJS2IRCWF3CR2ZLZRHZN",
-  },
-  {
-    pk: "GDUYTRESAK3C5ZRTKKQK5TCJARCCSYXRHKU5LM4A2QRZ6NGOIAKT67AL",
-    sk: "SCQFVU3STZ2ZTQLXLR7WBAGBS7LPI6AMAPEEPLJAJEE6ZUXMSXSVRKHJ",
-  },
-  {
-    pk: "GAIX52NIL7Q45DW526DGPGJQ73MKPZOAULWOALQJ2B66QYI2MZJGL5S3",
-    sk: "SDX3TOJBEHZDIED44V64YRVLLV4RVPFKT34LH5QWWLWQLTRFOXVHRUD2",
-  },
-];
+export const contractId = 'CA3I2XDUUA32PVJ2DTZAYGYCJAGGEUURAMVBQVYTI3JLH3JM4FEFAIHM'
+export const codWasmHash =
+  '8bb9084ed73d303e5a454ced59946800c5e07f76c651715644eff6a9aabf163a'
diff --git a/frontend/src/soroban/deployer/constants.ts b/frontend/src/soroban/deployer/constants.ts
deleted file mode 100644
index e4f66370..00000000
--- a/frontend/src/soroban/deployer/constants.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { ContractSpec } from 'soroban-client';
-import { customAlphabet } from 'nanoid';
-
-export const contractId = 'CA3I2XDUUA32PVJ2DTZAYGYCJAGGEUURAMVBQVYTI3JLH3JM4FEFAIHM'
-export const codWasmHash =
-  '8bb9084ed73d303e5a454ced59946800c5e07f76c651715644eff6a9aabf163a'
-export const codSalt = customAlphabet('0123456789', 32);
-
-export enum Methods {
-  deploy = 'deploy',
-}
-
-export const spec = new ContractSpec([
-  "AAAAAAAAAAAAAAAGZGVwbG95AAAAAAAKAAAAAAAAAAl3YXNtX2hhc2gAAAAAAAPuAAAAIAAAAAAAAAAEc2FsdAAAA+4AAAAgAAAAAAAAAAVhZG1pbgAAAAAAABMAAAAAAAAABWFzc2V0AAAAAAAAEwAAAAAAAAAEdGVybQAAAAYAAAAAAAAADWNvbXBvdW5kX3N0ZXAAAAAAAAAGAAAAAAAAAAp5aWVsZF9yYXRlAAAAAAAGAAAAAAAAAAttaW5fZGVwb3NpdAAAAAALAAAAAAAAAAxwZW5hbHR5X3JhdGUAAAAGAAAAAAAAABBhbGxvd2FuY2VfcGVyaW9kAAAABAAAAAEAAAAT",
-])
-
-export const allowancePeriod = 535000
\ No newline at end of file
diff --git a/frontend/src/soroban/deployer/index.ts b/frontend/src/soroban/deployer/index.ts
deleted file mode 100644
index e8f3d70e..00000000
--- a/frontend/src/soroban/deployer/index.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { Buffer } from 'buffer'
-import { Address, I128, U32, U64 } from 'soroban/constants'
-
-import { IInvokeSorobanArgs, SorobanService } from '../index'
-import { contractId, Methods, spec } from './constants'
-
-const deploy = async (rawArgs: {
-  wasm_hash: string
-  salt: string
-  admin: string
-  asset: string
-  term: U64
-  compound_step: U64
-  yield_rate: U64
-  min_deposit: I128
-  penalty_rate: U64
-  allowance_period: U32
-  signerSecret?: string
-}): Promise<any> => {
-  const args = {
-    wasm_hash: Buffer.from(rawArgs.wasm_hash, 'hex'),
-    salt: Buffer.from(rawArgs.salt),
-    admin: new Address(rawArgs.admin),
-    asset: new Address(rawArgs.asset),
-    term: rawArgs.term,
-    compound_step: rawArgs.compound_step,
-    yield_rate: rawArgs.yield_rate,
-    min_deposit: rawArgs.min_deposit,
-    penalty_rate: rawArgs.penalty_rate,
-    allowance_period: rawArgs.allowance_period
-  }
-
-  let invokeArgs: IInvokeSorobanArgs = {
-    contractId,
-    spec,
-    method: Methods.deploy,
-    sourcePk: rawArgs.admin.toString(),
-  }
-
-  invokeArgs = args ? { ...invokeArgs, ...{ args: args as any } } : invokeArgs
-
-  invokeArgs = rawArgs.signerSecret
-    ? { ...invokeArgs, ...{ sourcePk: rawArgs.signerSecret } }
-    : invokeArgs
-
-  return SorobanService.invokeSoroban(invokeArgs)
-}
-
-export const deployerClient = {
-  deploy,
-}
diff --git a/frontend/src/soroban/index.ts b/frontend/src/soroban/index.ts
deleted file mode 100644
index 24e2b4b2..00000000
--- a/frontend/src/soroban/index.ts
+++ /dev/null
@@ -1,302 +0,0 @@
-import axios from 'axios'
-import { Buffer } from 'buffer'
-import * as SorobanClient from 'soroban-client'
-import {
-  ContractSpec,
-  SorobanRpc,
-  xdr,
-  hash,
-  TransactionBuilder,
-  Server,
-  Asset,
-  StrKey,
-  OperationOptions,
-  Operation,
-} from 'soroban-client'
-import { MessagesError } from 'utils/constants/messages-error'
-
-import { http } from 'interfaces/http'
-
-import { FREIGHTER } from './Freighter'
-import { SELECTED_NETWORK } from './StellarHelpers'
-import { I128, sorobanConfig } from './constants'
-
-type BuildSorobanTxArgs = {
-  contractId: string
-  spec: ContractSpec
-  method: string
-  sourcePk: string
-  args?: []
-}
-
-export interface IInvokeSorobanArgs extends BuildSorobanTxArgs {
-  sourceSk?: string
-}
-
-const server = new SorobanClient.Server(sorobanConfig.network.rpc, {
-  allowHttp: true,
-})
-
-const invokeSoroban = async (
-  invokeArgs: IInvokeSorobanArgs
-): Promise<
-  | SorobanClient.SorobanRpc.GetTransactionResponse
-  | SorobanClient.SorobanRpc.GetTransactionStatus
-> => {
-  const { contractId, spec, method, sourcePk, args } = invokeArgs
-
-  const tx = await buildSorobanTx({
-    contractId,
-    spec,
-    method,
-    sourcePk,
-    args,
-  })
-
-  const signedTx = sourcePk
-    ? await sign({
-        envelope: tx.toXDR(),
-        wallet_pk: sourcePk,
-      })
-    : new SorobanClient.Transaction(
-        await FREIGHTER.signWithFreighter(tx.toXDR(), sourcePk),
-        SELECTED_NETWORK.passphrase
-      )
-
-  if (signedTx) {
-    if (sourcePk) {
-      const transaction = new SorobanClient.Transaction(
-        (signedTx as Hooks.UseTransactionsTypes.ISignResponse).envelope,
-        sorobanConfig.network.passphrase
-      )
-      return submitSoroban(transaction)
-    } else {
-      return submitSoroban(
-        signedTx as SorobanClient.Transaction | SorobanClient.FeeBumpTransaction
-      )
-    }
-  } else {
-    throw new Error('invalid signedTx')
-  }
-}
-
-const simulatedValue = async (
-  invokeArgs: IInvokeSorobanArgs,
-  parseResultXdr: (xdr: SorobanClient.xdr.ScVal) => unknown
-): Promise<unknown> => {
-  const { contractId, spec, method, sourcePk, args } = invokeArgs
-
-  const tx = await buildSorobanTx({
-    contractId,
-    spec,
-    method,
-    sourcePk,
-    args,
-  })
-
-  const transaction = new SorobanClient.Transaction(
-    tx.toEnvelope(),
-    sorobanConfig.network.passphrase
-  )
-  const simulated = await server.simulateTransaction(transaction)
-
-  if (SorobanRpc.isSimulationError(simulated)) {
-    throw new Error(simulated.error)
-  } else if (!simulated.result) {
-    throw new Error(`invalid simulation: no result in ${simulated}`)
-  }
-
-  return parseResultXdr(simulated.result.retval)
-}
-
-const buildSorobanTx = async ({
-  contractId,
-  spec,
-  method,
-  sourcePk,
-  args = [],
-}: BuildSorobanTxArgs): Promise<
-  | SorobanClient.Transaction<
-      SorobanClient.Memo<SorobanClient.MemoType>,
-      SorobanClient.Operation[]
-    >
-  | SorobanClient.FeeBumpTransaction
-> => {
-  const server = new SorobanClient.Server(sorobanConfig.network.rpc, {
-    allowHttp: true,
-  })
-
-  const invokeArgs = spec.funcArgsToScVals(method, args)
-  const sourceAccount = await server.getAccount(sourcePk)
-  const contract = new SorobanClient.Contract(contractId)
-
-  const transaction = new SorobanClient.TransactionBuilder(sourceAccount, {
-    fee: sorobanConfig.fee,
-    networkPassphrase: sorobanConfig.network.passphrase,
-  })
-    .addOperation(contract.call(method, ...invokeArgs))
-    .setTimeout(sorobanConfig.txTimeout)
-    .build()
-
-  try {
-    const preparedTransaction = await server.prepareTransaction(transaction)
-    return preparedTransaction
-  } catch (e) {
-    console.log("Tx couldn't be prepared: ", e)
-    throw e
-  }
-}
-
-const getContractId = (wrapArgs: {
-  assetCode: string
-  assetIssuerPk: string
-}): string => {
-  const asset = new Asset(wrapArgs.assetCode, wrapArgs.assetIssuerPk)
-  const xdrAsset = asset.toXDRObject()
-  const networkId = hash(Buffer.from(SELECTED_NETWORK.passphrase))
-  const preimage = xdr.HashIdPreimage.envelopeTypeContractId(
-    new xdr.HashIdPreimageContractId({
-      networkId: networkId,
-      contractIdPreimage:
-        xdr.ContractIdPreimage.contractIdPreimageFromAsset(xdrAsset),
-    })
-  )
-
-  const contractId = StrKey.encodeContract(hash(preimage.toXDR()))
-
-  return contractId
-}
-
-const getContractOperation = (wrapArgs: {
-  assetCode: string
-  assetIssuerPk: string
-}): xdr.Operation<Operation.InvokeHostFunction> => {
-  const asset = new Asset(wrapArgs.assetCode, wrapArgs.assetIssuerPk)
-  const xdrAsset = asset.toXDRObject()
-
-  const createContractArgs = new xdr.CreateContractArgs({
-    contractIdPreimage:
-      xdr.ContractIdPreimage.contractIdPreimageFromAsset(xdrAsset),
-    executable: xdr.ContractExecutable.contractExecutableStellarAsset(),
-  })
-
-  const func =
-    xdr.HostFunction.hostFunctionTypeCreateContract(createContractArgs)
-  const options: OperationOptions.InvokeHostFunction = {
-    func,
-    auth: [],
-  }
-  const operation = Operation.invokeHostFunction(options)
-  return operation
-}
-
-const getSourceAccount = (
-  publicKey: string
-): Promise<SorobanClient.Account> => {
-  const rpc = new Server(sorobanConfig.network.rpc, {
-    allowHttp: true,
-  })
-  return rpc.getAccount(publicKey)
-}
-
-const wrapClassicAsset = async (
-  operation: xdr.Operation<Operation.InvokeHostFunction>,
-  sourceAccount: SorobanClient.Account
-): Promise<string> => {
-  try {
-    const transaction = new TransactionBuilder(sourceAccount, {
-      fee: sorobanConfig.fee,
-      networkPassphrase: sorobanConfig.network.passphrase,
-    })
-      .addOperation(operation)
-      .setTimeout(sorobanConfig.txTimeout)
-      .build()
-
-    const preparedTransaction = await server.prepareTransaction(transaction)
-
-    return preparedTransaction.toXDR()
-  } catch (e) {
-    console.log('Wraping of asset ${wrapArgs.code} failed: ', e)
-    throw e
-  }
-}
-
-const submitSoroban = async (
-  signedTx: SorobanClient.Transaction | SorobanClient.FeeBumpTransaction
-): Promise<
-  | SorobanClient.SorobanRpc.GetTransactionResponse
-  | SorobanClient.SorobanRpc.GetTransactionStatus
-> => {
-  const server = new SorobanClient.Server(sorobanConfig.network.rpc, {
-    allowHttp: true,
-  })
-
-  try {
-    const response: SorobanRpc.SendTransactionResponse =
-      await server.sendTransaction(signedTx)
-
-    if (response.status === 'ERROR') {
-      console.log('ERROR: Tx failed!: ', response)
-      throw new Error('failed transaction!')
-    }
-
-    const txHash = response.hash
-
-    let updatedTransaction = await server.getTransaction(txHash)
-
-    const waitUntil = new Date(
-      Date.now() + sorobanConfig.txTimeout * 1000
-    ).valueOf()
-
-    const waitTime = 1000
-
-    const initial = Date.now()
-    while (
-      Date.now() < waitUntil &&
-      updatedTransaction.status ===
-        SorobanClient.SorobanRpc.GetTransactionStatus.NOT_FOUND
-    ) {
-      await new Promise(resolve => setTimeout(resolve, waitTime))
-
-      updatedTransaction = await server.getTransaction(txHash)
-    }
-
-    const final = Date.now()
-
-    console.log('Duration ' + (final - initial))
-
-    return updatedTransaction
-  } catch (e) {
-    console.log('Error during transaction submission: ')
-    console.log(e)
-    return SorobanClient.SorobanRpc.GetTransactionStatus.FAILED
-  }
-}
-
-const sign = async (
-  params: Hooks.UseTransactionsTypes.ISignRequest
-): Promise<Hooks.UseTransactionsTypes.ISignResponse | undefined> => {
-  try {
-    const response = await http.post(`soroban-transactions/sign`, params)
-    if (response.status === 200) {
-      return response.data.Message
-    }
-    return undefined
-  } catch (error) {
-    if (axios.isAxiosError(error)) {
-      throw new Error(error.message)
-    }
-    throw new Error(MessagesError.errorOccurred)
-  }
-}
-
-export const SorobanService = {
-  wrapClassicAsset,
-  getContractOperation,
-  getContractId,
-  getSourceAccount,
-  submitSoroban,
-  sign,
-  invokeSoroban,
-  simulatedValue,
-}