Filter everything with users (#16)
* Filter everything with users * Fix backtests and user management * Add cursor rules * Fix backtest and bots * Update configs names * Sign until unauth * Setup delegate * Setup delegate and sign * refact * Enhance Privy signature generation with improved cryptographic methods * Add Fastify backend * Add Fastify backend routes for privy * fix privy signing * fix privy client * Fix tests * add gmx core * fix merging sdk * Fix tests * add gmx core * add gmx core * add privy to boilerplate * clean * fix * add fastify * Remove Managing.Fastify submodule * Add Managing.Fastify as regular directory instead of submodule * Update .gitignore to exclude Managing.Fastify dist and node_modules directories * Add token approval functionality to Privy plugin - Introduced a new endpoint `/approve-token` for approving ERC20 tokens. - Added `approveToken` method to the Privy plugin for handling token approvals. - Updated `signPrivyMessage` to differentiate between message signing and token approval requests. - Enhanced the plugin with additional schemas for input validation. - Included new utility functions for token data retrieval and message construction. - Updated tests to verify the new functionality and ensure proper request decoration. * Add PrivyApproveTokenResponse model for token approval response - Created a new class `PrivyApproveTokenResponse` to encapsulate the response structure for token approval requests. - The class includes properties for `Success` status and a transaction `Hash`. * Refactor trading commands and enhance API routes - Updated `OpenPositionCommandHandler` to use asynchronous methods for opening trades and canceling orders. - Introduced new Fastify routes for opening positions and canceling orders with appropriate request validation. - Modified `EvmManager` to handle both Privy and non-Privy wallet operations, utilizing the Fastify API for Privy wallets. - Adjusted test configurations to reflect changes in account types and added helper methods for testing Web3 proxy services. * Enhance GMX trading functionality and update dependencies - Updated `dev:start` script in `package.json` to include the `-d` flag for Fastify. - Upgraded `fastify-cli` dependency to version 7.3.0. - Added `sourceMap` option to `tsconfig.json`. - Refactored GMX plugin to improve position opening logic, including enhanced error handling and validation. - Introduced a new method `getMarketInfoFromTicker` for better market data retrieval. - Updated account type in `PrivateKeys.cs` to use `Privy`. - Adjusted `EvmManager` to utilize the `direction` enum directly for trade direction handling. * Refactor GMX plugin for improved trading logic and market data retrieval - Enhanced the `openGmxPositionImpl` function to utilize the `TradeDirection` enum for trade direction handling. - Introduced `getTokenDataFromTicker` and `getMarketByIndexToken` functions for better market and token data retrieval. - Updated collateral calculation and logging for clarity. - Adjusted `EvmManager` to ensure proper handling of price values in trade requests. * Refactor GMX plugin and enhance testing for position opening - Updated `test:single` script in `package.json` to include TypeScript compilation before running tests. - Removed `this` context from `getClientForAddress` function and replaced logging with `console.error`. - Improved collateral calculation in `openGmxPositionImpl` for better precision. - Adjusted type casting for `direction` in the API route to utilize `TradeDirection` enum. - Added a new test for opening a long position in GMX, ensuring functionality and correctness. * Update sdk * Update * update fastify * Refactor start script in package.json to simplify command execution - Removed the build step from the start script, allowing for a more direct launch of the Fastify server. * Update package.json for Web3Proxy - Changed the name from "Web3Proxy" to "web3-proxy". - Updated version from "0.0.0" to "1.0.0". - Modified the description to "The official Managing Web3 Proxy". * Update Dockerfile for Web3Proxy - Upgraded Node.js base image from 18-alpine to 22.14.0-alpine. - Added NODE_ENV environment variable set to production. * Refactor Dockerfile and package.json for Web3Proxy - Removed the build step from the Dockerfile to streamline the image creation process. - Updated the start script in package.json to include the build step, ensuring the application is built before starting the server. * Add fastify-tsconfig as a development dependency in Dockerfile-web3proxy * Remove fastify-tsconfig extension from tsconfig.json for Web3Proxy * Add PrivyInitAddressResponse model for handling initialization responses - Introduced a new class `PrivyInitAddressResponse` to encapsulate the response structure for Privy initialization, including properties for success status, USDC hash, order vault hash, and error message. * Update * Update * Remove fastify-tsconfig installation from Dockerfile-web3proxy * Add build step to Dockerfile-web3proxy - Included `npm run build` in the Dockerfile to ensure the application is built during the image creation process. * Update * approvals * Open position from front embedded wallet * Open position from front embedded wallet * Open position from front embedded wallet * Fix call contracts * Fix limit price * Close position * Fix close position * Fix close position * add pinky * Refactor position handling logic * Update Dockerfile-pinky to copy package.json and source code from the correct directory * Implement password protection modal and enhance UI with new styles; remove unused audio elements and update package dependencies. * add cancel orders * Update callContract function to explicitly cast account address as Address type * Update callContract function to cast transaction parameters as any type for compatibility * Cast transaction parameters as any type in approveTokenImpl for compatibility * Cast wallet address and transaction parameters as Address type in approveTokenImpl for type safety * Add .env configuration file for production setup including database and server settings * Refactor home route to update welcome message and remove unused SDK configuration code * add referral code * fix referral * Add sltp * Fix typo * Fix typo * setup sltp on backtend * get orders * get positions with slp * fixes * fixes close position * fixes * Remove MongoDB project references from Dockerfiles for managing and worker APIs * Comment out BotManagerWorker service registration and remove MongoDB project reference from Dockerfile * fixes
This commit is contained in:
Oda
124
scripts/update-json-imports.mjs
Executable file
124
scripts/update-json-imports.mjs
Executable file
@@ -0,0 +1,124 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
import fs from 'fs/promises';
|
||||
import path from 'path';
|
||||
import { fileURLToPath } from 'url';
|
||||
import { glob } from 'glob';
|
||||
|
||||
const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
||||
const rootDir = path.resolve(__dirname, '..');
|
||||
const gmxsdkDir = path.resolve(rootDir, 'src/Managing.Fastify/src/generated/gmxsdk');
|
||||
|
||||
// Regex to match JSON imports with assert { type: 'json' } pattern
|
||||
const oldJsonImportRegex = /^(import\s+.+?\s+from\s+['"].*?\.json['"])\s+assert\s+\{\s*type\s*:\s*['"]json['"]\s*\}\s*;/gm;
|
||||
|
||||
// Regex to match JSON imports without any type assertion
|
||||
const plainJsonImportRegex = /^(import\s+.+?\s+from\s+['"].*?\.json['"])\s*;/gm;
|
||||
|
||||
// Regex to match JSON imports with both assert and with patterns (erroneous state)
|
||||
const doublePatternJsonImportRegex = /^(import\s+.+?\s+from\s+['"].*?\.json['"])\s+assert\s+\{\s*type\s*:\s*['"]json['"]\s*\}\s+with\s+\{\s*type\s*:\s*["']json["']\s*\}\s*;/gm;
|
||||
|
||||
// Regex to match JSON imports that already have the with pattern
|
||||
const withJsonImportRegex = /^(import\s+.+?\s+from\s+['"].*?\.json['"])\s+with\s+\{\s*type\s*:\s*["']json["']\s*\}\s*;/gm;
|
||||
|
||||
async function processFile(filePath) {
|
||||
try {
|
||||
// Read the file content
|
||||
const content = await fs.readFile(filePath, 'utf8');
|
||||
|
||||
// Check for all import patterns
|
||||
const hasDoublePattern = doublePatternJsonImportRegex.test(content);
|
||||
doublePatternJsonImportRegex.lastIndex = 0;
|
||||
|
||||
const hasOldJsonImports = oldJsonImportRegex.test(content);
|
||||
oldJsonImportRegex.lastIndex = 0;
|
||||
|
||||
const hasPlainJsonImports = plainJsonImportRegex.test(content);
|
||||
plainJsonImportRegex.lastIndex = 0;
|
||||
|
||||
const hasWithPattern = withJsonImportRegex.test(content);
|
||||
withJsonImportRegex.lastIndex = 0;
|
||||
|
||||
// If no patterns to fix, return early
|
||||
if (!hasDoublePattern && !hasOldJsonImports && !hasPlainJsonImports && !hasWithPattern) {
|
||||
return false; // No changes needed
|
||||
}
|
||||
|
||||
// Apply fixes in sequence
|
||||
let updatedContent = content;
|
||||
|
||||
// 1. First fix the double pattern errors (both assert and with)
|
||||
if (hasDoublePattern) {
|
||||
updatedContent = updatedContent.replace(doublePatternJsonImportRegex, '$1 with { type: "json" };');
|
||||
}
|
||||
|
||||
// 2. Replace assert pattern with with pattern
|
||||
if (hasOldJsonImports) {
|
||||
updatedContent = updatedContent.replace(oldJsonImportRegex, '$1 with { type: "json" };');
|
||||
}
|
||||
|
||||
// 3. Add with pattern to plain JSON imports
|
||||
if (hasPlainJsonImports) {
|
||||
// Process line by line to avoid matching imports that already have with
|
||||
const lines = updatedContent.split('\n');
|
||||
|
||||
const modifiedLines = lines.map(line => {
|
||||
// Check if line is a plain JSON import without assert/with patterns
|
||||
if (plainJsonImportRegex.test(line) && !line.includes('assert') && !line.includes('with')) {
|
||||
plainJsonImportRegex.lastIndex = 0;
|
||||
return line.replace(plainJsonImportRegex, '$1 with { type: "json" };');
|
||||
}
|
||||
return line;
|
||||
});
|
||||
|
||||
updatedContent = modifiedLines.join('\n');
|
||||
}
|
||||
|
||||
// If content changed, write the updated content back to the file
|
||||
if (updatedContent !== content) {
|
||||
await fs.writeFile(filePath, updatedContent, 'utf8');
|
||||
return true; // File was updated
|
||||
}
|
||||
|
||||
return false; // No changes made
|
||||
} catch (error) {
|
||||
console.error(`Error processing file ${filePath}:`, error);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
async function main() {
|
||||
try {
|
||||
console.log('Searching for TypeScript and JavaScript files in @gmxsdk...');
|
||||
|
||||
// Find all TS and JS files in the gmxsdk directory
|
||||
const files = await glob('**/*.{ts,js,mts,mjs}', {
|
||||
cwd: gmxsdkDir,
|
||||
ignore: ['**/node_modules/**', '**/dist/**', '**/build/**', '**/build-test/**']
|
||||
});
|
||||
|
||||
console.log(`Found ${files.length} TypeScript/JavaScript files in @gmxsdk.`);
|
||||
|
||||
let updatedFiles = 0;
|
||||
|
||||
// Process files in parallel
|
||||
const results = await Promise.all(
|
||||
files.map(file => processFile(path.join(gmxsdkDir, file)))
|
||||
);
|
||||
|
||||
updatedFiles = results.filter(Boolean).length;
|
||||
|
||||
console.log(`Updated JSON imports in ${updatedFiles} files.`);
|
||||
|
||||
if (updatedFiles > 0) {
|
||||
console.log('Successfully updated all JSON import statements to use "with { type: "json" }" syntax!');
|
||||
} else {
|
||||
console.log('No files needed to be updated.');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error processing files:', error);
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
main();
|
||||
Reference in New Issue
Block a user