Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions clk-gateway/src/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,10 @@ export async function getBatchInfo(batchNumber: number): Promise<BatchInfo> {
}

export async function fetchZyfiSponsored(
request: ZyfiSponsoredRequest
request: ZyfiSponsoredRequest,
operation = "unknown",
): Promise<ZyfiSponsoredResponse> {
console.log(`zyfiSponsoredUrl: ${zyfiSponsoredUrl}`);
console.log(`ZyFi request [${operation}]: ${JSON.stringify(request)}`);
const response = await fetch(zyfiSponsoredUrl!, {
method: "POST",
headers: {
Expand All @@ -205,12 +206,22 @@ export async function fetchZyfiSponsored(
body: JSON.stringify(request),
});

const responseBody = await response.json();
if (!response.ok) {
throw new Error(`Failed to fetch zyfi sponsored`);
console.error(
`ZyFi error [${operation}] ${response.status} ${response.statusText}:`,
responseBody,
);
const detail =
(responseBody as { message?: string }).message ??
JSON.stringify(responseBody);
throw new Error(`Failed to fetch zyfi sponsored [${operation}]: ${detail}`);
}
const sponsoredResponse = (await response.json()) as ZyfiSponsoredResponse;

return sponsoredResponse;
console.log(
`ZyFi response [${operation}]: ${JSON.stringify(responseBody)}`,
);
return responseBody as ZyfiSponsoredResponse;
}

function decodeCommitData(commitData: string) {
Expand Down
3 changes: 1 addition & 2 deletions clk-gateway/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,7 @@ app.post(
let response;
if (zyfiSponsoredUrl) {
const zyfiRequest = buildZyfiRegisterRequest(owner, name, sub);
const zyfiResponse = await fetchZyfiSponsored(zyfiRequest);
console.log(`ZyFi response: ${JSON.stringify(zyfiResponse)}`);
const zyfiResponse = await fetchZyfiSponsored(zyfiRequest, "register");

await admin.auth().revokeRefreshTokens(decodedToken.uid);

Expand Down
9 changes: 5 additions & 4 deletions clk-gateway/src/routes/names.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,7 @@ router.post(
let response;
if (zyfiSponsoredUrl) {
const zyfiRequest = buildZyfiRegisterRequest(owner, name, sub);
const zyfiResponse = await fetchZyfiSponsored(zyfiRequest);
console.log(`ZyFi response: ${JSON.stringify(zyfiResponse)}`);
const zyfiResponse = await fetchZyfiSponsored(zyfiRequest, "register");

// await admin.auth().revokeRefreshTokens(decodedToken.uid);

Expand Down Expand Up @@ -268,8 +267,10 @@ router.post(
data.key,
data.value,
);
const zyfiResponse = await fetchZyfiSponsored(zyfiRequest);
console.log(`ZyFi response: ${JSON.stringify(zyfiResponse)}`);
const zyfiResponse = await fetchZyfiSponsored(
zyfiRequest,
"set-text-record",
);

response = await l2Wallet.sendTransaction(zyfiResponse.txData);
} else {
Expand Down
Loading