@shielded-x402/client 0.2.0 → 0.2.2
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/LICENSE +21 -0
- package/dist/circuits/spend_change.json +156 -156
- package/dist/relayerFetch.d.ts +2 -1
- package/dist/relayerFetch.d.ts.map +1 -1
- package/dist/relayerFetch.js +118 -28
- package/dist/relayerFetch.js.map +1 -1
- package/dist/shieldedFetch.d.ts +6 -0
- package/dist/shieldedFetch.d.ts.map +1 -1
- package/dist/shieldedFetch.js +21 -0
- package/dist/shieldedFetch.js.map +1 -1
- package/package.json +10 -11
package/dist/relayerFetch.d.ts
CHANGED
|
@@ -22,10 +22,11 @@ export interface CreateRelayedShieldedFetchConfig {
|
|
|
22
22
|
sdk: ShieldedClientSDK;
|
|
23
23
|
relayerEndpoint: string;
|
|
24
24
|
relayerPath?: string;
|
|
25
|
+
relayerChallengePath?: string;
|
|
25
26
|
resolveContext: (args: ResolveRelayedContextArgs) => Promise<RelayedShieldedFetchContext>;
|
|
26
27
|
challengeUrlResolver?: (args: {
|
|
27
28
|
input: string;
|
|
28
|
-
requirement
|
|
29
|
+
requirement?: PaymentRequirement;
|
|
29
30
|
}) => string | undefined;
|
|
30
31
|
onUnsupportedRail?: (args: UnsupportedRelayedRailArgs) => Promise<Response>;
|
|
31
32
|
fetchImpl?: typeof fetch;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relayerFetch.d.ts","sourceRoot":"","sources":["../src/relayerFetch.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"relayerFetch.d.ts","sourceRoot":"","sources":["../src/relayerFetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,GAAG,EACR,KAAK,kBAAkB,EAKvB,KAAK,YAAY,EAClB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,YAAY,CAAC;IACnB,OAAO,EAAE,aAAa,CAAC;IACvB,WAAW,EAAE,GAAG,CAAC;CAClB;AAED,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,WAAW,CAAC;IAClB,WAAW,EAAE,kBAAkB,CAAC;IAChC,iBAAiB,EAAE,QAAQ,CAAC;CAC7B;AAED,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,WAAW,CAAC;IAClB,WAAW,EAAE,kBAAkB,CAAC;IAChC,iBAAiB,EAAE,QAAQ,CAAC;CAC7B;AAED,MAAM,WAAW,gCAAgC;IAC/C,GAAG,EAAE,iBAAiB,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,cAAc,EAAE,CAAC,IAAI,EAAE,yBAAyB,KAAK,OAAO,CAAC,2BAA2B,CAAC,CAAC;IAC1F,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,kBAAkB,CAAA;KAAE,KAAK,MAAM,GAAG,SAAS,CAAC;IACzG,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,0BAA0B,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC5E,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;CAC1B;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAyHlG,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,gCAAgC,GAAG,oBAAoB,CAuHzG"}
|
package/dist/relayerFetch.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { RELAYER_ROUTES, X402_HEADERS } from '@shielded-x402/shared-types';
|
|
1
|
+
import { parsePaymentRequiredEnvelope, parsePaymentRequiredHeader, RELAYER_ROUTES, X402_HEADERS } from '@shielded-x402/shared-types';
|
|
2
2
|
function normalizeInput(input) {
|
|
3
3
|
if (typeof input === 'string')
|
|
4
4
|
return input;
|
|
@@ -14,14 +14,66 @@ function headersToRecord(headers) {
|
|
|
14
14
|
});
|
|
15
15
|
return out;
|
|
16
16
|
}
|
|
17
|
-
function
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
17
|
+
function bytesToBase64(bytes) {
|
|
18
|
+
return Buffer.from(bytes).toString('base64');
|
|
19
|
+
}
|
|
20
|
+
function serializedToFetchInit(method, serialized) {
|
|
21
|
+
const init = {
|
|
22
|
+
method,
|
|
23
|
+
headers: serialized.headers
|
|
24
|
+
};
|
|
25
|
+
if (method !== 'GET' && method !== 'HEAD' && serialized.bodyBase64 !== undefined) {
|
|
26
|
+
init.body = Buffer.from(serialized.bodyBase64, 'base64');
|
|
27
|
+
}
|
|
28
|
+
return init;
|
|
29
|
+
}
|
|
30
|
+
async function requestShieldedRequirementFromRelayer(baseFetch, relayerEndpoint, relayerChallengePath, merchantRequest, merchantPaymentRequiredHeader) {
|
|
31
|
+
const challengeRequest = {
|
|
32
|
+
merchantRequest,
|
|
33
|
+
merchantPaymentRequiredHeader
|
|
34
|
+
};
|
|
35
|
+
const response = await baseFetch(`${relayerEndpoint.replace(/\/$/, '')}${relayerChallengePath}`, {
|
|
36
|
+
method: 'POST',
|
|
37
|
+
headers: {
|
|
38
|
+
'content-type': 'application/json'
|
|
39
|
+
},
|
|
40
|
+
body: JSON.stringify(challengeRequest)
|
|
41
|
+
});
|
|
42
|
+
if (!response.ok) {
|
|
43
|
+
const body = await response.text();
|
|
44
|
+
throw new Error(`relayer challenge request failed: ${response.status} ${body}`);
|
|
45
|
+
}
|
|
46
|
+
const payload = (await response.json());
|
|
47
|
+
if (payload.requirement) {
|
|
48
|
+
return payload.requirement;
|
|
49
|
+
}
|
|
50
|
+
if (payload.paymentRequiredHeader) {
|
|
51
|
+
return parsePaymentRequiredHeader(payload.paymentRequiredHeader);
|
|
52
|
+
}
|
|
53
|
+
throw new Error('relayer challenge response missing requirement');
|
|
54
|
+
}
|
|
55
|
+
async function serializeMerchantRequestBody(method, headers, body) {
|
|
56
|
+
const normalizedMethod = method.toUpperCase();
|
|
57
|
+
const supportsBody = normalizedMethod !== 'GET' && normalizedMethod !== 'HEAD';
|
|
58
|
+
const requestInit = {
|
|
59
|
+
method: normalizedMethod
|
|
60
|
+
};
|
|
61
|
+
if (headers !== undefined) {
|
|
62
|
+
requestInit.headers = headers;
|
|
63
|
+
}
|
|
64
|
+
if (supportsBody && body !== undefined && body !== null) {
|
|
65
|
+
requestInit.body = body;
|
|
66
|
+
}
|
|
67
|
+
const request = new Request('http://relay.local', requestInit);
|
|
68
|
+
const serializedHeaders = headersToRecord(request.headers);
|
|
69
|
+
if (!supportsBody || body === undefined || body === null) {
|
|
70
|
+
return { headers: serializedHeaders };
|
|
71
|
+
}
|
|
72
|
+
const bytes = new Uint8Array(await request.arrayBuffer());
|
|
73
|
+
return {
|
|
74
|
+
headers: serializedHeaders,
|
|
75
|
+
bodyBase64: bytesToBase64(bytes)
|
|
76
|
+
};
|
|
25
77
|
}
|
|
26
78
|
function toRelayResultResponse(relayResponse) {
|
|
27
79
|
const settlementIdHeader = { 'x-relayer-settlement-id': relayResponse.settlementId };
|
|
@@ -35,7 +87,7 @@ function toRelayResultResponse(relayResponse) {
|
|
|
35
87
|
}
|
|
36
88
|
});
|
|
37
89
|
}
|
|
38
|
-
return new Response(relayResponse.merchantResult.
|
|
90
|
+
return new Response(Buffer.from(relayResponse.merchantResult.bodyBase64, 'base64'), {
|
|
39
91
|
status: relayResponse.merchantResult.status,
|
|
40
92
|
headers: {
|
|
41
93
|
...relayResponse.merchantResult.headers,
|
|
@@ -46,49 +98,87 @@ function toRelayResultResponse(relayResponse) {
|
|
|
46
98
|
export function createRelayedShieldedFetch(config) {
|
|
47
99
|
const baseFetch = config.fetchImpl ?? fetch;
|
|
48
100
|
const relayerPath = config.relayerPath ?? RELAYER_ROUTES.pay;
|
|
101
|
+
const relayerChallengePath = config.relayerChallengePath ?? RELAYER_ROUTES.challenge;
|
|
49
102
|
return async (input, init) => {
|
|
50
103
|
const normalizedInput = normalizeInput(input);
|
|
51
104
|
const requestInit = init ?? {};
|
|
52
|
-
const
|
|
105
|
+
const method = (requestInit.method ?? 'GET').toUpperCase();
|
|
106
|
+
const serializedRequest = await serializeMerchantRequestBody(method, requestInit.headers, requestInit.body);
|
|
107
|
+
const baseMerchantRequest = {
|
|
108
|
+
url: normalizedInput,
|
|
109
|
+
method,
|
|
110
|
+
headers: serializedRequest.headers,
|
|
111
|
+
...(serializedRequest.bodyBase64 !== undefined
|
|
112
|
+
? { bodyBase64: serializedRequest.bodyBase64 }
|
|
113
|
+
: {})
|
|
114
|
+
};
|
|
115
|
+
const first = await baseFetch(normalizedInput, serializedToFetchInit(method, serializedRequest));
|
|
53
116
|
if (first.status !== 402)
|
|
54
117
|
return first;
|
|
55
|
-
const
|
|
56
|
-
if (
|
|
57
|
-
|
|
58
|
-
|
|
118
|
+
const merchantRequiredHeader = first.headers.get(X402_HEADERS.paymentRequired);
|
|
119
|
+
if (!merchantRequiredHeader) {
|
|
120
|
+
throw new Error(`missing ${X402_HEADERS.paymentRequired} header`);
|
|
121
|
+
}
|
|
122
|
+
parsePaymentRequiredEnvelope(merchantRequiredHeader);
|
|
123
|
+
let requirement;
|
|
124
|
+
let parsedRequirement;
|
|
125
|
+
try {
|
|
126
|
+
parsedRequirement = config.sdk.parse402Response(first).requirement;
|
|
127
|
+
}
|
|
128
|
+
catch {
|
|
129
|
+
parsedRequirement = undefined;
|
|
130
|
+
}
|
|
131
|
+
if (parsedRequirement?.rail === 'shielded-usdc') {
|
|
132
|
+
requirement = parsedRequirement;
|
|
133
|
+
}
|
|
134
|
+
else {
|
|
135
|
+
const challengeUrl = config.challengeUrlResolver?.(parsedRequirement
|
|
136
|
+
? {
|
|
59
137
|
input: normalizedInput,
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
138
|
+
requirement: parsedRequirement
|
|
139
|
+
}
|
|
140
|
+
: {
|
|
141
|
+
input: normalizedInput
|
|
63
142
|
});
|
|
143
|
+
try {
|
|
144
|
+
requirement = await requestShieldedRequirementFromRelayer(baseFetch, config.relayerEndpoint, relayerChallengePath, {
|
|
145
|
+
...baseMerchantRequest,
|
|
146
|
+
...(challengeUrl ? { challengeUrl } : {})
|
|
147
|
+
}, merchantRequiredHeader);
|
|
148
|
+
}
|
|
149
|
+
catch (error) {
|
|
150
|
+
if (parsedRequirement && config.onUnsupportedRail) {
|
|
151
|
+
return config.onUnsupportedRail({
|
|
152
|
+
input: normalizedInput,
|
|
153
|
+
init: requestInit,
|
|
154
|
+
requirement: parsedRequirement,
|
|
155
|
+
challengeResponse: first
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
throw error;
|
|
64
159
|
}
|
|
65
|
-
return first;
|
|
66
160
|
}
|
|
67
161
|
const context = await config.resolveContext({
|
|
68
162
|
input: normalizedInput,
|
|
69
163
|
init: requestInit,
|
|
70
|
-
requirement
|
|
164
|
+
requirement,
|
|
71
165
|
challengeResponse: first
|
|
72
166
|
});
|
|
73
|
-
const prepared = await config.sdk.prepare402Payment(
|
|
167
|
+
const prepared = await config.sdk.prepare402Payment(requirement, context.note, context.witness, context.payerPkHash, serializedRequest.headers);
|
|
74
168
|
const paymentSignatureHeader = prepared.headers.get(X402_HEADERS.paymentSignature);
|
|
75
169
|
if (!paymentSignatureHeader) {
|
|
76
170
|
throw new Error('failed to build relayer payment headers');
|
|
77
171
|
}
|
|
78
172
|
const challengeUrl = config.challengeUrlResolver?.({
|
|
79
173
|
input: normalizedInput,
|
|
80
|
-
requirement
|
|
174
|
+
requirement
|
|
81
175
|
});
|
|
82
|
-
const body = normalizeBody(requestInit.body);
|
|
83
176
|
const relayRequest = {
|
|
84
177
|
merchantRequest: {
|
|
85
|
-
|
|
86
|
-
method: requestInit.method ?? 'GET',
|
|
87
|
-
headers: headersToRecord(requestInit.headers),
|
|
88
|
-
...(body !== undefined ? { body } : {}),
|
|
178
|
+
...baseMerchantRequest,
|
|
89
179
|
...(challengeUrl ? { challengeUrl } : {})
|
|
90
180
|
},
|
|
91
|
-
requirement
|
|
181
|
+
requirement,
|
|
92
182
|
paymentSignatureHeader
|
|
93
183
|
};
|
|
94
184
|
const relayerResponse = await baseFetch(`${config.relayerEndpoint.replace(/\/$/, '')}${relayerPath}`, {
|
package/dist/relayerFetch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relayerFetch.js","sourceRoot":"","sources":["../src/relayerFetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,YAAY,
|
|
1
|
+
{"version":3,"file":"relayerFetch.js","sourceRoot":"","sources":["../src/relayerFetch.ts"],"names":[],"mappings":"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"}
|
package/dist/shieldedFetch.d.ts
CHANGED
|
@@ -27,6 +27,12 @@ export interface CreateShieldedFetchConfig {
|
|
|
27
27
|
init: RequestInit;
|
|
28
28
|
}) => Promise<PaymentRequirement | null>;
|
|
29
29
|
fetchImpl?: typeof fetch;
|
|
30
|
+
relayerEndpoint?: string;
|
|
31
|
+
relayerPath?: string;
|
|
32
|
+
challengeUrlResolver?: (args: {
|
|
33
|
+
input: string;
|
|
34
|
+
requirement?: PaymentRequirement;
|
|
35
|
+
}) => string | undefined;
|
|
30
36
|
}
|
|
31
37
|
export type ShieldedFetch = (input: string | URL, init?: RequestInit) => Promise<Response>;
|
|
32
38
|
export declare function createShieldedFetch(config: CreateShieldedFetchConfig): ShieldedFetch;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shieldedFetch.d.ts","sourceRoot":"","sources":["../src/shieldedFetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,GAAG,EACR,KAAK,kBAAkB,EACvB,KAAK,YAAY,EAClB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"shieldedFetch.d.ts","sourceRoot":"","sources":["../src/shieldedFetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,GAAG,EACR,KAAK,kBAAkB,EACvB,KAAK,YAAY,EAClB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAMjD,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,YAAY,CAAC;IACnB,OAAO,EAAE,aAAa,CAAC;IACvB,WAAW,EAAE,GAAG,CAAC;CAClB;AAED,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,WAAW,CAAC;IAClB,WAAW,EAAE,kBAAkB,CAAC;IAChC,iBAAiB,EAAE,QAAQ,CAAC;CAC7B;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,WAAW,CAAC;IAClB,WAAW,EAAE,kBAAkB,CAAC;IAChC,iBAAiB,EAAE,QAAQ,CAAC;CAC7B;AAED,MAAM,WAAW,yBAAyB;IACxC,GAAG,EAAE,iBAAiB,CAAC;IACvB,cAAc,EAAE,CAAC,IAAI,EAAE,0BAA0B,KAAK,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACpF,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,mBAAmB,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IACrE,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,WAAW,CAAA;KAAE,KAAK,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC;IACzG,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,kBAAkB,CAAA;KAAE,KAAK,MAAM,GAAG,SAAS,CAAC;CAC1G;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAO3F,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,yBAAyB,GAAG,aAAa,CAiGpF"}
|
package/dist/shieldedFetch.js
CHANGED
|
@@ -1,10 +1,31 @@
|
|
|
1
1
|
import { X402_HEADERS, buildPaymentRequiredHeader } from '@shielded-x402/shared-types';
|
|
2
|
+
import { createRelayedShieldedFetch } from './relayerFetch.js';
|
|
2
3
|
const normalizeInput = (input) => {
|
|
3
4
|
if (typeof input === 'string')
|
|
4
5
|
return input;
|
|
5
6
|
return input.toString();
|
|
6
7
|
};
|
|
7
8
|
export function createShieldedFetch(config) {
|
|
9
|
+
if (config.relayerEndpoint) {
|
|
10
|
+
const relayedConfig = {
|
|
11
|
+
sdk: config.sdk,
|
|
12
|
+
relayerEndpoint: config.relayerEndpoint,
|
|
13
|
+
resolveContext: config.resolveContext
|
|
14
|
+
};
|
|
15
|
+
if (config.onUnsupportedRail) {
|
|
16
|
+
relayedConfig.onUnsupportedRail = config.onUnsupportedRail;
|
|
17
|
+
}
|
|
18
|
+
if (config.relayerPath) {
|
|
19
|
+
relayedConfig.relayerPath = config.relayerPath;
|
|
20
|
+
}
|
|
21
|
+
if (config.fetchImpl) {
|
|
22
|
+
relayedConfig.fetchImpl = config.fetchImpl;
|
|
23
|
+
}
|
|
24
|
+
if (config.challengeUrlResolver) {
|
|
25
|
+
relayedConfig.challengeUrlResolver = config.challengeUrlResolver;
|
|
26
|
+
}
|
|
27
|
+
return createRelayedShieldedFetch(relayedConfig);
|
|
28
|
+
}
|
|
8
29
|
const baseFetch = config.fetchImpl ?? fetch;
|
|
9
30
|
return async (input, init) => {
|
|
10
31
|
const normalizedInput = normalizeInput(input);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shieldedFetch.js","sourceRoot":"","sources":["../src/shieldedFetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,0BAA0B,EAI3B,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"shieldedFetch.js","sourceRoot":"","sources":["../src/shieldedFetch.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shielded-x402/client",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -16,16 +16,8 @@
|
|
|
16
16
|
"publishConfig": {
|
|
17
17
|
"access": "public"
|
|
18
18
|
},
|
|
19
|
-
"scripts": {
|
|
20
|
-
"build": "tsc -p tsconfig.json",
|
|
21
|
-
"prepack": "pnpm run build",
|
|
22
|
-
"pretest": "pnpm --filter @shielded-x402/shared-types build && pnpm run build",
|
|
23
|
-
"typecheck": "tsc -p tsconfig.json --noEmit",
|
|
24
|
-
"test": "vitest run",
|
|
25
|
-
"lint": "tsc -p tsconfig.json --noEmit"
|
|
26
|
-
},
|
|
27
19
|
"dependencies": {
|
|
28
|
-
"@shielded-x402/shared-types": "^0.2.
|
|
20
|
+
"@shielded-x402/shared-types": "^0.2.2",
|
|
29
21
|
"viem": "^2.39.3"
|
|
30
22
|
},
|
|
31
23
|
"peerDependencies": {
|
|
@@ -39,5 +31,12 @@
|
|
|
39
31
|
"@noir-lang/noir_js": {
|
|
40
32
|
"optional": true
|
|
41
33
|
}
|
|
34
|
+
},
|
|
35
|
+
"scripts": {
|
|
36
|
+
"build": "bash scripts/build.sh",
|
|
37
|
+
"pretest": "pnpm --filter @shielded-x402/shared-types build && pnpm run build",
|
|
38
|
+
"typecheck": "tsc -p tsconfig.json --noEmit",
|
|
39
|
+
"test": "vitest run",
|
|
40
|
+
"lint": "tsc -p tsconfig.json --noEmit"
|
|
42
41
|
}
|
|
43
|
-
}
|
|
42
|
+
}
|