From 0522531d2d615f0f3ef77a12ff649c2fe4583fa7 Mon Sep 17 00:00:00 2001
From: Alain Nicolas <alain.nicolas@consensys.net>
Date: Mon, 23 Oct 2023 19:32:00 +0200
Subject: [PATCH] fix: conflicts

---
 sdk/src/dataMapper/SchemaDataMapper.ts | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/sdk/src/dataMapper/SchemaDataMapper.ts b/sdk/src/dataMapper/SchemaDataMapper.ts
index 1a5d2a44..463482ce 100644
--- a/sdk/src/dataMapper/SchemaDataMapper.ts
+++ b/sdk/src/dataMapper/SchemaDataMapper.ts
@@ -1,9 +1,10 @@
-import { Address, Hash } from "viem";
+import { Address } from "viem";
 import { Schema_filter, Schema_orderBy } from "../../.graphclient";
 import { Schema } from "../types";
 import { handleError } from "../utils/errorHandler";
 import BaseDataMapper from "./BaseDataMapper";
 import { abiSchemaRegistry } from "../abi/SchemaRegistry";
+import { executeTransaction } from "../utils/transactionSender";
 
 export default class SchemaDataMapper extends BaseDataMapper<Schema, Schema_filter, Schema_orderBy> {
   typeName = "schema";
@@ -21,7 +22,7 @@ export default class SchemaDataMapper extends BaseDataMapper<Schema, Schema_filt
 
   async updateRouter(routerAddress: Address) {
     const request = await this.simulateUpdateRouter(routerAddress);
-    return this.executeTransaction(request);
+    return executeTransaction(this.walletClient, request);
   }
 
   async simulateCreate(name: string, description: string, context: string, schemaString: string) {
@@ -30,7 +31,7 @@ export default class SchemaDataMapper extends BaseDataMapper<Schema, Schema_filt
 
   async create(name: string, description: string, context: string, schemaString: string) {
     const request = await this.simulateCreate(name, description, context, schemaString);
-    return this.executeTransaction(request);
+    return executeTransaction(this.walletClient, request);
   }
 
   async simulateUpdateContext(schemaId: string, context: string) {
@@ -39,7 +40,7 @@ export default class SchemaDataMapper extends BaseDataMapper<Schema, Schema_filt
 
   async updateContext(schemaId: string, context: string) {
     const request = await this.simulateUpdateContext(schemaId, context);
-    return this.executeTransaction(request);
+    return executeTransaction(this.walletClient, request);
   }
 
   async getIdFromSchemaString(schema: string) {
@@ -72,7 +73,6 @@ export default class SchemaDataMapper extends BaseDataMapper<Schema, Schema_filt
     });
   }
 
-  // TODO: Use correct type for args
   private async simulateContract(functionName: string, args: unknown[]) {
     try {
       const { request } = await this.web3Client.simulateContract({
@@ -88,12 +88,4 @@ export default class SchemaDataMapper extends BaseDataMapper<Schema, Schema_filt
       handleError(err);
     }
   }
-
-  // TODO: Use correct type for request
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private async executeTransaction(request: any) {
-    const hash: Hash = await this.walletClient.writeContract(request);
-    console.log(`Transaction sent with hash ${hash}`);
-    return hash;
-  }
 }