Skip to content

Commit 5e0dea3

Browse files
add sig type in server and fnd package
1 parent 01f6978 commit 5e0dea3

File tree

3 files changed

+24
-6
lines changed

3 files changed

+24
-6
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import { TORUS_NETWORK_TYPE, WEB3AUTH_KEY_TYPE } from "@toruslabs/constants";
1+
import { TORUS_NETWORK_TYPE, WEB3AUTH_KEY_TYPE, WEB3AUTH_SIG_TYPE } from "@toruslabs/constants";
22

33
export type NodeDetailManagerParams = {
44
network?: TORUS_NETWORK_TYPE;
55
keyType?: WEB3AUTH_KEY_TYPE;
6+
sigType?: WEB3AUTH_SIG_TYPE;
67
fndServerEndpoint?: string;
78
enableLogging?: boolean;
89
};

packages/fetch-node-details/src/nodeDetailManager.ts

+8-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ import {
55
KEY_TYPE,
66
METADATA_MAP,
77
MULTI_CLUSTER_NETWORKS,
8+
SIG_TYPE,
89
TORUS_LEGACY_NETWORK,
910
TORUS_LEGACY_NETWORK_TYPE,
1011
TORUS_NETWORK_TYPE,
1112
TORUS_SAPPHIRE_NETWORK,
1213
WEB3AUTH_KEY_TYPE,
14+
WEB3AUTH_SIG_TYPE,
1315
} from "@toruslabs/constants";
1416
import { fetchLocalConfig } from "@toruslabs/fnd-base";
1517
import { get } from "@toruslabs/http-helpers";
@@ -26,6 +28,8 @@ class NodeDetailManager {
2628

2729
private _keyType: WEB3AUTH_KEY_TYPE;
2830

31+
private _sigType: WEB3AUTH_SIG_TYPE;
32+
2933
private _torusNodeEndpoints: string[] = [];
3034

3135
private _torusNodeRSSEndpoints: string[] = [];
@@ -45,6 +49,7 @@ class NodeDetailManager {
4549
constructor({
4650
network = TORUS_SAPPHIRE_NETWORK.SAPPHIRE_MAINNET,
4751
keyType = KEY_TYPE.SECP256K1,
52+
sigType = SIG_TYPE.ECDSA_SECP256K1,
4853
fndServerEndpoint,
4954
enableLogging = false,
5055
}: NodeDetailManagerParams = {}) {
@@ -53,6 +58,7 @@ class NodeDetailManager {
5358
}
5459
this.network = network;
5560
this._keyType = keyType;
61+
this._sigType = sigType;
5662
this.updated = false;
5763
if (fndServerEndpoint) {
5864
this.fndServerEndpoint = fndServerEndpoint;
@@ -83,7 +89,7 @@ class NodeDetailManager {
8389

8490
try {
8591
const { nodeDetails } = await get<{ nodeDetails: INodeDetails }>(
86-
`${this.fndServerEndpoint}?network=${this.network}&verifier=${verifier}&verifierId=${verifierId}&keyType=${this._keyType}`
92+
`${this.fndServerEndpoint}?network=${this.network}&verifier=${verifier}&verifierId=${verifierId}&keyType=${this._keyType}&sigType=${this._sigType}`
8793
);
8894
this.setNodeDetails(nodeDetails);
8995

@@ -92,7 +98,7 @@ class NodeDetailManager {
9298
log.error("Failed to fetch node details from server, using local.", error);
9399
}
94100

95-
const nodeDetails = fetchLocalConfig(this.network as TORUS_NETWORK_TYPE, this._keyType);
101+
const nodeDetails = fetchLocalConfig(this.network as TORUS_NETWORK_TYPE, this._keyType, this._sigType);
96102
if (!nodeDetails) throw new Error("Failed to fetch node details");
97103
this.setNodeDetails(nodeDetails);
98104
return this._nodeDetails;

packages/fnd-server/src/router.ts

+14-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
import { KEY_TYPE, TORUS_LEGACY_NETWORK, TORUS_NETWORK_TYPE, TORUS_SAPPHIRE_NETWORK, WEB3AUTH_KEY_TYPE } from "@toruslabs/constants";
1+
import {
2+
KEY_TYPE,
3+
SIG_TYPE,
4+
TORUS_LEGACY_NETWORK,
5+
TORUS_NETWORK_TYPE,
6+
TORUS_SAPPHIRE_NETWORK,
7+
WEB3AUTH_KEY_TYPE,
8+
WEB3AUTH_SIG_TYPE,
9+
} from "@toruslabs/constants";
210
import { fetchLocalConfig } from "@toruslabs/fnd-base";
311
import { celebrate, Joi } from "celebrate";
412
import express, { Request, Response } from "express";
@@ -27,16 +35,19 @@ router.get(
2735
keyType: Joi.string()
2836
.optional()
2937
.allow(...Object.values(KEY_TYPE)),
38+
sigType: Joi.string()
39+
.optional()
40+
.allow(...Object.values(SIG_TYPE)),
3041
}),
3142
},
3243
{ allowUnknown: true }
3344
),
3445
async (req: Request, res: Response) => {
3546
try {
36-
const { network, keyType = "secp256k1" } = req.query as Record<string, string>;
47+
const { network, keyType = KEY_TYPE.SECP256K1, sigType = SIG_TYPE.ECDSA_SECP256K1 } = req.query as Record<string, string>;
3748
const finalNetwork = network.toLowerCase();
3849
// use static details for sapphire mainnet and testnet
39-
const nodeDetails = fetchLocalConfig(finalNetwork as TORUS_NETWORK_TYPE, keyType as WEB3AUTH_KEY_TYPE);
50+
const nodeDetails = fetchLocalConfig(finalNetwork as TORUS_NETWORK_TYPE, keyType as WEB3AUTH_KEY_TYPE, sigType as WEB3AUTH_SIG_TYPE);
4051

4152
return res.status(200).json({
4253
nodeDetails,

0 commit comments

Comments
 (0)