chore: Adjust MoneriumPack to v2.7.2 of @monerium/sdk (#591)

safe-global · Dec 15, 2023 · 138b79d · 138b79d
1 parent b369f75
commit 138b79d
Show file tree

Hide file tree

Showing 13 changed files with 150 additions and 439 deletions.
diff --git a/packages/onramp-kit/example/client/package.json b/packages/onramp-kit/example/client/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@monerium/sdk": "^2.6.5",
+    "@monerium/sdk": "^2.8.3.",
     "@mui/material": "^5.14.17",
     "@safe-global/auth-kit": "file:../../../auth-kit",
     "@safe-global/onramp-kit": "file:../../",

diff --git a/packages/onramp-kit/example/client/src/AuthContext.tsx b/packages/onramp-kit/example/client/src/AuthContext.tsx
@@ -21,14 +21,16 @@ export const AuthContext = createContext<AuthContextType>({
   selectedSafe: '',
   provider: null
 })
-
+const STORED_SAFE = 'selected_safe'
 const AuthProvider = ({ children }: AuthContextProviderProps) => {
   const [safeAuthPack, setSafeAuthPack] = useState<SafeAuthPack>()
   const [isAuthenticated, setIsAuthenticated] = useState(!!safeAuthPack?.isAuthenticated)
   const [safeAuthSignInResponse, setSafeAuthSignInResponse] = useState<AuthKitSignInData>()
   const [provider, setProvider] = useState<ethers.Eip1193Provider | null>()
   const [selectedSafe, setSelectedSafe] = useState('')
 
+  const storedSafe = sessionStorage.getItem(STORED_SAFE)
+
   useEffect(() => {
     ;(async () => {
       const authPack = new SafeAuthPack()
@@ -96,7 +98,10 @@ const AuthProvider = ({ children }: AuthContextProviderProps) => {
         logIn,
         logOut,
         selectedSafe,
-        setSelectedSafe
+        setSelectedSafe: (safe) => {
+          sessionStorage.setItem(STORED_SAFE, safe)
+          setSelectedSafe(safe)
+        }
       }}
     >
       {children}

diff --git a/packages/onramp-kit/example/client/src/components/monerium/Monerium.tsx b/packages/onramp-kit/example/client/src/components/monerium/Monerium.tsx
@@ -11,8 +11,6 @@ import DeploySafe from './DeploySafe'
 import LoginWithMonerium from './LoginWithMonerium'
 import Connected from './Connected'
 
-const MONERIUM_TOKEN = 'monerium_token'
-
 function Monerium() {
   const [authContext, setAuthContext] = useState<AuthContext>()
   const [safeThreshold, setSafeThreshold] = useState<string>()
@@ -38,6 +36,7 @@ function Monerium() {
 
       const pack = new MoneriumPack({
         clientId: import.meta.env.VITE_MONERIUM_CLIENT_ID,
+        redirectUrl: 'http://localhost:3000/monerium',
         environment: 'sandbox'
       })
 
@@ -76,45 +75,37 @@ function Monerium() {
   }, [authProvider, selectedSafe])
 
   useEffect(() => {
-    const authCode = new URLSearchParams(window.location.search).get('code') || undefined
-    const refreshToken = localStorage.getItem(MONERIUM_TOKEN) || undefined
-
-    if (authCode || refreshToken) startMoneriumFlow(authCode, refreshToken)
+    startMoneriumFlow()
   }, [moneriumPack])
 
-  const startMoneriumFlow = async (authCode?: string, refreshToken?: string) => {
+  const startMoneriumFlow = async (options?: { initiateAuthFlow?: boolean }) => {
     if (!moneriumPack) return
 
-    const moneriumClient = await moneriumPack.open({
-      redirectUrl: 'http://localhost:3000/monerium',
-      authCode,
-      refreshToken
-    })
-
-    const authContext = await moneriumClient.getAuthContext()
-    const profile = await moneriumClient.getProfile(authContext.defaultProfile)
-    const balances = await moneriumClient.getBalances()
-    const orders = await moneriumClient.getOrders()
-
-    console.group('Monerium data')
-    console.log('AuthContext', authContext)
-    console.log('Profile', profile)
-    console.log('Balances', balances)
-    console.log('Orders', orders)
-    console.log('Bearer Profile', moneriumClient.bearerProfile)
-    console.groupEnd()
-
-    if (moneriumClient.bearerProfile) {
-      localStorage.setItem(MONERIUM_TOKEN, moneriumClient.bearerProfile.refresh_token)
+    if (options?.initiateAuthFlow) {
+      await moneriumPack.open({ initiateAuthFlow: true })
+    } else {
+      const moneriumClient = await moneriumPack.open()
+
+      const authContext = await moneriumClient.getAuthContext()
+      const profile = await moneriumClient.getProfile(authContext.defaultProfile)
+      const balances = await moneriumClient.getBalances()
+      const orders = await moneriumClient.getOrders()
+
+      console.group('Monerium data')
+      console.log('AuthContext', authContext)
+      console.log('Profile', profile)
+      console.log('Balances', balances)
+      console.log('Orders', orders)
+      console.log('Bearer Profile', moneriumClient.bearerProfile)
+      console.groupEnd()
+
+      setMoneriumClient(moneriumClient)
+      setAuthContext(authContext)
     }
-
-    setMoneriumClient(moneriumClient)
-    setAuthContext(authContext)
   }
 
   const closeMoneriumFlow = async () => {
     moneriumPack?.close()
-    localStorage.removeItem(MONERIUM_TOKEN)
     setAuthContext(undefined)
   }
 
@@ -159,7 +150,7 @@ function Monerium() {
             <LoginWithMonerium
               safe={selectedSafe}
               threshold={safeThreshold || ''}
-              onLogin={() => startMoneriumFlow()}
+              onLogin={() => startMoneriumFlow({ initiateAuthFlow: true })}
             />
           )}
         </>

diff --git a/packages/onramp-kit/example/client/yarn.lock b/packages/onramp-kit/example/client/yarn.lock
@@ -328,19 +328,6 @@
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz#d0fce5d07b0620caa282b5131c297bb60f9d87e6"
   integrity sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==
 
-"@esbuild-plugins/node-globals-polyfill@^0.2.3":
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/@esbuild-plugins/node-globals-polyfill/-/node-globals-polyfill-0.2.3.tgz#0e4497a2b53c9e9485e149bc92ddb228438d6bcf"
-  integrity sha512-r3MIryXDeXDOZh7ih1l/yE9ZLORCd5e8vWg02azWRGj5SPTuoh69A2AIyn0Z31V/kHBfZ4HgWJ+OK3GTTwLmnw==
-
-"@esbuild-plugins/node-modules-polyfill@^0.2.2":
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/@esbuild-plugins/node-modules-polyfill/-/node-modules-polyfill-0.2.2.tgz#cefa3dc0bd1c16277a8338b52833420c94987327"
-  integrity sha512-LXV7QsWJxRuMYvKbiznh+U1ilIop3g2TeKRzUxOG5X3YITc8JyyTa90BmLwqqv0YnX4v32CSlG+vsziZp9dMvA==
-  dependencies:
-    escape-string-regexp "^4.0.0"
-    rollup-plugin-node-polyfills "^0.2.1"
-
 "@esbuild/android-arm64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz#984b4f9c8d0377443cc2dfcef266d02244593622"
@@ -821,15 +808,10 @@
     semver "^7.5.4"
     superstruct "^1.0.3"
 
-"@monerium/sdk@2.6.5":
-  version "2.6.5"
-  resolved "https://registry.yarnpkg.com/@monerium/sdk/-/sdk-2.6.5.tgz#ccb84ef96420f008e6e67bd146d710ba204a0b8f"
-  integrity sha512-fEAJk2gNuirzub2IacICQ2khONeHpUD1LbEtq1RXBDPRusCmftDYufQRnv6oQBSw+prTHGnvzo2gU/0q4HszEw==
-
-"@monerium/sdk@^2.6.5":
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/@monerium/sdk/-/sdk-2.7.3.tgz#8d5bf73867af478e2515e1a220c2b2afd5e01763"
-  integrity sha512-sjPXyGJenk7sRVfSiHQayG98agaj0lpe6aMAM8xT+av3QeLRpVGs92OAnz67UUCkE3tKrZBg57Olgp90qYZokA==
+"@monerium/sdk@2.8.3", "@monerium/sdk@^2.8.3.":
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/@monerium/sdk/-/sdk-2.8.3.tgz#929495009f208e980a5815778acc9b98daf31987"
+  integrity sha512-RSy8JPG2W8jFFCjD78SIZTnEttXsoNuNw6mG83CVhIrfN63op3ejSF5NWNA3OVDsE3SwV9VQzwnPY1hP2pvBWQ==
   dependencies:
     crypto-js "^4.2.0"
 
@@ -992,7 +974,7 @@
     node-fetch "^2.7.0"
 
 "@safe-global/auth-kit@file:../../../auth-kit":
-  version "2.0.0-alpha.10"
+  version "2.0.0"
   dependencies:
     "@safe-global/api-kit" "^2.0.0"
     "@safe-global/protocol-kit" "^2.0.0"
@@ -1002,7 +984,7 @@
 "@safe-global/onramp-kit@file:../..":
   version "2.0.0"
   dependencies:
-    "@monerium/sdk" "2.6.5"
+    "@monerium/sdk" "2.8.3"
     "@safe-global/api-kit" "^2.0.0"
     "@safe-global/protocol-kit" "^2.0.0"
     "@safe-global/safe-core-sdk-types" "^3.0.0"
@@ -2283,11 +2265,6 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-estree-walker@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
-  integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
-
 estree-walker@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
@@ -3125,13 +3102,6 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-magic-string@^0.25.3:
-  version "0.25.9"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"
-  integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==
-  dependencies:
-    sourcemap-codec "^1.4.8"
-
 magic-string@^0.27.0:
   version "0.27.0"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.27.0.tgz#e4a3413b4bab6d98d2becffd48b4a257effdbbf3"
@@ -3921,36 +3891,13 @@ rlp@^2.2.4:
   dependencies:
     bn.js "^5.2.0"
 
-rollup-plugin-inject@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-inject/-/rollup-plugin-inject-3.0.2.tgz#e4233855bfba6c0c12a312fd6649dff9a13ee9f4"
-  integrity sha512-ptg9PQwzs3orn4jkgXJ74bfs5vYz1NCZlSQMBUA0wKcGp5i5pA1AO3fOUEte8enhGUC+iapTCzEWw2jEFFUO/w==
-  dependencies:
-    estree-walker "^0.6.1"
-    magic-string "^0.25.3"
-    rollup-pluginutils "^2.8.1"
-
-rollup-plugin-node-polyfills@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-node-polyfills/-/rollup-plugin-node-polyfills-0.2.1.tgz#53092a2744837164d5b8a28812ba5f3ff61109fd"
-  integrity sha512-4kCrKPTJ6sK4/gLL/U5QzVT8cxJcofO0OU74tnB19F40cmuAKSzH5/siithxlofFEjwvw1YAhPmbvGNA6jEroA==
-  dependencies:
-    rollup-plugin-inject "^3.0.0"
-
 rollup-plugin-polyfill-node@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-polyfill-node/-/rollup-plugin-polyfill-node-0.12.0.tgz#33d421ddb7fcb69c234461e508ca6d2db6193f1d"
   integrity sha512-PWEVfDxLEKt8JX1nZ0NkUAgXpkZMTb85rO/Ru9AQ69wYW8VUCfDgP4CGRXXWYni5wDF0vIeR1UoF3Jmw/Lt3Ug==
   dependencies:
     "@rollup/plugin-inject" "^5.0.1"
 
-rollup-pluginutils@^2.8.1:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
-  integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
-  dependencies:
-    estree-walker "^0.6.1"
-
 rollup@^3.27.1:
   version "3.29.4"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.4.tgz#4d70c0f9834146df8705bfb69a9a19c9e1109981"
@@ -4125,11 +4072,6 @@ source-map@^0.5.7:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
-sourcemap-codec@^1.4.8:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
-  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
-
 sshpk@^1.7.0:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028"

diff --git a/packages/onramp-kit/package.json b/packages/onramp-kit/package.json
@@ -35,7 +35,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@monerium/sdk": "2.6.5",
+    "@monerium/sdk": "^2.8.3",
     "@safe-global/api-kit": "^2.0.0",
     "@safe-global/protocol-kit": "^2.0.0",
     "@safe-global/safe-core-sdk-types": "^3.0.0",