From 2a2a2d43fd45e775a339822744271570eea05f88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yago=20P=C3=A9rez=20V=C3=A1zquez?= <yago@safe.global>
Date: Wed, 13 Sep 2023 18:11:18 +0200
Subject: [PATCH] Update playgrounds

---
 playground/relay-kit/paid-transaction.ts      | 26 +++++++++++--------
 playground/relay-kit/sponsored-transaction.ts | 22 ++++++++++------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/playground/relay-kit/paid-transaction.ts b/playground/relay-kit/paid-transaction.ts
index fe00f3d85..e1b932307 100644
--- a/playground/relay-kit/paid-transaction.ts
+++ b/playground/relay-kit/paid-transaction.ts
@@ -1,12 +1,12 @@
-import AccountAbstraction, {
-  AccountAbstractionConfig
-} from '@safe-global/account-abstraction-kit-poc'
+import AccountAbstraction from '@safe-global/account-abstraction-kit-poc'
 import { GelatoRelayPack } from '@safe-global/relay-kit'
 import {
   MetaTransactionData,
   MetaTransactionOptions,
   OperationType
 } from '@safe-global/safe-core-sdk-types'
+import { EthersAdapter } from '@safe-global/protocol-kit'
+
 import { BigNumber, ethers } from 'ethers'
 
 // Check the status of a transaction after it is relayed:
@@ -42,20 +42,24 @@ async function main() {
   const provider = new ethers.providers.JsonRpcProvider(config.RPC_URL)
   const signer = new ethers.Wallet(config.SAFE_SIGNER_PRIVATE_KEY, provider)
 
-  const relayPack = new GelatoRelayPack()
+  const safeAccountAbstraction = new AccountAbstraction(
+    new EthersAdapter({
+      ethers,
+      signerOrProvider: signer
+    })
+  )
+
+  const safeSdk = await safeAccountAbstraction.init()
+  const relayPack = new GelatoRelayPack({ safeSdk })
 
-  const safeAccountAbstraction = new AccountAbstraction(signer)
-  const sdkConfig: AccountAbstractionConfig = {
-    relayPack
-  }
-  await safeAccountAbstraction.init(sdkConfig)
+  safeAccountAbstraction.setRelayPack(relayPack)
 
   // Calculate Safe address
 
-  const predictedSafeAddress = safeAccountAbstraction.getSafeAddress()
+  const predictedSafeAddress = await safeSdk.getAddress()
   console.log({ predictedSafeAddress })
 
-  const isSafeDeployed = await safeAccountAbstraction.isSafeDeployed()
+  const isSafeDeployed = await safeSdk.isSafeDeployed()
   console.log({ isSafeDeployed })
 
   // Fake on-ramp to transfer enough funds to the Safe address
diff --git a/playground/relay-kit/sponsored-transaction.ts b/playground/relay-kit/sponsored-transaction.ts
index 87679409a..993d1750b 100644
--- a/playground/relay-kit/sponsored-transaction.ts
+++ b/playground/relay-kit/sponsored-transaction.ts
@@ -1,6 +1,7 @@
 import AccountAbstraction, {
   AccountAbstractionConfig
 } from '@safe-global/account-abstraction-kit-poc'
+import { EthersAdapter } from '@safe-global/protocol-kit'
 import { GelatoRelayPack } from '@safe-global/relay-kit'
 import {
   MetaTransactionData,
@@ -43,20 +44,25 @@ async function main() {
   const provider = new ethers.providers.JsonRpcProvider(config.RPC_URL)
   const signer = new ethers.Wallet(config.SAFE_SIGNER_PRIVATE_KEY, provider)
 
-  const relayPack = new GelatoRelayPack(config.RELAY_API_KEY)
+  const safeAccountAbstraction = new AccountAbstraction(
+    new EthersAdapter({
+      ethers,
+      signerOrProvider: signer
+    })
+  )
 
-  const safeAccountAbstraction = new AccountAbstraction(signer)
-  const sdkConfig: AccountAbstractionConfig = {
-    relayPack
-  }
-  await safeAccountAbstraction.init(sdkConfig)
+  const safeSdk = await safeAccountAbstraction.init()
+
+  safeAccountAbstraction.setRelayPack(
+    new GelatoRelayPack({ apiKey: config.RELAY_API_KEY, safeSdk })
+  )
 
   // Calculate Safe address
 
-  const predictedSafeAddress = safeAccountAbstraction.getSafeAddress()
+  const predictedSafeAddress = await safeSdk.getAddress()
   console.log({ predictedSafeAddress })
 
-  const isSafeDeployed = await safeAccountAbstraction.isSafeDeployed()
+  const isSafeDeployed = await safeSdk.isSafeDeployed()
   console.log({ isSafeDeployed })
 
   // Fake on-ramp to fund the Safe