diff --git a/dist/eas.d.ts b/dist/eas.d.ts
index 15e5fa3..bef85ae 100644
--- a/dist/eas.d.ts
+++ b/dist/eas.d.ts
@@ -4,7 +4,6 @@ import { EIP712Proxy } from './eip712-proxy';
 import { Delegated, Offchain } from './offchain';
 import { AttestationRequest, DelegatedAttestationRequest, DelegatedProxyAttestationRequest, DelegatedProxyRevocationRequest, DelegatedRevocationRequest, MultiAttestationRequest, MultiDelegatedAttestationRequest, MultiDelegatedProxyAttestationRequest, MultiDelegatedProxyRevocationRequest, MultiDelegatedRevocationRequest, MultiRevocationRequest, RevocationRequest } from './request';
 import { Base, Transaction, TransactionSigner } from './transaction';
-export { Overrides } from 'ethers';
 export * from './request';
 export interface Attestation {
     uid: string;
diff --git a/dist/eas.js b/dist/eas.js
index e675332..77eccfe 100644
--- a/dist/eas.js
+++ b/dist/eas.js
@@ -20,6 +20,7 @@ class EAS extends transaction_1.Base {
         if (!this.contract.getAddress) {
             throw new Error('Incompatible ethers version detect. Make sure to use the SDK with ethers v6 or later');
         }
+        this.signer = signer;
         if (proxy) {
             this.proxy = proxy;
         }
@@ -79,13 +80,19 @@ class EAS extends transaction_1.Base {
     }
     // Attests to a specific schema
     async attest({ schema, data: { recipient = utils_1.ZERO_ADDRESS, data, expirationTime = request_1.NO_EXPIRATION, revocable = true, refUID = utils_1.ZERO_BYTES32, value = 0n } }, overrides) {
-        const tx = await this.contract.attest({ schema, data: { recipient, expirationTime, revocable, refUID, data, value } }, { value, ...overrides });
+        if (!this.signer) {
+            throw new Error('Invalid signer');
+        }
+        return new transaction_1.Transaction(await this.contract.attest.populateTransaction({ schema, data: { recipient, expirationTime, revocable, refUID, data, value } }, { value, ...overrides }), this.signer, 
         // eslint-disable-next-line require-await
-        return new transaction_1.Transaction(tx, async (receipt) => (0, utils_1.getUIDsFromAttestReceipt)(receipt)[0]);
+        async (receipt) => (0, utils_1.getUIDsFromAttestReceipt)(receipt)[0]);
     }
     // Attests to a specific schema via an EIP712 delegation request
     async attestByDelegation({ schema, data: { recipient = utils_1.ZERO_ADDRESS, data, expirationTime = request_1.NO_EXPIRATION, revocable = true, refUID = utils_1.ZERO_BYTES32, value = 0n }, signature, attester, deadline = request_1.NO_EXPIRATION }, overrides) {
-        const tx = await this.contract.attestByDelegation({
+        if (!this.signer) {
+            throw new Error('Invalid signer');
+        }
+        return new transaction_1.Transaction(await this.contract.attestByDelegation.populateTransaction({
             schema,
             data: {
                 recipient,
@@ -98,12 +105,15 @@ class EAS extends transaction_1.Base {
             signature,
             attester,
             deadline
-        }, { value, ...overrides });
+        }, { value, ...overrides }), this.signer, 
         // eslint-disable-next-line require-await
-        return new transaction_1.Transaction(tx, async (receipt) => (0, utils_1.getUIDsFromAttestReceipt)(receipt)[0]);
+        async (receipt) => (0, utils_1.getUIDsFromAttestReceipt)(receipt)[0]);
     }
     // Multi-attests to multiple schemas
     async multiAttest(requests, overrides) {
+        if (!this.signer) {
+            throw new Error('Invalid signer');
+        }
         const multiAttestationRequests = requests.map((r) => ({
             schema: r.schema,
             data: r.data.map((d) => ({
@@ -119,15 +129,18 @@ class EAS extends transaction_1.Base {
             const total = data.reduce((res, r) => res + r.value, 0n);
             return res + total;
         }, 0n);
-        const tx = await this.contract.multiAttest(multiAttestationRequests, {
+        return new transaction_1.Transaction(await this.contract.multiAttest.populateTransaction(multiAttestationRequests, {
             value: requestedValue,
             ...overrides
-        });
+        }), this.signer, 
         // eslint-disable-next-line require-await
-        return new transaction_1.Transaction(tx, async (receipt) => (0, utils_1.getUIDsFromAttestReceipt)(receipt));
+        async (receipt) => (0, utils_1.getUIDsFromAttestReceipt)(receipt));
     }
     // Multi-attests to multiple schemas via an EIP712 delegation requests
     async multiAttestByDelegation(requests, overrides) {
+        if (!this.signer) {
+            throw new Error('Invalid signer');
+        }
         const multiAttestationRequests = requests.map((r) => ({
             schema: r.schema,
             data: r.data.map((d) => ({
@@ -146,21 +159,26 @@ class EAS extends transaction_1.Base {
             const total = data.reduce((res, r) => res + r.value, 0n);
             return res + total;
         }, 0n);
-        const tx = await this.contract.multiAttestByDelegation(multiAttestationRequests, {
+        return new transaction_1.Transaction(await this.contract.multiAttestByDelegation.populateTransaction(multiAttestationRequests, {
             value: requestedValue,
             ...overrides
-        });
+        }), this.signer, 
         // eslint-disable-next-line require-await
-        return new transaction_1.Transaction(tx, async (receipt) => (0, utils_1.getUIDsFromAttestReceipt)(receipt));
+        async (receipt) => (0, utils_1.getUIDsFromAttestReceipt)(receipt));
     }
     // Revokes an existing attestation
     async revoke({ schema, data: { uid, value = 0n } }, overrides) {
-        const tx = await this.contract.revoke({ schema, data: { uid, value } }, { value, ...overrides });
-        return new transaction_1.Transaction(tx, async () => { });
+        if (!this.signer) {
+            throw new Error('Invalid signer');
+        }
+        return new transaction_1.Transaction(await this.contract.revoke.populateTransaction({ schema, data: { uid, value } }, { value, ...overrides }), this.signer, async () => { });
     }
     // Revokes an existing attestation an EIP712 delegation request
     async revokeByDelegation({ schema, data: { uid, value = 0n }, signature, revoker, deadline = request_1.NO_EXPIRATION }, overrides) {
-        const tx = await this.contract.revokeByDelegation({
+        if (!this.signer) {
+            throw new Error('Invalid signer');
+        }
+        return new transaction_1.Transaction(await this.contract.revokeByDelegation.populateTransaction({
             schema,
             data: {
                 uid,
@@ -169,11 +187,13 @@ class EAS extends transaction_1.Base {
             signature,
             revoker,
             deadline
-        }, { value, ...overrides });
-        return new transaction_1.Transaction(tx, async () => { });
+        }, { value, ...overrides }), this.signer, async () => { });
     }
     // Multi-revokes multiple attestations
     async multiRevoke(requests, overrides) {
+        if (!this.signer) {
+            throw new Error('Invalid signer');
+        }
         const multiRevocationRequests = requests.map((r) => ({
             schema: r.schema,
             data: r.data.map((d) => ({
@@ -185,14 +205,16 @@ class EAS extends transaction_1.Base {
             const total = data.reduce((res, r) => res + r.value, 0n);
             return res + total;
         }, 0n);
-        const tx = await this.contract.multiRevoke(multiRevocationRequests, {
+        return new transaction_1.Transaction(await this.contract.multiRevoke.populateTransaction(multiRevocationRequests, {
             value: requestedValue,
             ...overrides
-        });
-        return new transaction_1.Transaction(tx, async () => { });
+        }), this.signer, async () => { });
     }
     // Multi-revokes multiple attestations via an EIP712 delegation requests
     async multiRevokeByDelegation(requests, overrides) {
+        if (!this.signer) {
+            throw new Error('Invalid signer');
+        }
         const multiRevocationRequests = requests.map((r) => ({
             schema: r.schema,
             data: r.data.map((d) => ({
@@ -207,11 +229,10 @@ class EAS extends transaction_1.Base {
             const total = data.reduce((res, r) => res + r.value, 0n);
             return res + total;
         }, 0n);
-        const tx = await this.contract.multiRevokeByDelegation(multiRevocationRequests, {
+        return new transaction_1.Transaction(await this.contract.multiRevokeByDelegation.populateTransaction(multiRevocationRequests, {
             value: requestedValue,
             ...overrides
-        });
-        return new transaction_1.Transaction(tx, async () => { });
+        }), this.signer, async () => { });
     }
     // Attests to a specific schema via an EIP712 delegation request using an external EIP712 proxy
     attestByDelegationProxy(request, overrides) {
@@ -243,28 +264,39 @@ class EAS extends transaction_1.Base {
     }
     // Timestamps the specified bytes32 data
     async timestamp(data, overrides) {
-        const tx = await this.contract.timestamp(data, overrides ?? {});
+        if (!this.signer) {
+            throw new Error('Invalid signer');
+        }
+        return new transaction_1.Transaction(await this.contract.timestamp.populateTransaction(data, overrides ?? {}), this.signer, 
         // eslint-disable-next-line require-await
-        return new transaction_1.Transaction(tx, async (receipt) => (0, utils_1.getTimestampFromTimestampReceipt)(receipt)[0]);
+        async (receipt) => (0, utils_1.getTimestampFromTimestampReceipt)(receipt)[0]);
     }
     // Timestamps the specified multiple bytes32 data
     async multiTimestamp(data, overrides) {
-        const tx = await this.contract.multiTimestamp(data, overrides ?? {});
+        if (!this.signer) {
+            throw new Error('Invalid signer');
+        }
+        return new transaction_1.Transaction(await this.contract.multiTimestamp.populateTransaction(data, overrides ?? {}), this.signer, 
         // eslint-disable-next-line require-await
-        return new transaction_1.Transaction(tx, async (receipt) => (0, utils_1.getTimestampFromTimestampReceipt)(receipt));
+        async (receipt) => (0, utils_1.getTimestampFromTimestampReceipt)(receipt));
     }
     // Revokes the specified offchain attestation UID
     async revokeOffchain(uid, overrides) {
-        const tx = await this.contract.revokeOffchain(uid, overrides ?? {});
-        return new transaction_1.Transaction(tx, 
+        if (!this.signer) {
+            throw new Error('Invalid signer');
+        }
+        return new transaction_1.Transaction(await this.contract.revokeOffchain.populateTransaction(uid, overrides ?? {}), this.signer, 
         // eslint-disable-next-line require-await
         async (receipt) => (0, utils_1.getTimestampFromOffchainRevocationReceipt)(receipt)[0]);
     }
     // Revokes the specified multiple offchain attestation UIDs
     async multiRevokeOffchain(uids, overrides) {
-        const tx = await this.contract.multiRevokeOffchain(uids, overrides ?? {});
+        if (!this.signer) {
+            throw new Error('Invalid signer');
+        }
+        return new transaction_1.Transaction(await this.contract.multiRevokeOffchain.populateTransaction(uids, overrides ?? {}), this.signer, 
         // eslint-disable-next-line require-await
-        return new transaction_1.Transaction(tx, async (receipt) => (0, utils_1.getTimestampFromOffchainRevocationReceipt)(receipt));
+        async (receipt) => (0, utils_1.getTimestampFromOffchainRevocationReceipt)(receipt));
     }
     // Returns the domain separator used in the encoding of the signatures for attest, and revoke
     getDomainSeparator() {
diff --git a/dist/eas.js.map b/dist/eas.js.map
index 98e02f2..d7d3dee 100644
--- a/dist/eas.js.map
+++ b/dist/eas.js.map
@@ -1 +1 @@
-{"version":3,"file":"eas.js","sourceRoot":"","sources":["../src/eas.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"eas.js","sourceRoot":"","sources":["../src/eas.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/eip712-proxy.js b/dist/eip712-proxy.js
index c344c83..4e169bc 100644
--- a/dist/eip712-proxy.js
+++ b/dist/eip712-proxy.js
@@ -56,7 +56,10 @@ class EIP712Proxy extends transaction_1.Base {
     }
     // Attests to a specific schema via an EIP712 delegation request using an external EIP712 proxy
     async attestByDelegationProxy({ schema, data: { recipient, data, expirationTime = request_1.NO_EXPIRATION, revocable = true, refUID = utils_1.ZERO_BYTES32, value = 0n }, attester, signature, deadline = request_1.NO_EXPIRATION }, overrides) {
-        const tx = await this.contract.attestByDelegation({
+        if (!this.signer) {
+            throw new Error('Invalid signer');
+        }
+        return new transaction_1.Transaction(await this.contract.attestByDelegation.populateTransaction({
             schema,
             data: {
                 recipient,
@@ -69,12 +72,15 @@ class EIP712Proxy extends transaction_1.Base {
             signature,
             attester,
             deadline
-        }, { value, ...overrides });
+        }, { value, ...overrides }), this.signer, 
         // eslint-disable-next-line require-await
-        return new transaction_1.Transaction(tx, async (receipt) => (0, utils_1.getUIDsFromAttestReceipt)(receipt)[0]);
+        async (receipt) => (0, utils_1.getUIDsFromAttestReceipt)(receipt)[0]);
     }
     // Multi-attests to multiple schemas via an EIP712 delegation requests using an external EIP712 proxy
     async multiAttestByDelegationProxy(requests, overrides) {
+        if (!this.signer) {
+            throw new Error('Invalid signer');
+        }
         const multiAttestationRequests = requests.map((r) => ({
             schema: r.schema,
             data: r.data.map((d) => ({
@@ -93,16 +99,19 @@ class EIP712Proxy extends transaction_1.Base {
             const total = data.reduce((res, r) => res + r.value, 0n);
             return res + total;
         }, 0n);
-        const tx = await this.contract.multiAttestByDelegation(multiAttestationRequests, {
+        return new transaction_1.Transaction(await this.contract.multiAttestByDelegation.populateTransaction(multiAttestationRequests, {
             value: requestedValue,
             ...overrides
-        });
+        }), this.signer, 
         // eslint-disable-next-line require-await
-        return new transaction_1.Transaction(tx, async (receipt) => (0, utils_1.getUIDsFromAttestReceipt)(receipt));
+        async (receipt) => (0, utils_1.getUIDsFromAttestReceipt)(receipt));
     }
     // Revokes an existing attestation an EIP712 delegation request using an external EIP712 proxy
     async revokeByDelegationProxy({ schema, data: { uid, value = 0n }, signature, revoker, deadline = request_1.NO_EXPIRATION }, overrides) {
-        const tx = await this.contract.revokeByDelegation({
+        if (!this.signer) {
+            throw new Error('Invalid signer');
+        }
+        return new transaction_1.Transaction(await this.contract.revokeByDelegation.populateTransaction({
             schema,
             data: {
                 uid,
@@ -111,11 +120,13 @@ class EIP712Proxy extends transaction_1.Base {
             signature,
             revoker,
             deadline
-        }, { value, ...overrides });
-        return new transaction_1.Transaction(tx, async () => { });
+        }, { value, ...overrides }), this.signer, async () => { });
     }
     // Multi-revokes multiple attestations via an EIP712 delegation requests using an external EIP712 proxy
     async multiRevokeByDelegationProxy(requests, overrides) {
+        if (!this.signer) {
+            throw new Error('Invalid signer');
+        }
         const multiRevocationRequests = requests.map((r) => ({
             schema: r.schema,
             data: r.data.map((d) => ({
@@ -130,11 +141,10 @@ class EIP712Proxy extends transaction_1.Base {
             const total = data.reduce((res, r) => res + r.value, 0n);
             return res + total;
         }, 0n);
-        const tx = await this.contract.multiRevokeByDelegation(multiRevocationRequests, {
+        return new transaction_1.Transaction(await this.contract.multiRevokeByDelegation.populateTransaction(multiRevocationRequests, {
             value: requestedValue,
             ...overrides
-        });
-        return new transaction_1.Transaction(tx, async () => { });
+        }), this.signer, async () => { });
     }
     // Sets the delegated attestations helper
     async setDelegated() {
diff --git a/dist/eip712-proxy.js.map b/dist/eip712-proxy.js.map
index 81ed3c4..638631c 100644
--- a/dist/eip712-proxy.js.map
+++ b/dist/eip712-proxy.js.map
@@ -1 +1 @@
-{"version":3,"file":"eip712-proxy.js","sourceRoot":"","sources":["../src/eip712-proxy.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"eip712-proxy.js","sourceRoot":"","sources":["../src/eip712-proxy.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/indexer.js b/dist/indexer.js
index a39b37e..684e6df 100644
--- a/dist/indexer.js
+++ b/dist/indexer.js
@@ -26,13 +26,17 @@ class Indexer extends transaction_1.Base {
     }
     // Indexes an existing attestation
     async indexAttestation({ uid }, overrides) {
-        const tx = await this.contract.indexAttestation(uid, { ...overrides });
-        return new transaction_1.Transaction(tx, async () => { });
+        if (!this.signer) {
+            throw new Error('Invalid signer');
+        }
+        return new transaction_1.Transaction(await this.contract.indexAttestation.populateTransaction(uid, { ...overrides }), this.signer, async () => { });
     }
     // Indexes multiple existing attestations
     async indexAttestations({ uids }, overrides) {
-        const tx = await this.contract.indexAttestations(uids, { ...overrides });
-        return new transaction_1.Transaction(tx, async () => { });
+        if (!this.signer) {
+            throw new Error('Invalid signer');
+        }
+        return new transaction_1.Transaction(await this.contract.indexAttestations.populateTransaction(uids, { ...overrides }), this.signer, async () => { });
     }
     isAttestationIndexed({ uid }, overrides) {
         return this.contract.isAttestationIndexed(uid, { ...overrides });
diff --git a/dist/indexer.js.map b/dist/indexer.js.map
index 60da4ec..024ed3b 100644
--- a/dist/indexer.js.map
+++ b/dist/indexer.js.map
@@ -1 +1 @@
-{"version":3,"file":"indexer.js","sourceRoot":"","sources":["../src/indexer.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"indexer.js","sourceRoot":"","sources":["../src/indexer.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/schema-encoder.js.map b/dist/schema-encoder.js.map
index 320251c..f560748 100644
--- a/dist/schema-encoder.js.map
+++ b/dist/schema-encoder.js.map
@@ -1 +1 @@
-{"version":3,"file":"schema-encoder.js","sourceRoot":"","sources":["../src/schema-encoder.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"schema-encoder.js","sourceRoot":"","sources":["../src/schema-encoder.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/schema-registry.js b/dist/schema-registry.js
index ace586d..c8617c3 100644
--- a/dist/schema-registry.js
+++ b/dist/schema-registry.js
@@ -16,9 +16,12 @@ class SchemaRegistry extends transaction_1.Base {
     }
     // Registers a new schema and returns its UID
     async register({ schema, resolverAddress = utils_1.ZERO_ADDRESS, revocable = true }, overrides) {
-        const tx = await this.contract.register(schema, resolverAddress, revocable, overrides ?? {});
+        if (!this.signer) {
+            throw new Error('Invalid signer');
+        }
+        return new transaction_1.Transaction(await this.contract.register.populateTransaction(schema, resolverAddress, revocable, overrides ?? {}), this.signer, 
         // eslint-disable-next-line require-await
-        return new transaction_1.Transaction(tx, async (_receipt) => (0, utils_1.getSchemaUID)(schema, resolverAddress, revocable));
+        async (_receipt) => (0, utils_1.getSchemaUID)(schema, resolverAddress, revocable));
     }
     // Returns an existing schema by a schema UID
     async getSchema({ uid }) {
diff --git a/dist/schema-registry.js.map b/dist/schema-registry.js.map
index 67e1328..430f07a 100644
--- a/dist/schema-registry.js.map
+++ b/dist/schema-registry.js.map
@@ -1 +1 @@
-{"version":3,"file":"schema-registry.js","sourceRoot":"","sources":["../src/schema-registry.ts"],"names":[],"mappings":";;;AAAA,+EAGqD;AAErD,8CAAiD;AACjD,+CAAqE;AACrE,mCAAmE;AAuBnE,MAAa,cAAe,SAAQ,kBAA4B;IAC9D,YAAY,OAAe,EAAE,OAA+B;QAC1D,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;QAEjC,KAAK,CAAC,IAAI,uCAAuB,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,sCAAsC;IAC/B,KAAK,CAAC,UAAU;QACrB,OAAO,CAAC,MAAM,IAAA,uBAAa,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;IACzE,CAAC;IAED,6CAA6C;IACtC,KAAK,CAAC,QAAQ,CACnB,EAAE,MAAM,EAAE,eAAe,GAAG,oBAAY,EAAE,SAAS,GAAG,IAAI,EAAwB,EAClF,SAAqB;QAErB,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC;QAE7F,yCAAyC;QACzC,OAAO,IAAI,yBAAW,CAAC,EAAE,EAAE,KAAK,EAAE,QAA4B,EAAE,EAAE,CAChE,IAAA,oBAAY,EAAC,MAAM,EAAE,eAAe,EAAE,SAAS,CAAC,CACjD,CAAC;IACJ,CAAC;IAED,6CAA6C;IACtC,KAAK,CAAC,SAAS,CAAC,EAAE,GAAG,EAAmB;QAC7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAClD,IAAI,MAAM,CAAC,GAAG,KAAK,oBAAY,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAlCD,wCAkCC"}
\ No newline at end of file
+{"version":3,"file":"schema-registry.js","sourceRoot":"","sources":["../src/schema-registry.ts"],"names":[],"mappings":";;;AAAA,+EAGqD;AAErD,8CAAiD;AACjD,+CAAqE;AACrE,mCAAmE;AAuBnE,MAAa,cAAe,SAAQ,kBAA4B;IAC9D,YAAY,OAAe,EAAE,OAA+B;QAC1D,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;QAEjC,KAAK,CAAC,IAAI,uCAAuB,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,sCAAsC;IAC/B,KAAK,CAAC,UAAU;QACrB,OAAO,CAAC,MAAM,IAAA,uBAAa,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;IACzE,CAAC;IAED,6CAA6C;IACtC,KAAK,CAAC,QAAQ,CACnB,EAAE,MAAM,EAAE,eAAe,GAAG,oBAAY,EAAE,SAAS,GAAG,IAAI,EAAwB,EAClF,SAAqB;QAErB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACpC,CAAC;QAED,OAAO,IAAI,yBAAW,CACpB,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,mBAAmB,CAAC,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,IAAI,EAAE,CAAC,EACrG,IAAI,CAAC,MAAM;QACX,yCAAyC;QACzC,KAAK,EAAE,QAA4B,EAAE,EAAE,CAAC,IAAA,oBAAY,EAAC,MAAM,EAAE,eAAe,EAAE,SAAS,CAAC,CACzF,CAAC;IACJ,CAAC;IAED,6CAA6C;IACtC,KAAK,CAAC,SAAS,CAAC,EAAE,GAAG,EAAmB;QAC7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAClD,IAAI,MAAM,CAAC,GAAG,KAAK,oBAAY,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAtCD,wCAsCC"}
\ No newline at end of file
diff --git a/dist/transaction.d.ts b/dist/transaction.d.ts
index 2cbe4d3..c4f7e98 100644
--- a/dist/transaction.d.ts
+++ b/dist/transaction.d.ts
@@ -1,18 +1,20 @@
-import { Addressable, BaseContract, ContractFactory, TransactionReceipt, TransactionRequest, TransactionResponse } from 'ethers';
+import { Addressable, BaseContract, ContractFactory, ContractTransaction, TransactionReceipt, TransactionRequest } from 'ethers';
 export interface TransactionSigner extends Addressable {
-    estimateGas?: (tx: TransactionRequest) => Promise<bigint>;
-    call?: (tx: TransactionRequest) => Promise<string>;
-    resolveName?: (name: string) => Promise<null | string>;
-    sendTransaction?: (tx: TransactionRequest) => Promise<any>;
+    estimateGas: (tx: TransactionRequest) => Promise<bigint>;
+    sendTransaction: (tx: TransactionRequest) => Promise<any>;
+    call: (tx: TransactionRequest) => Promise<string>;
+    resolveName: (name: string) => Promise<null | string>;
 }
 export declare class Transaction<T> {
-    readonly tx: TransactionResponse;
+    readonly data: ContractTransaction;
+    private readonly signer;
     private readonly waitCallback;
-    constructor(tx: TransactionResponse, waitCallback: (receipt: TransactionReceipt) => Promise<T>);
+    constructor(data: ContractTransaction, signer: TransactionSigner, waitCallback: (receipt: TransactionReceipt) => Promise<T>);
     wait(confirmations?: number): Promise<T>;
 }
 export declare class Base<C extends BaseContract> {
     contract: C;
+    protected signer?: TransactionSigner;
     constructor(factory: ContractFactory, address: string, signer?: TransactionSigner);
     connect(signer: TransactionSigner): this;
     getChainId(): Promise<bigint>;
diff --git a/dist/transaction.js b/dist/transaction.js
index 87fbd7b..e414e71 100644
--- a/dist/transaction.js
+++ b/dist/transaction.js
@@ -2,16 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Base = exports.Transaction = void 0;
 class Transaction {
-    tx;
+    data;
+    signer;
     waitCallback;
-    constructor(tx, waitCallback) {
-        this.tx = tx;
+    constructor(data, signer, waitCallback) {
+        this.data = data;
+        this.signer = signer;
         this.waitCallback = waitCallback;
     }
     async wait(confirmations) {
-        const receipt = await this.tx.wait(confirmations);
+        const tx = await this.signer.sendTransaction(this.data);
+        const receipt = await tx.wait(confirmations);
         if (!receipt) {
-            throw new Error(`Unable to confirm: ${this.tx}`);
+            throw new Error(`Unable to confirm: ${tx}`);
         }
         return this.waitCallback(receipt);
     }
@@ -19,10 +22,12 @@ class Transaction {
 exports.Transaction = Transaction;
 class Base {
     contract;
+    signer;
     constructor(factory, address, signer) {
         this.contract = factory.attach(address);
         if (signer) {
             this.connect(signer);
+            this.signer = signer;
         }
     }
     // Connects the API to a specific signer
diff --git a/dist/transaction.js.map b/dist/transaction.js.map
index e103fa4..99a1304 100644
--- a/dist/transaction.js.map
+++ b/dist/transaction.js.map
@@ -1 +1 @@
-{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../src/transaction.ts"],"names":[],"mappings":";;;AAkBA,MAAa,WAAW;IACN,EAAE,CAAsB;IACvB,YAAY,CAA8C;IAE3E,YAAY,EAAuB,EAAE,YAAyD;QAC5F,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,aAAsB;QACtC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAClD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;CACF;AAjBD,kCAiBC;AAED,MAAa,IAAI;IACR,QAAQ,CAAI;IAEnB,YAAY,OAAwB,EAAE,OAAe,EAAE,MAA0B;QAC/E,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAM,CAAC;QAC7C,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IAED,wCAAwC;IACjC,OAAO,CAAC,MAAyB;QACtC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAmC,CAAM,CAAC;QAEhF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,oBAAoB;IACb,KAAK,CAAC,UAAU;QACrB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;QAChD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACrE,CAAC;QAED,OAAO,CAAC,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC;IAC/C,CAAC;CACF;AA1BD,oBA0BC"}
\ No newline at end of file
+{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../src/transaction.ts"],"names":[],"mappings":";;;AAkBA,MAAa,WAAW;IACN,IAAI,CAAsB;IACzB,MAAM,CAAoB;IAC1B,YAAY,CAA8C;IAE3E,YACE,IAAyB,EACzB,MAAyB,EACzB,YAAyD;QAEzD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,aAAsB;QACtC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC7C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAC;QAC9C,CAAC;QAED,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;CACF;AAxBD,kCAwBC;AAED,MAAa,IAAI;IACR,QAAQ,CAAI;IACT,MAAM,CAAqB;IAErC,YAAY,OAAwB,EAAE,OAAe,EAAE,MAA0B;QAC/E,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAM,CAAC;QAC7C,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAErB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACvB,CAAC;IACH,CAAC;IAED,wCAAwC;IACjC,OAAO,CAAC,MAAyB;QACtC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAmC,CAAM,CAAC;QAEhF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,oBAAoB;IACb,KAAK,CAAC,UAAU;QACrB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;QAChD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACrE,CAAC;QAED,OAAO,CAAC,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC;IAC/C,CAAC;CACF;AA7BD,oBA6BC"}
\ No newline at end of file