@levrbet/shared 0.3.59 → 0.3.61
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/react/hooks/auth/useAuthHeaders.js +3 -3
- package/dist/react/hooks/auth/useAuthHeaders.js.map +1 -1
- package/dist/server/contracts/clients/ozRelayerService.d.ts +8 -1
- package/dist/server/contracts/clients/ozRelayerService.js +20 -2
- package/dist/server/contracts/clients/ozRelayerService.js.map +1 -1
- package/dist/server/contracts/instances.d.ts +4 -1
- package/dist/server/contracts/instances.js +2 -2
- package/dist/server/contracts/instances.js.map +1 -1
- package/package.json +1 -1
|
@@ -30,16 +30,14 @@ const injectedDependencies_1 = require("../../injectedDependencies");
|
|
|
30
30
|
const queryKeys_1 = require("../../queryKeys");
|
|
31
31
|
function useBaseAuthHeaders(levrAuth, props = {}) {
|
|
32
32
|
const { address } = props;
|
|
33
|
-
const { usePrivy, useIdentityToken,
|
|
33
|
+
const { usePrivy, useIdentityToken, useQuery } = (0, injectedDependencies_1.getDependencies)();
|
|
34
34
|
const { getAccessToken, user } = usePrivy();
|
|
35
35
|
const { identityToken } = useIdentityToken();
|
|
36
|
-
const { refreshUser } = useUser();
|
|
37
36
|
return useQuery({
|
|
38
37
|
queryKey: queryKeys_1.queryKeys.auth.headers(levrAuth, user?.id, address),
|
|
39
38
|
queryFn: async () => {
|
|
40
39
|
if (!user)
|
|
41
40
|
return {};
|
|
42
|
-
await refreshUser();
|
|
43
41
|
return {
|
|
44
42
|
[core_1.LEVR_AUTH_HEADER]: levrAuth,
|
|
45
43
|
[constants_1.ETH_ADDRESS_HEADER]: address,
|
|
@@ -48,7 +46,9 @@ function useBaseAuthHeaders(levrAuth, props = {}) {
|
|
|
48
46
|
};
|
|
49
47
|
},
|
|
50
48
|
enabled: !lodash_1.default.isNil(user),
|
|
49
|
+
staleTime: (0, ms_1.default)("4m"),
|
|
51
50
|
refetchInterval: (0, ms_1.default)("5m"),
|
|
51
|
+
refetchOnWindowFocus: false,
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
54
|
const useAuthHeaders = (props) => useBaseAuthHeaders(core_1.LevrAuth.PRIVY_USER, props);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAuthHeaders.js","sourceRoot":"","sources":["../../../../src/react/hooks/auth/useAuthHeaders.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;AAEH,oDAAsB;AACtB,4CAAmB;AAGnB,wCAA0D;AAC1D,6DAAoH;AACpH,qEAA4D;AAC5D,+CAA2C;AAM3C,SAAS,kBAAkB,CAAC,QAAkB,EAAE,QAA6B,EAAE;IAC3E,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAA;IACzB,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"useAuthHeaders.js","sourceRoot":"","sources":["../../../../src/react/hooks/auth/useAuthHeaders.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;AAEH,oDAAsB;AACtB,4CAAmB;AAGnB,wCAA0D;AAC1D,6DAAoH;AACpH,qEAA4D;AAC5D,+CAA2C;AAM3C,SAAS,kBAAkB,CAAC,QAAkB,EAAE,QAA6B,EAAE;IAC3E,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAA;IACzB,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,GAAG,IAAA,sCAAe,GAAE,CAAA;IAClE,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAE,CAAA;IAC3C,MAAM,EAAE,aAAa,EAAE,GAAG,gBAAgB,EAAE,CAAA;IAE5C,OAAO,QAAQ,CAAC;QACZ,QAAQ,EAAE,qBAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC;QAC7D,OAAO,EAAE,KAAK,IAAI,EAAE;YAChB,IAAI,CAAC,IAAI;gBAAE,OAAO,EAAE,CAAA;YAEpB,OAAO;gBACH,CAAC,uBAAgB,CAAC,EAAE,QAAQ;gBAC5B,CAAC,8BAAkB,CAAC,EAAE,OAAO;gBAC7B,CAAC,qCAAyB,CAAC,EAAE,MAAM,cAAc,EAAE;gBACnD,CAAC,iCAAqB,CAAC,EAAE,aAAa;aACzC,CAAA;QACL,CAAC;QACD,OAAO,EAAE,CAAC,gBAAC,CAAC,KAAK,CAAC,IAAI,CAAC;QACvB,SAAS,EAAE,IAAA,YAAE,EAAC,IAAI,CAAC;QACnB,eAAe,EAAE,IAAA,YAAE,EAAC,IAAI,CAAC;QACzB,oBAAoB,EAAE,KAAK;KAC9B,CAAC,CAAA;AACN,CAAC;AAEM,MAAM,cAAc,GAAG,CAAC,KAA2B,EAAE,EAAE,CAAC,kBAAkB,CAAC,eAAQ,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;AAAhG,QAAA,cAAc,kBAAkF;AAEtG,MAAM,mBAAmB,GAAG,CAAC,KAA2B,EAAE,EAAE,CAAC,kBAAkB,CAAC,eAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;AAAtG,QAAA,mBAAmB,uBAAmF"}
|
|
@@ -1,10 +1,17 @@
|
|
|
1
1
|
import type { WalletClient } from "viem";
|
|
2
2
|
import { LevrChain, LevrRelayerGroup } from "../../../core";
|
|
3
|
+
export interface RelayerSubmitEvent {
|
|
4
|
+
relayerTxId: string;
|
|
5
|
+
relayerSignerAddress: string;
|
|
6
|
+
relayerId: string;
|
|
7
|
+
}
|
|
8
|
+
export type OnRelayerSubmit = (event: RelayerSubmitEvent) => Promise<void>;
|
|
3
9
|
declare class OzRelayerService {
|
|
4
10
|
private relayerGroupSizes;
|
|
5
11
|
private lastUsedIndexRedisKey;
|
|
6
|
-
getWalletClient: (chainId: LevrChain, relayerGroup: LevrRelayerGroup) => Promise<WalletClient>;
|
|
12
|
+
getWalletClient: (chainId: LevrChain, relayerGroup: LevrRelayerGroup, onSubmit?: OnRelayerSubmit) => Promise<WalletClient>;
|
|
7
13
|
private createWalletClient;
|
|
14
|
+
private createWalletClientWithHooks;
|
|
8
15
|
private relayersApi;
|
|
9
16
|
private getRelayer;
|
|
10
17
|
private createRelayerTransport;
|
|
@@ -83,12 +83,14 @@ class OzRelayerService {
|
|
|
83
83
|
},
|
|
84
84
|
};
|
|
85
85
|
this.lastUsedIndexRedisKey = `oz-relayer-last-used-index`;
|
|
86
|
-
this.getWalletClient = async (chainId, relayerGroup) => {
|
|
86
|
+
this.getWalletClient = async (chainId, relayerGroup, onSubmit) => {
|
|
87
87
|
const index = await this.getNextIndex(chainId, relayerGroup);
|
|
88
88
|
const relayerId = `${relayerGroup}_${chainId}_${index + 1}`;
|
|
89
|
+
if (onSubmit)
|
|
90
|
+
return this.createWalletClientWithHooks(relayerId, chainId, onSubmit);
|
|
89
91
|
return this.createWalletClient(relayerId, chainId);
|
|
90
92
|
};
|
|
91
|
-
this.createRelayerTransport = (relayer, chainId) => {
|
|
93
|
+
this.createRelayerTransport = (relayer, chainId, onSubmit) => {
|
|
92
94
|
const { waitForTxConfirmation, proxyTxToRelayer } = this;
|
|
93
95
|
return (0, viem_1.custom)({
|
|
94
96
|
async request({ method, params }) {
|
|
@@ -100,6 +102,13 @@ class OzRelayerService {
|
|
|
100
102
|
if (!request)
|
|
101
103
|
throw new Error("Missing transaction parameters");
|
|
102
104
|
const txId = await proxyTxToRelayer({ request, chainId, relayer });
|
|
105
|
+
if (onSubmit) {
|
|
106
|
+
await onSubmit({
|
|
107
|
+
relayerTxId: txId,
|
|
108
|
+
relayerSignerAddress: relayer.address,
|
|
109
|
+
relayerId: relayer.id,
|
|
110
|
+
});
|
|
111
|
+
}
|
|
103
112
|
return await waitForTxConfirmation(relayer.id, txId, chainId);
|
|
104
113
|
}
|
|
105
114
|
config_1.logger.warn(`Unhandled method: ${method} with params:`, params);
|
|
@@ -234,6 +243,15 @@ class OzRelayerService {
|
|
|
234
243
|
account: relayer.address,
|
|
235
244
|
});
|
|
236
245
|
}
|
|
246
|
+
async createWalletClientWithHooks(relayerId, chainId, onSubmit) {
|
|
247
|
+
config_1.logger.info(`Creating wallet client with onSubmit for relayerId=${relayerId} on chainId=${chainId}`);
|
|
248
|
+
const relayer = await this.getRelayer(relayerId);
|
|
249
|
+
return (0, viem_1.createWalletClient)({
|
|
250
|
+
chain: core_1.levrChainIdToChain[chainId],
|
|
251
|
+
transport: this.createRelayerTransport(relayer, chainId, onSubmit),
|
|
252
|
+
account: relayer.address,
|
|
253
|
+
});
|
|
254
|
+
}
|
|
237
255
|
relayersApi() {
|
|
238
256
|
config_1.logger.info(`Creating Relayers API client`);
|
|
239
257
|
const { RELAYER_ACCESS_TOKEN } = core_1.Config.init(config_1.relayerSchema);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ozRelayerService.js","sourceRoot":"","sources":["../../../../src/server/contracts/clients/ozRelayerService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2DAOkC;AAClC,+CAA2C;AAC3C,8DAAoC;AACpC,kDAAyB;AACzB,2DAA4C;AAE5C,+BAAwD;AACxD,wCAA8H;AAC9H,yCAAwF;
|
|
1
|
+
{"version":3,"file":"ozRelayerService.js","sourceRoot":"","sources":["../../../../src/server/contracts/clients/ozRelayerService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
import type { GetContractReturnType, PublicClient, WalletClient } from "viem";
|
|
2
2
|
import { type abis, type CustomWalletClient, type LevrChain, type LevrRelayerGroup } from "../../core";
|
|
3
|
+
import { type OnRelayerSubmit } from "./clients/ozRelayerService";
|
|
3
4
|
interface ClientOptions {
|
|
4
5
|
relayer?: LevrRelayerGroup;
|
|
5
6
|
walletClient?: WalletClient;
|
|
6
7
|
publicClient?: PublicClient;
|
|
8
|
+
/** Fires after the relayer accepts a tx, before on-chain confirmation.*/
|
|
9
|
+
onSubmit?: OnRelayerSubmit;
|
|
7
10
|
}
|
|
8
11
|
/**
|
|
9
12
|
* Retrieves a Levr contract instance using a relayer if provided.
|
|
@@ -16,5 +19,5 @@ interface ClientOptions {
|
|
|
16
19
|
* @param options.walletClient - (Optional) The wallet client to use for contract interactions.
|
|
17
20
|
* @returns A promise that resolves to the contract instance typed according to the ABI.
|
|
18
21
|
*/
|
|
19
|
-
export declare function getLevrContractWithRelayer<T extends keyof typeof abis>(contractName: T, chainId: LevrChain, { relayer, publicClient, walletClient }: ClientOptions): Promise<GetContractReturnType<(typeof abis)[T], CustomWalletClient>>;
|
|
22
|
+
export declare function getLevrContractWithRelayer<T extends keyof typeof abis>(contractName: T, chainId: LevrChain, { relayer, publicClient, walletClient, onSubmit }: ClientOptions): Promise<GetContractReturnType<(typeof abis)[T], CustomWalletClient>>;
|
|
20
23
|
export {};
|
|
@@ -18,9 +18,9 @@ const ozRelayerService_1 = __importDefault(require("./clients/ozRelayerService")
|
|
|
18
18
|
* @param options.walletClient - (Optional) The wallet client to use for contract interactions.
|
|
19
19
|
* @returns A promise that resolves to the contract instance typed according to the ABI.
|
|
20
20
|
*/
|
|
21
|
-
async function getLevrContractWithRelayer(contractName, chainId, { relayer, publicClient, walletClient }) {
|
|
21
|
+
async function getLevrContractWithRelayer(contractName, chainId, { relayer, publicClient, walletClient, onSubmit }) {
|
|
22
22
|
if (relayer && !walletClient)
|
|
23
|
-
walletClient = await ozRelayerService_1.default.getWalletClient(chainId, relayer);
|
|
23
|
+
walletClient = await ozRelayerService_1.default.getWalletClient(chainId, relayer, onSubmit);
|
|
24
24
|
if (!publicClient)
|
|
25
25
|
publicClient = core_1.publicClientService.getPremiumPubClient(chainId);
|
|
26
26
|
return (0, core_1.getLevrContract)(contractName, chainId, config_1.LEVR_ENV, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instances.js","sourceRoot":"","sources":["../../../src/server/contracts/instances.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"instances.js","sourceRoot":"","sources":["../../../src/server/contracts/instances.ts"],"names":[],"mappings":";;;;;AA+BA,gEAWC;AAzCD,qCAOmB;AACnB,sCAAoC;AACpC,kFAAmF;AAUnF;;;;;;;;;;GAUG;AACI,KAAK,UAAU,0BAA0B,CAC5C,YAAe,EACf,OAAkB,EAClB,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAiB;IAEhE,IAAI,OAAO,IAAI,CAAC,YAAY;QAAE,YAAY,GAAG,MAAM,0BAAgB,CAAC,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC/G,IAAI,CAAC,YAAY;QAAE,YAAY,GAAG,0BAAmB,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAA;IAClF,OAAO,IAAA,sBAAe,EAAC,YAAY,EAAE,OAAO,EAAE,iBAAQ,EAAE;QACpD,YAAY;QACZ,YAAY;KACf,CAAC,CAAA;AACN,CAAC"}
|