Skip to content

Commit

Permalink
fix: imports (#48)
Browse files Browse the repository at this point in the history
* fix: imports

* fix: revert changes

* fix: flag as sideeffect free
  • Loading branch information
sakulstra committed Mar 4, 2024
1 parent fdd7ebc commit f357048
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 11 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"engines": {
"node": ">=14.0.0"
},
"sideEffects": false,
"keywords": [],
"author": "",
"license": "ISC",
Expand Down
4 changes: 2 additions & 2 deletions src/lib/types/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BytesLike, ethers } from "ethers";
import { BytesLike, Signer, BrowserProvider } from "ethers";

export enum RelayCall {
CallWithSyncFee,
Expand Down Expand Up @@ -78,4 +78,4 @@ export type SafeRequestPayload<T> = {
: T[K];
};

export type SignerOrProvider = ethers.BrowserProvider | ethers.Signer;
export type SignerOrProvider = BrowserProvider | Signer;
6 changes: 3 additions & 3 deletions src/utils/generateSalt.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { ethers } from "ethers";
import { AbiCoder, keccak256 } from "ethers";

export const generateSalt = (): string => {
const randomSeed = Math.floor(Math.random() * 1000000);
const dataEncoded = ethers.AbiCoder.defaultAbiCoder().encode(
const dataEncoded = AbiCoder.defaultAbiCoder().encode(
["uint256", "uint256"],
[randomSeed, new Date().getMilliseconds()]
);
return ethers.keccak256(dataEncoded);
return keccak256(dataEncoded);
};
4 changes: 2 additions & 2 deletions src/utils/getProviderChainId.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ethers } from "ethers";
import { Provider } from "ethers";

import { SignerOrProvider } from "../lib/types";

Expand All @@ -7,7 +7,7 @@ import { isSigner } from "./isSigner";
export const getProviderChainId = async (
signerOrProvider: SignerOrProvider
): Promise<bigint> => {
let provider: ethers.Provider;
let provider: Provider;
if (isSigner(signerOrProvider)) {
if (!signerOrProvider.provider) {
throw new Error(`Missing provider`);
Expand Down
4 changes: 2 additions & 2 deletions src/utils/getUserNonce.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ethers } from "ethers";
import { Contract } from "ethers";

import { USER_NONCE_ABI } from "../constants";
import { Config, SignerOrProvider } from "../lib/types";
Expand All @@ -22,7 +22,7 @@ export const getUserNonce = async (

const chainId = await getProviderChainId(signerOrProvider);

const contract = new ethers.Contract(
const contract = new Contract(
getGelatoRelayERC2771Address({ chainId, type }, config),
USER_NONCE_ABI,
signerOrProvider
Expand Down
4 changes: 2 additions & 2 deletions src/utils/isSigner.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { ethers } from "ethers";
import { Signer } from "ethers";

import { SignerOrProvider } from "../lib/types";

export const isSigner = (
signerOrProvider: SignerOrProvider
): signerOrProvider is ethers.Signer => {
): signerOrProvider is Signer => {
return "signTransaction" in signerOrProvider;
};

0 comments on commit f357048

Please sign in to comment.