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
2 changes: 1 addition & 1 deletion dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 15 additions & 17 deletions dist/utils/initEvm.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,39 +11,37 @@ const initEthereum = ({ contractAddress, environment, }) => {
const config = {
dev: {
chain: chains_1.sepolia,
evmPrivateKey: evmSk,
infuraUrl: ethRpcUrlSepolia,
evmSk,
ethRpcUrlSepolia,
},
testnet: {
chain: chains_1.sepolia,
evmPrivateKey: evmSk,
infuraUrl: ethRpcUrlSepolia,
evmSk,
ethRpcUrlSepolia,
},
mainnet: {
chain: chains_1.mainnet,
evmPrivateKey: evmSk,
infuraUrl: ethRpcUrlMainnet,
evmSk,
ethRpcUrlMainnet,
},
}[environment];
if (!config.infuraUrl) {
throw new Error(`Infura URL for ${environment} environment is missing. Please set the ${environment === 'mainnet' ? 'ethRpcUrlMainnet' : 'ethRpcUrlSepolia'} environment variable.`);
if (!config.ethRpcUrlSepolia) {
throw new Error(`Ethereum RPC URL for ${environment} environment is missing. Please set the ${environment === 'mainnet' ? 'ethRpcUrlMainnet' : 'ethRpcUrlSepolia'} environment variable.`);
}
if (!config.evmPrivateKey) {
throw new Error(`EVM private key for ${environment} environment is missing. Please set the ${environment === 'mainnet'
? 'evmPrivateKeyMainnet'
: 'evmPrivateKeySepolia'} environment variable.`);
if (!config.evmSk) {
throw new Error(`EVM secret key for ${environment} environment is missing. Please set the evmSk environment variable.`);
}
const publicClient = (0, viem_1.createPublicClient)({
chain: config.chain,
transport: (0, viem_1.http)(config.infuraUrl),
transport: (0, viem_1.http)(config.ethRpcUrlMainnet),
});
const account = (0, accounts_1.privateKeyToAccount)((config.evmPrivateKey.startsWith('0x')
? config.evmPrivateKey
: `0x${config.evmPrivateKey}`));
const account = (0, accounts_1.privateKeyToAccount)((config.evmSk.startsWith('0x')
? config.evmSk
: `0x${config.evmSk}`));
const walletClient = (0, viem_1.createWalletClient)({
account,
chain: config.chain,
transport: (0, viem_1.http)(config.infuraUrl),
transport: (0, viem_1.http)(config.ethRpcUrlMainnet),
});
const chainSigContract = new signet_js_1.contracts.evm.ChainSignatureContract({
publicClient,
Expand Down
4 changes: 2 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ const validateSecret = (
next();
};

app.use(validateSecret as express.RequestHandler);

app.get('/', (req: express.Request, res: express.Response): void => {
res.json({
status: 'OK',
supportedChains: blockchainHandlers.getSupportedChains(),
});
});

app.use(validateSecret as express.RequestHandler);

app.post(
'/ping',
async (req: express.Request, res: express.Response): Promise<void> => {
Expand Down
34 changes: 15 additions & 19 deletions src/utils/initEvm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,52 +15,48 @@ export const initEthereum = ({
const config = {
dev: {
chain: sepolia,
evmPrivateKey: evmSk,
infuraUrl: ethRpcUrlSepolia,
evmSk,
ethRpcUrlSepolia,
},
testnet: {
chain: sepolia,
evmPrivateKey: evmSk,
infuraUrl: ethRpcUrlSepolia,
evmSk,
ethRpcUrlSepolia,
},
mainnet: {
chain: mainnet,
evmPrivateKey: evmSk,
infuraUrl: ethRpcUrlMainnet,
evmSk,
ethRpcUrlMainnet,
},
}[environment];

if (!config.infuraUrl) {
if (!config.ethRpcUrlSepolia) {
throw new Error(
`Infura URL for ${environment} environment is missing. Please set the ${
`Ethereum RPC URL for ${environment} environment is missing. Please set the ${
environment === 'mainnet' ? 'ethRpcUrlMainnet' : 'ethRpcUrlSepolia'
} environment variable.`
);
}

if (!config.evmPrivateKey) {
if (!config.evmSk) {
throw new Error(
`EVM private key for ${environment} environment is missing. Please set the ${
environment === 'mainnet'
? 'evmPrivateKeyMainnet'
: 'evmPrivateKeySepolia'
} environment variable.`
`EVM secret key for ${environment} environment is missing. Please set the evmSk environment variable.`
);
}

const publicClient = createPublicClient({
chain: config.chain,
transport: http(config.infuraUrl),
transport: http(config.ethRpcUrlMainnet),
});
const account = privateKeyToAccount(
(config.evmPrivateKey.startsWith('0x')
? config.evmPrivateKey
: `0x${config.evmPrivateKey}`) as `0x${string}`
(config.evmSk.startsWith('0x')
? config.evmSk
: `0x${config.evmSk}`) as `0x${string}`
);
const walletClient = createWalletClient({
account,
chain: config.chain,
transport: http(config.infuraUrl),
transport: http(config.ethRpcUrlMainnet),
});
const chainSigContract = new contracts.evm.ChainSignatureContract({
publicClient,
Expand Down