diff --git a/.gitignore b/.gitignore index df4e30d..f63583c 100644 --- a/.gitignore +++ b/.gitignore @@ -118,6 +118,13 @@ tmp/ *.db *.sqlite +# Uploads and user files +backend/uploads/ +frontend/uploads/ + +# Database migrations (may contain sensitive data) +backend/db/migrations/ + # Keys and certificates *.key *.pem @@ -139,6 +146,10 @@ ssl/certs/ *.crt *.p12 +# Database encryption keys - КРИТИЧЕСКИ ВАЖНО! +**/full_db_encryption.key +**/ssl/full_db_encryption.key + # Docker .dockerignore diff --git a/README.md b/README.md index 6528db5..b4afb10 100644 --- a/README.md +++ b/README.md @@ -96,9 +96,6 @@ docker-compose restart # Остановка сервисов docker compose down -# Остановка сервисов и удаление томов -docker compose down -v -``` ## Контакты и поддержка diff --git a/backend/app.js b/backend/app.js index fc59404..8cd364a 100644 --- a/backend/app.js +++ b/backend/app.js @@ -28,13 +28,18 @@ const messagesRoutes = require('./routes/messages'); const ragRoutes = require('./routes/rag'); // Новый роут для RAG-ассистента const monitoringRoutes = require('./routes/monitoring'); const pagesRoutes = require('./routes/pages'); // Добавляем импорт роутера страниц +const uploadsRoutes = require('./routes/uploads'); +const ensRoutes = require('./routes/ens'); +// Factory routes removed - no longer needed // Проверка и создание директорий для хранения данных контрактов const ensureDirectoriesExist = () => { const directories = [ path.join(__dirname, 'contracts-data'), path.join(__dirname, 'contracts-data/dles'), - path.join(__dirname, 'temp') + path.join(__dirname, 'temp'), + path.join(__dirname, 'uploads'), + path.join(__dirname, 'uploads/logos') ]; for (const dir of directories) { @@ -93,6 +98,7 @@ const dleProposalsRoutes = require('./routes/dleProposals'); // Функции const dleModulesRoutes = require('./routes/dleModules'); // Функции модулей const dleTokensRoutes = require('./routes/dleTokens'); // Функции токенов const dleAnalyticsRoutes = require('./routes/dleAnalytics'); // Аналитика и история +const compileRoutes = require('./routes/compile'); // Компиляция контрактов const dleMultichainRoutes = require('./routes/dleMultichain'); // Мультичейн функции const dleHistoryRoutes = require('./routes/dleHistory'); // Расширенная история const systemRoutes = require('./routes/system'); // Добавляем импорт маршрутов системного мониторинга @@ -188,6 +194,10 @@ app.use((req, res, next) => { app.use(express.json()); app.use(express.urlencoded({ extended: true })); +// Статическая раздача загруженных файлов (для dev и prod) +app.use('/uploads', express.static(path.join(__dirname, 'uploads'))); +app.use('/api/uploads', express.static(path.join(__dirname, 'uploads'))); + // Настройка безопасности app.use( helmet({ @@ -235,6 +245,10 @@ app.use('/api/rag', ragRoutes); // Подключаем роут app.use('/api/monitoring', monitoringRoutes); app.use('/api/pages', pagesRoutes); // Подключаем роутер страниц app.use('/api/system', systemRoutes); // Добавляем маршрут системного мониторинга +app.use('/api/uploads', uploadsRoutes); // Загрузка файлов (логотипы) +app.use('/api/ens', ensRoutes); // ENS utilities +// app.use('/api/factory', factoryRoutes); // Factory routes removed - no longer needed +app.use('/api/compile-contracts', compileRoutes); // Компиляция контрактов const nonceStore = new Map(); // или любая другая реализация хранилища nonce diff --git a/backend/artifacts/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors.dbg.json b/backend/artifacts/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors.dbg.json deleted file mode 100644 index 821080e..0000000 --- a/backend/artifacts/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors.dbg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "_format": "hh-sol-dbg-1", - "buildInfo": "../../../../build-info/ab387c71734b3d3e5e7817d328027586.json" -} diff --git a/backend/artifacts/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors.json b/backend/artifacts/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors.json deleted file mode 100644 index 107d16f..0000000 --- a/backend/artifacts/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors.json +++ /dev/null @@ -1,113 +0,0 @@ -{ - "_format": "hh-sol-artifact-1", - "contractName": "IERC1155Errors", - "sourceName": "@openzeppelin/contracts/interfaces/draft-IERC6093.sol", - "abi": [ - { - "inputs": [ - { - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "internalType": "uint256", - "name": "balance", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "needed", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "tokenId", - "type": "uint256" - } - ], - "name": "ERC1155InsufficientBalance", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "approver", - "type": "address" - } - ], - "name": "ERC1155InvalidApprover", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "idsLength", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "valuesLength", - "type": "uint256" - } - ], - "name": "ERC1155InvalidArrayLength", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "operator", - "type": "address" - } - ], - "name": "ERC1155InvalidOperator", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "receiver", - "type": "address" - } - ], - "name": "ERC1155InvalidReceiver", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "sender", - "type": "address" - } - ], - "name": "ERC1155InvalidSender", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "operator", - "type": "address" - }, - { - "internalType": "address", - "name": "owner", - "type": "address" - } - ], - "name": "ERC1155MissingApprovalForAll", - "type": "error" - } - ], - "bytecode": "0x", - "deployedBytecode": "0x", - "linkReferences": {}, - "deployedLinkReferences": {} -} diff --git a/backend/artifacts/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors.dbg.json b/backend/artifacts/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors.dbg.json deleted file mode 100644 index 821080e..0000000 --- a/backend/artifacts/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors.dbg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "_format": "hh-sol-dbg-1", - "buildInfo": "../../../../build-info/ab387c71734b3d3e5e7817d328027586.json" -} diff --git a/backend/artifacts/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors.json b/backend/artifacts/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors.json deleted file mode 100644 index f77ad64..0000000 --- a/backend/artifacts/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors.json +++ /dev/null @@ -1,97 +0,0 @@ -{ - "_format": "hh-sol-artifact-1", - "contractName": "IERC20Errors", - "sourceName": "@openzeppelin/contracts/interfaces/draft-IERC6093.sol", - "abi": [ - { - "inputs": [ - { - "internalType": "address", - "name": "spender", - "type": "address" - }, - { - "internalType": "uint256", - "name": "allowance", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "needed", - "type": "uint256" - } - ], - "name": "ERC20InsufficientAllowance", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "internalType": "uint256", - "name": "balance", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "needed", - "type": "uint256" - } - ], - "name": "ERC20InsufficientBalance", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "approver", - "type": "address" - } - ], - "name": "ERC20InvalidApprover", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "receiver", - "type": "address" - } - ], - "name": "ERC20InvalidReceiver", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "sender", - "type": "address" - } - ], - "name": "ERC20InvalidSender", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "spender", - "type": "address" - } - ], - "name": "ERC20InvalidSpender", - "type": "error" - } - ], - "bytecode": "0x", - "deployedBytecode": "0x", - "linkReferences": {}, - "deployedLinkReferences": {} -} diff --git a/backend/artifacts/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors.dbg.json b/backend/artifacts/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors.dbg.json deleted file mode 100644 index 821080e..0000000 --- a/backend/artifacts/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors.dbg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "_format": "hh-sol-dbg-1", - "buildInfo": "../../../../build-info/ab387c71734b3d3e5e7817d328027586.json" -} diff --git a/backend/artifacts/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors.json b/backend/artifacts/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors.json deleted file mode 100644 index 6ccf3a7..0000000 --- a/backend/artifacts/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "_format": "hh-sol-artifact-1", - "contractName": "IERC721Errors", - "sourceName": "@openzeppelin/contracts/interfaces/draft-IERC6093.sol", - "abi": [ - { - "inputs": [ - { - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "internalType": "uint256", - "name": "tokenId", - "type": "uint256" - }, - { - "internalType": "address", - "name": "owner", - "type": "address" - } - ], - "name": "ERC721IncorrectOwner", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "operator", - "type": "address" - }, - { - "internalType": "uint256", - "name": "tokenId", - "type": "uint256" - } - ], - "name": "ERC721InsufficientApproval", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "approver", - "type": "address" - } - ], - "name": "ERC721InvalidApprover", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "operator", - "type": "address" - } - ], - "name": "ERC721InvalidOperator", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "owner", - "type": "address" - } - ], - "name": "ERC721InvalidOwner", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "receiver", - "type": "address" - } - ], - "name": "ERC721InvalidReceiver", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "sender", - "type": "address" - } - ], - "name": "ERC721InvalidSender", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "tokenId", - "type": "uint256" - } - ], - "name": "ERC721NonexistentToken", - "type": "error" - } - ], - "bytecode": "0x", - "deployedBytecode": "0x", - "linkReferences": {}, - "deployedLinkReferences": {} -} diff --git a/backend/artifacts/@openzeppelin/contracts/token/ERC20/ERC20.sol/ERC20.dbg.json b/backend/artifacts/@openzeppelin/contracts/token/ERC20/ERC20.sol/ERC20.dbg.json deleted file mode 100644 index 44009e0..0000000 --- a/backend/artifacts/@openzeppelin/contracts/token/ERC20/ERC20.sol/ERC20.dbg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "_format": "hh-sol-dbg-1", - "buildInfo": "../../../../../build-info/ab387c71734b3d3e5e7817d328027586.json" -} diff --git a/backend/artifacts/@openzeppelin/contracts/token/ERC20/ERC20.sol/ERC20.json b/backend/artifacts/@openzeppelin/contracts/token/ERC20/ERC20.sol/ERC20.json deleted file mode 100644 index 81e661f..0000000 --- a/backend/artifacts/@openzeppelin/contracts/token/ERC20/ERC20.sol/ERC20.json +++ /dev/null @@ -1,319 +0,0 @@ -{ - "_format": "hh-sol-artifact-1", - "contractName": "ERC20", - "sourceName": "@openzeppelin/contracts/token/ERC20/ERC20.sol", - "abi": [ - { - "inputs": [ - { - "internalType": "address", - "name": "spender", - "type": "address" - }, - { - "internalType": "uint256", - "name": "allowance", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "needed", - "type": "uint256" - } - ], - "name": "ERC20InsufficientAllowance", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "internalType": "uint256", - "name": "balance", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "needed", - "type": "uint256" - } - ], - "name": "ERC20InsufficientBalance", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "approver", - "type": "address" - } - ], - "name": "ERC20InvalidApprover", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "receiver", - "type": "address" - } - ], - "name": "ERC20InvalidReceiver", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "sender", - "type": "address" - } - ], - "name": "ERC20InvalidSender", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "spender", - "type": "address" - } - ], - "name": "ERC20InvalidSpender", - "type": "error" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "owner", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "spender", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "Approval", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "from", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "to", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "Transfer", - "type": "event" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "owner", - "type": "address" - }, - { - "internalType": "address", - "name": "spender", - "type": "address" - } - ], - "name": "allowance", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "spender", - "type": "address" - }, - { - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "approve", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - } - ], - "name": "balanceOf", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "decimals", - "outputs": [ - { - "internalType": "uint8", - "name": "", - "type": "uint8" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "name", - "outputs": [ - { - "internalType": "string", - "name": "", - "type": "string" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "symbol", - "outputs": [ - { - "internalType": "string", - "name": "", - "type": "string" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "totalSupply", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "to", - "type": "address" - }, - { - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "transfer", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "from", - "type": "address" - }, - { - "internalType": "address", - "name": "to", - "type": "address" - }, - { - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "transferFrom", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "nonpayable", - "type": "function" - } - ], - "bytecode": "0x", - "deployedBytecode": "0x", - "linkReferences": {}, - "deployedLinkReferences": {} -} diff --git a/backend/artifacts/@openzeppelin/contracts/token/ERC20/IERC20.sol/IERC20.dbg.json b/backend/artifacts/@openzeppelin/contracts/token/ERC20/IERC20.sol/IERC20.dbg.json deleted file mode 100644 index 44009e0..0000000 --- a/backend/artifacts/@openzeppelin/contracts/token/ERC20/IERC20.sol/IERC20.dbg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "_format": "hh-sol-dbg-1", - "buildInfo": "../../../../../build-info/ab387c71734b3d3e5e7817d328027586.json" -} diff --git a/backend/artifacts/@openzeppelin/contracts/token/ERC20/IERC20.sol/IERC20.json b/backend/artifacts/@openzeppelin/contracts/token/ERC20/IERC20.sol/IERC20.json deleted file mode 100644 index 12e0777..0000000 --- a/backend/artifacts/@openzeppelin/contracts/token/ERC20/IERC20.sol/IERC20.json +++ /dev/null @@ -1,194 +0,0 @@ -{ - "_format": "hh-sol-artifact-1", - "contractName": "IERC20", - "sourceName": "@openzeppelin/contracts/token/ERC20/IERC20.sol", - "abi": [ - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "owner", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "spender", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "Approval", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "from", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "to", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "Transfer", - "type": "event" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "owner", - "type": "address" - }, - { - "internalType": "address", - "name": "spender", - "type": "address" - } - ], - "name": "allowance", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "spender", - "type": "address" - }, - { - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "approve", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - } - ], - "name": "balanceOf", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "totalSupply", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "to", - "type": "address" - }, - { - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "transfer", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "from", - "type": "address" - }, - { - "internalType": "address", - "name": "to", - "type": "address" - }, - { - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "transferFrom", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "nonpayable", - "type": "function" - } - ], - "bytecode": "0x", - "deployedBytecode": "0x", - "linkReferences": {}, - "deployedLinkReferences": {} -} diff --git a/backend/artifacts/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol/IERC20Metadata.dbg.json b/backend/artifacts/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol/IERC20Metadata.dbg.json deleted file mode 100644 index 8cead10..0000000 --- a/backend/artifacts/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol/IERC20Metadata.dbg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "_format": "hh-sol-dbg-1", - "buildInfo": "../../../../../../build-info/ab387c71734b3d3e5e7817d328027586.json" -} diff --git a/backend/artifacts/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol/IERC20Metadata.json b/backend/artifacts/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol/IERC20Metadata.json deleted file mode 100644 index a7d8b6a..0000000 --- a/backend/artifacts/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol/IERC20Metadata.json +++ /dev/null @@ -1,233 +0,0 @@ -{ - "_format": "hh-sol-artifact-1", - "contractName": "IERC20Metadata", - "sourceName": "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol", - "abi": [ - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "owner", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "spender", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "Approval", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "from", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "to", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "Transfer", - "type": "event" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "owner", - "type": "address" - }, - { - "internalType": "address", - "name": "spender", - "type": "address" - } - ], - "name": "allowance", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "spender", - "type": "address" - }, - { - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "approve", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - } - ], - "name": "balanceOf", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "decimals", - "outputs": [ - { - "internalType": "uint8", - "name": "", - "type": "uint8" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "name", - "outputs": [ - { - "internalType": "string", - "name": "", - "type": "string" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "symbol", - "outputs": [ - { - "internalType": "string", - "name": "", - "type": "string" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "totalSupply", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "to", - "type": "address" - }, - { - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "transfer", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "from", - "type": "address" - }, - { - "internalType": "address", - "name": "to", - "type": "address" - }, - { - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "transferFrom", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "nonpayable", - "type": "function" - } - ], - "bytecode": "0x", - "deployedBytecode": "0x", - "linkReferences": {}, - "deployedLinkReferences": {} -} diff --git a/backend/artifacts/@openzeppelin/contracts/utils/Context.sol/Context.dbg.json b/backend/artifacts/@openzeppelin/contracts/utils/Context.sol/Context.dbg.json deleted file mode 100644 index 821080e..0000000 --- a/backend/artifacts/@openzeppelin/contracts/utils/Context.sol/Context.dbg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "_format": "hh-sol-dbg-1", - "buildInfo": "../../../../build-info/ab387c71734b3d3e5e7817d328027586.json" -} diff --git a/backend/artifacts/@openzeppelin/contracts/utils/Context.sol/Context.json b/backend/artifacts/@openzeppelin/contracts/utils/Context.sol/Context.json deleted file mode 100644 index 8fe86fc..0000000 --- a/backend/artifacts/@openzeppelin/contracts/utils/Context.sol/Context.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "_format": "hh-sol-artifact-1", - "contractName": "Context", - "sourceName": "@openzeppelin/contracts/utils/Context.sol", - "abi": [], - "bytecode": "0x", - "deployedBytecode": "0x", - "linkReferences": {}, - "deployedLinkReferences": {} -} diff --git a/backend/artifacts/@openzeppelin/contracts/utils/ReentrancyGuard.sol/ReentrancyGuard.dbg.json b/backend/artifacts/@openzeppelin/contracts/utils/ReentrancyGuard.sol/ReentrancyGuard.dbg.json deleted file mode 100644 index 821080e..0000000 --- a/backend/artifacts/@openzeppelin/contracts/utils/ReentrancyGuard.sol/ReentrancyGuard.dbg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "_format": "hh-sol-dbg-1", - "buildInfo": "../../../../build-info/ab387c71734b3d3e5e7817d328027586.json" -} diff --git a/backend/artifacts/@openzeppelin/contracts/utils/ReentrancyGuard.sol/ReentrancyGuard.json b/backend/artifacts/@openzeppelin/contracts/utils/ReentrancyGuard.sol/ReentrancyGuard.json deleted file mode 100644 index 135fb0f..0000000 --- a/backend/artifacts/@openzeppelin/contracts/utils/ReentrancyGuard.sol/ReentrancyGuard.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "_format": "hh-sol-artifact-1", - "contractName": "ReentrancyGuard", - "sourceName": "@openzeppelin/contracts/utils/ReentrancyGuard.sol", - "abi": [ - { - "inputs": [], - "name": "ReentrancyGuardReentrantCall", - "type": "error" - } - ], - "bytecode": "0x", - "deployedBytecode": "0x", - "linkReferences": {}, - "deployedLinkReferences": {} -} diff --git a/backend/artifacts/contracts/DLE.sol/DLE.dbg.json b/backend/artifacts/contracts/DLE.sol/DLE.dbg.json deleted file mode 100644 index a45b83a..0000000 --- a/backend/artifacts/contracts/DLE.sol/DLE.dbg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "_format": "hh-sol-dbg-1", - "buildInfo": "../../build-info/de2a9b4015c1250f0af7fbce121b1da6.json" -} diff --git a/backend/artifacts/contracts/DLE.sol/DLE.json b/backend/artifacts/contracts/DLE.sol/DLE.json deleted file mode 100644 index 37d46d6..0000000 --- a/backend/artifacts/contracts/DLE.sol/DLE.json +++ /dev/null @@ -1,2307 +0,0 @@ -{ - "_format": "hh-sol-artifact-1", - "contractName": "DLE", - "sourceName": "contracts/DLE.sol", - "abi": [ - { - "inputs": [ - { - "components": [ - { - "internalType": "string", - "name": "name", - "type": "string" - }, - { - "internalType": "string", - "name": "symbol", - "type": "string" - }, - { - "internalType": "string", - "name": "location", - "type": "string" - }, - { - "internalType": "string", - "name": "coordinates", - "type": "string" - }, - { - "internalType": "uint256", - "name": "jurisdiction", - "type": "uint256" - }, - { - "internalType": "string[]", - "name": "okvedCodes", - "type": "string[]" - }, - { - "internalType": "uint256", - "name": "kpp", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "quorumPercentage", - "type": "uint256" - }, - { - "internalType": "address[]", - "name": "initialPartners", - "type": "address[]" - }, - { - "internalType": "uint256[]", - "name": "initialAmounts", - "type": "uint256[]" - }, - { - "internalType": "uint256[]", - "name": "supportedChainIds", - "type": "uint256[]" - } - ], - "internalType": "struct DLE.DLEConfig", - "name": "config", - "type": "tuple" - }, - { - "internalType": "uint256", - "name": "_currentChainId", - "type": "uint256" - } - ], - "stateMutability": "nonpayable", - "type": "constructor" - }, - { - "inputs": [], - "name": "CheckpointUnorderedInsertion", - "type": "error" - }, - { - "inputs": [], - "name": "ECDSAInvalidSignature", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "length", - "type": "uint256" - } - ], - "name": "ECDSAInvalidSignatureLength", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "s", - "type": "bytes32" - } - ], - "name": "ECDSAInvalidSignatureS", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "increasedSupply", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "cap", - "type": "uint256" - } - ], - "name": "ERC20ExceededSafeSupply", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "spender", - "type": "address" - }, - { - "internalType": "uint256", - "name": "allowance", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "needed", - "type": "uint256" - } - ], - "name": "ERC20InsufficientAllowance", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "internalType": "uint256", - "name": "balance", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "needed", - "type": "uint256" - } - ], - "name": "ERC20InsufficientBalance", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "approver", - "type": "address" - } - ], - "name": "ERC20InvalidApprover", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "receiver", - "type": "address" - } - ], - "name": "ERC20InvalidReceiver", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "sender", - "type": "address" - } - ], - "name": "ERC20InvalidSender", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "spender", - "type": "address" - } - ], - "name": "ERC20InvalidSpender", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "deadline", - "type": "uint256" - } - ], - "name": "ERC2612ExpiredSignature", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "signer", - "type": "address" - }, - { - "internalType": "address", - "name": "owner", - "type": "address" - } - ], - "name": "ERC2612InvalidSigner", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "timepoint", - "type": "uint256" - }, - { - "internalType": "uint48", - "name": "clock", - "type": "uint48" - } - ], - "name": "ERC5805FutureLookup", - "type": "error" - }, - { - "inputs": [], - "name": "ERC6372InconsistentClock", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - }, - { - "internalType": "uint256", - "name": "currentNonce", - "type": "uint256" - } - ], - "name": "InvalidAccountNonce", - "type": "error" - }, - { - "inputs": [], - "name": "InvalidShortString", - "type": "error" - }, - { - "inputs": [], - "name": "ReentrancyGuardReentrantCall", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "uint8", - "name": "bits", - "type": "uint8" - }, - { - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "SafeCastOverflowedUintDowncast", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "string", - "name": "str", - "type": "string" - } - ], - "name": "StringTooLong", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "expiry", - "type": "uint256" - } - ], - "name": "VotesExpiredSignature", - "type": "error" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "owner", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "spender", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "Approval", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "chainId", - "type": "uint256" - } - ], - "name": "ChainAdded", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "chainId", - "type": "uint256" - } - ], - "name": "ChainRemoved", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "oldChainId", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "newChainId", - "type": "uint256" - } - ], - "name": "CurrentChainIdUpdated", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "deactivatedBy", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "timestamp", - "type": "uint256" - } - ], - "name": "DLEDeactivated", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "string", - "name": "name", - "type": "string" - }, - { - "indexed": false, - "internalType": "string", - "name": "symbol", - "type": "string" - }, - { - "indexed": false, - "internalType": "string", - "name": "location", - "type": "string" - }, - { - "indexed": false, - "internalType": "string", - "name": "coordinates", - "type": "string" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "jurisdiction", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "string[]", - "name": "okvedCodes", - "type": "string[]" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "kpp", - "type": "uint256" - } - ], - "name": "DLEInfoUpdated", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "string", - "name": "name", - "type": "string" - }, - { - "indexed": false, - "internalType": "string", - "name": "symbol", - "type": "string" - }, - { - "indexed": false, - "internalType": "string", - "name": "location", - "type": "string" - }, - { - "indexed": false, - "internalType": "string", - "name": "coordinates", - "type": "string" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "jurisdiction", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "string[]", - "name": "okvedCodes", - "type": "string[]" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "kpp", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "address", - "name": "tokenAddress", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256[]", - "name": "supportedChainIds", - "type": "uint256[]" - } - ], - "name": "DLEInitialized", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "delegator", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "fromDelegate", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "toDelegate", - "type": "address" - } - ], - "name": "DelegateChanged", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "delegate", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "previousVotes", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "newVotes", - "type": "uint256" - } - ], - "name": "DelegateVotesChanged", - "type": "event" - }, - { - "anonymous": false, - "inputs": [], - "name": "EIP712DomainChanged", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "address[]", - "name": "partners", - "type": "address[]" - }, - { - "indexed": false, - "internalType": "uint256[]", - "name": "amounts", - "type": "uint256[]" - } - ], - "name": "InitialTokensDistributed", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "bytes32", - "name": "moduleId", - "type": "bytes32" - }, - { - "indexed": false, - "internalType": "address", - "name": "moduleAddress", - "type": "address" - } - ], - "name": "ModuleAdded", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "bytes32", - "name": "moduleId", - "type": "bytes32" - } - ], - "name": "ModuleRemoved", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "proposalId", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "string", - "name": "reason", - "type": "string" - } - ], - "name": "ProposalCancelled", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "proposalId", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "address", - "name": "initiator", - "type": "address" - }, - { - "indexed": false, - "internalType": "string", - "name": "description", - "type": "string" - } - ], - "name": "ProposalCreated", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "proposalId", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "bytes", - "name": "operation", - "type": "bytes" - } - ], - "name": "ProposalExecuted", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "proposalId", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "chainId", - "type": "uint256" - } - ], - "name": "ProposalExecutionApprovedInChain", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "proposalId", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "governanceChainId", - "type": "uint256" - } - ], - "name": "ProposalGovernanceChainSet", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "proposalId", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "uint256[]", - "name": "targetChains", - "type": "uint256[]" - } - ], - "name": "ProposalTargetsSet", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "proposalId", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "address", - "name": "voter", - "type": "address" - }, - { - "indexed": false, - "internalType": "bool", - "name": "support", - "type": "bool" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "votingPower", - "type": "uint256" - } - ], - "name": "ProposalVoted", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "oldQuorumPercentage", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "newQuorumPercentage", - "type": "uint256" - } - ], - "name": "QuorumPercentageUpdated", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint256", - "name": "proposalId", - "type": "uint256" - } - ], - "name": "SyncCompleted", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "recipient", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "amount", - "type": "uint256" - } - ], - "name": "TokensTransferredByGovernance", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "from", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "to", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "value", - "type": "uint256" - } - ], - "name": "Transfer", - "type": "event" - }, - { - "inputs": [], - "name": "CLOCK_MODE", - "outputs": [ - { - "internalType": "string", - "name": "", - "type": "string" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "DOMAIN_SEPARATOR", - "outputs": [ - { - "internalType": "bytes32", - "name": "", - "type": "bytes32" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "", - "type": "bytes32" - } - ], - "name": "activeModules", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "name": "allProposalIds", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "owner", - "type": "address" - }, - { - "internalType": "address", - "name": "spender", - "type": "address" - } - ], - "name": "allowance", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "spender", - "type": "address" - }, - { - "internalType": "uint256", - "name": "amount", - "type": "uint256" - } - ], - "name": "approve", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - } - ], - "name": "balanceOf", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "_proposalId", - "type": "uint256" - }, - { - "internalType": "string", - "name": "reason", - "type": "string" - } - ], - "name": "cancelProposal", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "_chainId", - "type": "uint256" - } - ], - "name": "checkChainConnection", - "outputs": [ - { - "internalType": "bool", - "name": "isAvailable", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "_proposalId", - "type": "uint256" - } - ], - "name": "checkProposalResult", - "outputs": [ - { - "internalType": "bool", - "name": "passed", - "type": "bool" - }, - { - "internalType": "bool", - "name": "quorumReached", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "_proposalId", - "type": "uint256" - } - ], - "name": "checkSyncReadiness", - "outputs": [ - { - "internalType": "bool", - "name": "allChainsReady", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - }, - { - "internalType": "uint32", - "name": "pos", - "type": "uint32" - } - ], - "name": "checkpoints", - "outputs": [ - { - "components": [ - { - "internalType": "uint48", - "name": "_key", - "type": "uint48" - }, - { - "internalType": "uint208", - "name": "_value", - "type": "uint208" - } - ], - "internalType": "struct Checkpoints.Checkpoint208", - "name": "", - "type": "tuple" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "clock", - "outputs": [ - { - "internalType": "uint48", - "name": "", - "type": "uint48" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "string", - "name": "_description", - "type": "string" - }, - { - "internalType": "uint256", - "name": "_duration", - "type": "uint256" - }, - { - "internalType": "bytes32", - "name": "_moduleId", - "type": "bytes32" - }, - { - "internalType": "address", - "name": "_moduleAddress", - "type": "address" - }, - { - "internalType": "uint256", - "name": "_chainId", - "type": "uint256" - } - ], - "name": "createAddModuleProposal", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "string", - "name": "_description", - "type": "string" - }, - { - "internalType": "uint256", - "name": "_duration", - "type": "uint256" - }, - { - "internalType": "bytes", - "name": "_operation", - "type": "bytes" - }, - { - "internalType": "uint256", - "name": "_governanceChainId", - "type": "uint256" - }, - { - "internalType": "uint256[]", - "name": "_targetChains", - "type": "uint256[]" - }, - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "name": "createProposal", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "string", - "name": "_description", - "type": "string" - }, - { - "internalType": "uint256", - "name": "_duration", - "type": "uint256" - }, - { - "internalType": "bytes32", - "name": "_moduleId", - "type": "bytes32" - }, - { - "internalType": "uint256", - "name": "_chainId", - "type": "uint256" - } - ], - "name": "createRemoveModuleProposal", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "currentChainId", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "decimals", - "outputs": [ - { - "internalType": "uint8", - "name": "", - "type": "uint8" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "delegatee", - "type": "address" - } - ], - "name": "delegate", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "delegatee", - "type": "address" - }, - { - "internalType": "uint256", - "name": "nonce", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "expiry", - "type": "uint256" - }, - { - "internalType": "uint8", - "name": "v", - "type": "uint8" - }, - { - "internalType": "bytes32", - "name": "r", - "type": "bytes32" - }, - { - "internalType": "bytes32", - "name": "s", - "type": "bytes32" - } - ], - "name": "delegateBySig", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - } - ], - "name": "delegates", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "dleInfo", - "outputs": [ - { - "internalType": "string", - "name": "name", - "type": "string" - }, - { - "internalType": "string", - "name": "symbol", - "type": "string" - }, - { - "internalType": "string", - "name": "location", - "type": "string" - }, - { - "internalType": "string", - "name": "coordinates", - "type": "string" - }, - { - "internalType": "uint256", - "name": "jurisdiction", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "kpp", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "creationTimestamp", - "type": "uint256" - }, - { - "internalType": "bool", - "name": "isActive", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "eip712Domain", - "outputs": [ - { - "internalType": "bytes1", - "name": "fields", - "type": "bytes1" - }, - { - "internalType": "string", - "name": "name", - "type": "string" - }, - { - "internalType": "string", - "name": "version", - "type": "string" - }, - { - "internalType": "uint256", - "name": "chainId", - "type": "uint256" - }, - { - "internalType": "address", - "name": "verifyingContract", - "type": "address" - }, - { - "internalType": "bytes32", - "name": "salt", - "type": "bytes32" - }, - { - "internalType": "uint256[]", - "name": "extensions", - "type": "uint256[]" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "_proposalId", - "type": "uint256" - } - ], - "name": "executeProposal", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "_proposalId", - "type": "uint256" - }, - { - "internalType": "address[]", - "name": "signers", - "type": "address[]" - }, - { - "internalType": "bytes[]", - "name": "signatures", - "type": "bytes[]" - } - ], - "name": "executeProposalBySignatures", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "getCurrentChainId", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "getDLEInfo", - "outputs": [ - { - "components": [ - { - "internalType": "string", - "name": "name", - "type": "string" - }, - { - "internalType": "string", - "name": "symbol", - "type": "string" - }, - { - "internalType": "string", - "name": "location", - "type": "string" - }, - { - "internalType": "string", - "name": "coordinates", - "type": "string" - }, - { - "internalType": "uint256", - "name": "jurisdiction", - "type": "uint256" - }, - { - "internalType": "string[]", - "name": "okvedCodes", - "type": "string[]" - }, - { - "internalType": "uint256", - "name": "kpp", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "creationTimestamp", - "type": "uint256" - }, - { - "internalType": "bool", - "name": "isActive", - "type": "bool" - } - ], - "internalType": "struct DLE.DLEInfo", - "name": "", - "type": "tuple" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "getGovernanceParams", - "outputs": [ - { - "internalType": "uint256", - "name": "quorumPct", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "chainId", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "supportedCount", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "_moduleId", - "type": "bytes32" - } - ], - "name": "getModuleAddress", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "timepoint", - "type": "uint256" - } - ], - "name": "getPastTotalSupply", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - }, - { - "internalType": "uint256", - "name": "timepoint", - "type": "uint256" - } - ], - "name": "getPastVotes", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "_proposalId", - "type": "uint256" - } - ], - "name": "getProposalState", - "outputs": [ - { - "internalType": "uint8", - "name": "state", - "type": "uint8" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "_proposalId", - "type": "uint256" - } - ], - "name": "getProposalSummary", - "outputs": [ - { - "internalType": "uint256", - "name": "id", - "type": "uint256" - }, - { - "internalType": "string", - "name": "description", - "type": "string" - }, - { - "internalType": "uint256", - "name": "forVotes", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "againstVotes", - "type": "uint256" - }, - { - "internalType": "bool", - "name": "executed", - "type": "bool" - }, - { - "internalType": "bool", - "name": "canceled", - "type": "bool" - }, - { - "internalType": "uint256", - "name": "deadline", - "type": "uint256" - }, - { - "internalType": "address", - "name": "initiator", - "type": "address" - }, - { - "internalType": "uint256", - "name": "governanceChainId", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "snapshotTimepoint", - "type": "uint256" - }, - { - "internalType": "uint256[]", - "name": "targets", - "type": "uint256[]" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "_proposalId", - "type": "uint256" - } - ], - "name": "getProposalVotes", - "outputs": [ - { - "internalType": "uint256", - "name": "forVotes", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "againstVotes", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "totalVotes", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "quorumRequired", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "getProposalsCount", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "timepoint", - "type": "uint256" - } - ], - "name": "getQuorumAt", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "getSupportedChainCount", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "_index", - "type": "uint256" - } - ], - "name": "getSupportedChainId", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - } - ], - "name": "getVotes", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "voter", - "type": "address" - }, - { - "internalType": "uint256", - "name": "timepoint", - "type": "uint256" - } - ], - "name": "getVotingPowerAt", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "isActive", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "_chainId", - "type": "uint256" - } - ], - "name": "isChainSupported", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "isDeactivated", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "_moduleId", - "type": "bytes32" - } - ], - "name": "isModuleActive", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "offset", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "limit", - "type": "uint256" - } - ], - "name": "listProposals", - "outputs": [ - { - "internalType": "uint256[]", - "name": "", - "type": "uint256[]" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "listSupportedChains", - "outputs": [ - { - "internalType": "uint256[]", - "name": "", - "type": "uint256[]" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "", - "type": "bytes32" - } - ], - "name": "modules", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "name", - "outputs": [ - { - "internalType": "string", - "name": "", - "type": "string" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "owner", - "type": "address" - } - ], - "name": "nonces", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - } - ], - "name": "numCheckpoints", - "outputs": [ - { - "internalType": "uint32", - "name": "", - "type": "uint32" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "owner", - "type": "address" - }, - { - "internalType": "address", - "name": "spender", - "type": "address" - }, - { - "internalType": "uint256", - "name": "value", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "deadline", - "type": "uint256" - }, - { - "internalType": "uint8", - "name": "v", - "type": "uint8" - }, - { - "internalType": "bytes32", - "name": "r", - "type": "bytes32" - }, - { - "internalType": "bytes32", - "name": "s", - "type": "bytes32" - } - ], - "name": "permit", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "proposalCounter", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "name": "proposals", - "outputs": [ - { - "internalType": "uint256", - "name": "id", - "type": "uint256" - }, - { - "internalType": "string", - "name": "description", - "type": "string" - }, - { - "internalType": "uint256", - "name": "forVotes", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "againstVotes", - "type": "uint256" - }, - { - "internalType": "bool", - "name": "executed", - "type": "bool" - }, - { - "internalType": "bool", - "name": "canceled", - "type": "bool" - }, - { - "internalType": "uint256", - "name": "deadline", - "type": "uint256" - }, - { - "internalType": "address", - "name": "initiator", - "type": "address" - }, - { - "internalType": "bytes", - "name": "operation", - "type": "bytes" - }, - { - "internalType": "uint256", - "name": "governanceChainId", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "snapshotTimepoint", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "quorumPercentage", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "name": "supportedChainIds", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "name": "supportedChains", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "symbol", - "outputs": [ - { - "internalType": "string", - "name": "", - "type": "string" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "_proposalId", - "type": "uint256" - } - ], - "name": "syncToAllChains", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "totalSupply", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "to", - "type": "address" - }, - { - "internalType": "uint256", - "name": "amount", - "type": "uint256" - } - ], - "name": "transfer", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "from", - "type": "address" - }, - { - "internalType": "address", - "name": "to", - "type": "address" - }, - { - "internalType": "uint256", - "name": "amount", - "type": "uint256" - } - ], - "name": "transferFrom", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "_proposalId", - "type": "uint256" - }, - { - "internalType": "bool", - "name": "_support", - "type": "bool" - } - ], - "name": "vote", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - } - ], - "bytecode": "0x6101608060405234620001ee5762007f28908138038092620000218262000209565b82398181019160408112620001ee578151906001600160401b0390818311620001ee578284910312620001ee576200005862000275565b82840151828111620001ee5785856200007492860101620002ed565b81526101809283810151838111620001ee5786866200009692840101620002ed565b60208301526101a0810151838111620001ee578686620000b992840101620002ed565b60408301526101c0810151838111620001ee578686620000dc92840101620002ed565b60608301526101e08101516080830152610200810151838111620001ee5786866200010a9284010162000360565b60a083015261022081015160c083015261024081015160e0830152610260810151838111620001ee5786866200014392840101620003eb565b956101009687840152610280820151848111620001ee5781876200016a9285010162000462565b9561012096878501526102a0830151948511620001ee57620001a4946200019393010162000462565b9261014093848301525190620011e3565b60405191615e9d93846200204b853960805184612c48015260a05184612d03015260c05184612c12015260e05184612c9701525183612cbd015251826118100152518161183c0152f35b600080fd5b634e487b7160e01b600052604160045260246000fd5b601f01601f1916610160908101906001600160401b038211908210176200022f57604052565b620001f3565b604081019081106001600160401b038211176200022f57604052565b601f909101601f19168101906001600160401b038211908210176200022f57604052565b6040519061016082016001600160401b038111838210176200022f57604052565b6040519061012082016001600160401b038111838210176200022f57604052565b60405190620002c68262000235565b565b60005b838110620002dc5750506000910152565b8181015183820152602001620002cb565b81601f82011215620001ee5780516001600160401b0381116200022f576040519262000324601f8301601f19166020018562000251565b81845260208284010111620001ee57620003459160208085019101620002c8565b90565b6001600160401b0381116200022f5760051b60200190565b9080601f83011215620001ee578151906200037b8262000348565b926200038b604051948562000251565b828452602092838086019160051b83010192808411620001ee57848301915b848310620003bb5750505050505090565b82516001600160401b038111620001ee578691620003df84848094890101620002ed565b815201920191620003aa565b81601f82011215620001ee57805191620004058362000348565b9262000415604051948562000251565b808452602092838086019260051b820101928311620001ee578301905b82821062000441575050505090565b81516001600160a01b0381168103620001ee57815290830190830162000432565b81601f82011215620001ee578051916200047c8362000348565b926200048c604051948562000251565b808452602092838086019260051b820101928311620001ee578301905b828210620004b8575050505090565b81518152908301908301620004a9565b90600182811c92168015620004fa575b6020831014620004e457565b634e487b7160e01b600052602260045260246000fd5b91607f1691620004d8565b81811062000511575050565b6000815560010162000505565b90601f82116200052c575050565b620002c69160036000526020600020906020601f840160051c830193106200055d575b601f0160051c019062000505565b90915081906200054f565b90601f821162000576575050565b620002c69160046000526020600020906020601f840160051c830193106200055d57601f0160051c019062000505565b90601f8211620005b4575050565b620002c69160056000526020600020906020601f840160051c830193106200055d57601f0160051c019062000505565b90601f8211620005f2575050565b620002c69160066000526020600020906020601f840160051c830193106200055d57601f0160051c019062000505565b90601f821162000630575050565b620002c691600c6000526020600020906020601f840160051c830193106200055d57601f0160051c019062000505565b90601f82116200066e575050565b620002c691600d6000526020600020906020601f840160051c830193106200055d57601f0160051c019062000505565b90601f8211620006ac575050565b620002c691600e6000526020600020906020601f840160051c830193106200055d57601f0160051c019062000505565b90601f8211620006ea575050565b620002c691600f6000526020600020906020601f840160051c830193106200055d57601f0160051c019062000505565b9190601f81116200072a57505050565b620002c6926000526020600020906020601f840160051c830193106200055d57601f0160051c019062000505565b80519091906001600160401b0381116200022f5762000784816200077e600454620004c8565b62000568565b602080601f8311600114620007c35750819293600092620007b7575b50508160011b916000199060031b1c191617600455565b015190503880620007a0565b6004600052601f198316949091907f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b926000905b8782106200083257505083600195961062000818575b505050811b01600455565b015160001960f88460031b161c191690553880806200080d565b80600185968294968601518155019501930190620007f7565b80519091906001600160401b0381116200022f57620008778162000871600c54620004c8565b62000622565b602080601f8311600114620008b65750819293600092620008aa575b50508160011b916000199060031b1c191617600c55565b01519050388062000893565b600c600052601f198316949091907fdf6966c971051c3d54ec59162606531493a51404a002842f56009d7e5cf4a8c7926000905b878210620009255750508360019596106200090b575b505050811b01600c55565b015160001960f88460031b161c1916905538808062000900565b80600185968294968601518155019501930190620008ea565b80519091906001600160401b0381116200022f576200096a8162000964600d54620004c8565b62000660565b602080601f8311600114620009a957508192936000926200099d575b50508160011b916000199060031b1c191617600d55565b01519050388062000986565b600d600052601f198316949091907fd7b6990105719101dabeb77144f2a3385c8033acd3af97e9423a695e81ad1eb5926000905b87821062000a18575050836001959610620009fe575b505050811b01600d55565b015160001960f88460031b161c19169055388080620009f3565b80600185968294968601518155019501930190620009dd565b80519091906001600160401b0381116200022f5762000a5d8162000a57600e54620004c8565b6200069e565b602080601f831160011462000a9c575081929360009262000a90575b50508160011b916000199060031b1c191617600e55565b01519050388062000a79565b600e600052601f198316949091907fbb7b4a454dc3493923482f07822329ed19e8244eff582cc204f8554c3620c3fd926000905b87821062000b0b57505083600195961062000af1575b505050811b01600e55565b015160001960f88460031b161c1916905538808062000ae6565b8060018596829496860151815501950193019062000ad0565b80519091906001600160401b0381116200022f5762000b508162000b4a600f54620004c8565b620006dc565b602080601f831160011462000b8f575081929360009262000b83575b50508160011b916000199060031b1c191617600f55565b01519050388062000b6c565b600f600052601f198316949091907f8d1108e10bcb7c27dddfc02ed9d693a074039d026cf4ea4240b40f7d581ac802926000905b87821062000bfe57505083600195961062000be4575b505050811b01600f55565b015160001960f88460031b161c1916905538808062000bd9565b8060018596829496860151815501950193019062000bc3565b81519192916001600160401b0381116200022f5762000c438162000c3c8454620004c8565b846200071a565b602080601f831160011462000c8257508192939460009262000c76575b50508160011b916000199060031b1c1916179055565b01519050388062000c60565b90601f1983169562000c9985600052602060002090565b926000905b88821062000cd95750508360019596971062000cbf575b505050811b019055565b015160001960f88460031b161c1916905538808062000cb5565b8060018596829496860151815501950193019062000c9e565b634e487b7160e01b600052601160045260246000fd5b62000d1481516200084b565b602062000d24818301516200093e565b62000d33604083015162000a31565b62000d42606083015162000b24565b608082015160105560a0820151908151916801000000000000000083116200022f5781906011548460115580851062000dfd575b50601160005201907f31ecc21a745e3968a04e9570e4425bc18fa8019c68028196b546d1669c200c686000925b84841062000dde5750505060c0830151601255505060e08101516013556101000151620002c690151560ff8019601454169115151617601455565b6001838262000df08394518662000c17565b0192019301929062000da3565b6000601181528584822092830192015b82811062000e1d57505062000d76565b6001919293945062000e308154620004c8565b8062000e44575b5001908493929162000e0d565b601f90818111841462000e5e5750508281555b3862000e37565b8362000e839262000e7485600052602060002090565b920160051c8201910162000505565b6000818152602081208183555562000e57565b600019811462000ea65760010190565b62000cf2565b634e487b7160e01b600052603260045260246000fd5b805182101562000ed75760209160051b010190565b62000eac565b601d54680100000000000000008110156200022f576001810180601d5581101562000ed757601d6000527f6d4407e7be21f808e6509aa9fa9143369579dd7d760fe20a2c09680fc146134f0155565b1562000f3457565b60405162461bcd60e51b815260206004820152601660248201527f417272617973206c656e677468206d69736d61746368000000000000000000006044820152606490fd5b1562000f8157565b60405162461bcd60e51b815260206004820152601360248201527f4e6f20696e697469616c20706172746e657273000000000000000000000000006044820152606490fd5b1562000fce57565b60405162461bcd60e51b815260206004820152600c60248201526b5a65726f206164647265737360a01b6044820152606490fd5b156200100a57565b60405162461bcd60e51b815260206004820152600b60248201526a16995c9bc8185b5bdd5b9d60aa1b6044820152606490fd5b90815180825260208080930193019160005b8281106200105e575050505090565b8351855293810193928101926001016200104f565b9092916040820191604081528451809352606081019260208096019060005b818110620010af575050506200034593948184039101526200103d565b82516001600160a01b03168652948701949187019160010162001092565b90602091620010e881518092818552858086019101620002c8565b601f01601f1916010190565b95979998969493906200114c92936200112e6200111e6200113d93610120808c528b0190620010cd565b6020968a8203888c0152620010cd565b9088820360408a0152620010cd565b908682036060880152620010cd565b91608085015283820360a08501528551908183528083019281808460051b8301019801936000915b848310620011b257505050505050620003459495620011a39160c084015260e083019060018060a01b03169052565b6101008184039101526200103d565b9091929394988480620011d2600193601f198682030187528d51620010cd565b9b0193019301919493929062001174565b908151926020830193845181620011fa9262001438565b82519184519360408101928351936060830190815194608085019889519660a087019788519160c089019a8b51946200123262000296565b809e81526020015260408d015260608c015260808b015260a08a015260c08901524260e0890152610100978881016200126b9060019052565b620012769062000d08565b60e085015160155560175560005b610140850180518051831015620012f057620012dd838093620012d6620012c9620012b8620012ea98620012e49762000ec2565b51600052601c602052604060002090565b805460ff19166001179055565b5162000ec2565b5162000edd565b62000e96565b62001284565b505050929597909396919497860195865151986200131761012083019a8b51511462000f2c565b62001326885151151562000f79565b60005b88518051821015620013a55790620012e48c620013986200136d846200136562001358826200139f9962000ec2565b516001600160a01b031690565b935162000ec2565b51620013846001600160a01b038416151562000fc6565b6200139181151562001002565b82620015ab565b8062001f5b565b62001329565b5050909192939598977ff9e7aa11bcdcbb8ac33b5dba92fca799ef091e54c29270822065501d8edea1a57f4b9dadc25256e1809c89a2e191cd5f7587c94321f462da5c4749bd009218f69c99620014339799519051906200140c6040519283928362001073565b0390a161014083519451975198519551915192519301519460405198899830968a620010f4565b0390a1565b92919092604051906200144b8262000235565b60019283835260209081840194603160f81b865287519060018060401b0382116200022f57620014888262001482600354620004c8565b6200051e565b8398601f83116001146200151e578291620014c595969798999a839260009462001512575b50501b916000199060031b1c19161760035562000758565b620014d08262001679565b61012052620014df8362001789565b61014052815191012060e052519020610100524660a05262001500620018ee565b6080523060c052620002c66001600b55565b015192503880620014ad565b6003600052601f198316999192917fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b9160005b8c811062001595575083620014c59798999a9b9c106200157b575b505050811b0160035562000758565b015160001960f88460031b161c191690553880806200156c565b8183015184559285019291870191870162001551565b91906001600160a01b0383168015620016605760025482810180911162000ea6576002556001600160a01b038416600090815260208181526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9190a3600254926001600160d01b0384116200163657620002c69293506200195a565b604051630e58ae9360e11b8152600481018590526001600160d01b036024820152604490fd5b0390fd5b60405163ec442f0560e01b815260006004820152602490fd5b90815160208082106000146200169757505090620003459062001899565b6001600160401b0382116200022f57620016be82620016b8600554620004c8565b620005a6565b80601f8311600114620016fe5750819293600092620016f2575b50508160011b916000199060031b1c19161760055560ff90565b015190503880620016d8565b6005600052601f198316949091907f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db0926000905b8782106200177057505083600195961062001756575b505050811b0160055560ff90565b015160001960f88460031b161c1916905538808062001748565b8060018596829496860151815501950193019062001732565b9081516020808210600014620017a757505090620003459062001899565b6001600160401b0382116200022f57620017ce82620017c8600654620004c8565b620005e4565b80601f83116001146200180e575081929360009262001802575b50508160011b916000199060031b1c19161760065560ff90565b015190503880620017e8565b6006600052601f198316949091907ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f926000905b8782106200188057505083600195961062001866575b505050811b0160065560ff90565b015160001960f88460031b161c1916905538808062001858565b8060018596829496860151815501950193019062001842565b601f815111620018c7576020815191015160208210620018b7571790565b6000198260200360031b1b161790565b60405163305a27a960e01b8152602060048201529081906200165c906024830190620010cd565b60e051610100516040519060208201927f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f8452604083015260608201524660808201523060a082015260a0815260c0810181811060018060401b038211176200022f5760405251902090565b90620019668162001c96565b9165ffffffffffff80431162001a4457600a5460008162001a11575050620019a29062001999620002c695600062002016565b90431662001d92565b50506001600160a01b03908116908115620019f4575b60086020527f5eff886ea0ce6ca488a3d6e336d6c0f75f46d19b42c06ce5ee98e42c96d256c75460009283526040909220548116911662001a63565b62001a0962001a038462001c96565b62001be1565b5050620019b8565b60009291921995838781011162000ea657620002c696620019a294602084600a6200199996522001015460301c62002016565b6040516306dfcc6560e41b815260306004820152436024820152604490fd5b6001600160a01b0380831693929190811690818514158062001bd7575b62001a8d575b5050505050565b8162001b09575b50508262001aa5575b808062001a86565b6001600160a01b0316600090815260096020526040902060008051602062007f088339815191529162001ae59162001ade909162001c96565b9062001c3e565b604080516001600160d01b039384168152919092166020820152a238808062001a9d565b6001600160a01b0316600090815260096020526040902062001b2b8462001c96565b9065ffffffffffff9081431162001a4457805460008162001b985750509062001b759162001b6b60008051602062007f0883398151915294600062002030565b9143169062001e8e565b604080516001600160d01b039384168152919092166020820152a2388062001a94565b6000939291931994848681011162000ea65760008051602062007f088339815191529562001b75956020848662001b6b96522001015460301c62002030565b5083151562001a80565b65ffffffffffff80431162001a4457600a5460008162001c125750506200199962001c0e92600062002030565b9091565b9092600019848181011162000ea65762001c0e94602084600a6200199996522001015460301c62002030565b65ffffffffffff9081431162001a4457805460008162001c6b57505062001b6b62001c0e93600062002016565b9093600019858181011162000ea65762001c0e956020848662001b6b96522001015460301c62002016565b6001600160d01b039081811162001cab571690565b604490604051906306dfcc6560e41b825260d060048301526024820152fd5b60001981019190821162000ea657565b600a5490680100000000000000008210156200022f576001820180600a5582101562000ed757600a60005280516020919091015160301b65ffffffffffff191665ffffffffffff919091161760008051602062007ee883398151915290910155565b908154680100000000000000008110156200022f576001810180845581101562000ed75760009283526020928390208251929093015160301b65ffffffffffff191665ffffffffffff9290921691909117910155565b600a54919291801562001e5f5762001dae62001dc79162001cca565b600a60005260008051602062007ee88339815191520190565b9081549165ffffffffffff9081841691831680831162001e4d5786920362001e0f5762001e0892509065ffffffffffff82549181199060301b169116179055565b60301c9190565b505062001e479062001e3262001e24620002b7565b65ffffffffffff9092168252565b6001600160d01b038516602082015262001cda565b62001e08565b604051632520601d60e01b8152600490fd5b5062001e889062001e7362001e24620002b7565b6001600160d01b038416602082015262001cda565b60009190565b8054929392801562001f315762001ea962001eb69162001cca565b8260005260206000200190565b9182549265ffffffffffff9182851692811680841162001e4d5787930362001ef8575062001e0892509065ffffffffffff82549181199060301b169116179055565b91505062001e479162001f1c62001f0e620002b7565b65ffffffffffff9093168352565b6001600160d01b038616602083015262001d3c565b509062001e889162001f4662001f0e620002b7565b6001600160d01b038516602083015262001d3c565b6001600160a01b03908116918082169182840362001fd15760008481526008602052604080822080546001600160a01b031981168717909155620002c696931694909285907f3134e8a2e6d97e929a7e54011ea5485d7d196dd5f0ba4d4ef95803e8e3fc257f8480a48060205220549162001a63565b60405162461bcd60e51b815260206004820152601360248201527f44656c65676174696f6e2064697361626c6564000000000000000000000000006044820152606490fd5b6001600160d01b039182169082160190811162000ea65790565b6001600160d01b039182169082160390811162000ea6579056fe6080604052600436101561001257600080fd5b60003560e01c8063013cf08b146103de57806306fdde03146103d9578063078f6208146103d4578063095ea7b3146103cf5780630c0512e9146103ca5780630d61b519146103c557806318160ddd146103c0578063204c5d1f146103bb57806322dbefbb1461030c57806322f3e2d4146103b657806323b872dd146103b15780632519ae5c146103ac578063313ce567146103a75780633644e515146103a25780633a46b1a8146102d557806347c661401461039d5780634b145793146103075780634bf5d7e9146103985780634cf2ab32146103935780634cfd16bb1461038e5780634de184f6146103845780634fa76ec9146103895780635221c1f014610384578063548d496f1461037f578063587cde1e1461037a5780635c19a95c146103755780635cf0e8a4146103705780636cbadbfa146103705780636dcf811d1461036b5780636fcfff451461036657806370a08231146103615780637ce288ea1461035c5780637e5a9b47146103575780637ecebe00146103525780637f6dda141461034d57806384b0196e1461034857806385e59ce2146103435780638e539e8c1461033e5780639080936f1461033957806391ddadf41461033457806395d89b411461032f57806398e527d31461032a5780639a49bdde146103255780639ab24eb014610320578063a351f6151461031b578063a9059cbb14610316578063adf7420714610311578063b0b6cc1a1461030c578063b3fe8bcb14610307578063c3cda52014610302578063c8a6d06e146102fd578063c97bfe6b146102f8578063c9a3c0c7146102f3578063c9d27afe146102ee578063d505accf146102e9578063dcf628c0146102e4578063dd62ed3e146102df578063e49a62e9146102da578063eaeded5f146102d5578063eced3dfb146102d0578063f1127ed8146102cb5763f2c26a47146102c657600080fd5b612780565b612660565b612642565b61122a565b612624565b6125c1565b612529565b61237f565b612232565b612142565b6120f1565b612069565b611f27565b6112eb565b610f68565b611c27565b611bdb565b611aa3565b611a5a565b611a3c565b611a1e565b611977565b61194b565b611922565b6118f0565b6118b9565b6117f7565b6117c1565b611784565b611756565b6116cb565b61168e565b611621565b6115fe565b6115e0565b6115b8565b611579565b611548565b6114f3565b61152a565b611479565b611406565b61131c565b611255565b611207565b6111eb565b611086565b610fd3565b610f9c565b610e95565b610d70565b610c7a565b610c5c565b610bc4565b610b84565b610aa3565b6109ec565b90600182811c92168015610413575b60208310146103fd57565b634e487b7160e01b600052602260045260246000fd5b91607f16916103f2565b600d546000929161042d826103e3565b80825291600190818116908115610492575060011461044b57505050565b91929350600d600052600080516020615e28833981519152916000925b84841061047a57505060209250010190565b80546020858501810191909152909301928101610468565b915050602093945060ff929192191683830152151560051b010190565b600e54600092916104bf826103e3565b8082529160019081811690811561049257506001146104dd57505050565b91929350600e600052600080516020615dc8833981519152916000925b84841061050c57505060209250010190565b805460208585018101919091529093019281016104fa565b600f5460009291610534826103e3565b80825291600190818116908115610492575060011461055257505050565b91929350600f600052600080516020615e48833981519152916000925b84841061058157505060209250010190565b8054602085850181019190915290930192810161056f565b90600092918054916105aa836103e3565b91828252600193848116908160001461060c57506001146105cc575b50505050565b90919394506000526020928360002092846000945b8386106105f85750505050010190388080806105c6565b8054858701830152940193859082016105e1565b9294505050602093945060ff191683830152151560051b010190388080806105c6565b634e487b7160e01b600052604160045260246000fd5b61012081019081106001600160401b0382111761066157604052565b61062f565b604081019081106001600160401b0382111761066157604052565b60a081019081106001600160401b0382111761066157604052565b60c081019081106001600160401b0382111761066157604052565b90601f801991011681019081106001600160401b0382111761066157604052565b60405190600082600c54916106ec836103e3565b808352926001908181169081156107625750600114610715575b50610713925003836106b7565b565b600c60009081529150600080516020615da88339815191525b8483106107475750610713935050810160200138610706565b81935090816020925483858a0101520191019091859261072e565b90506020925061071394915060ff191682840152151560051b82010138610706565b60405190600082600d5491610798836103e3565b8083529260019081811690811561076257506001146107be5750610713925003836106b7565b600d60009081529150600080516020615e288339815191525b8483106107f05750610713935050810160200138610706565b81935090816020925483858a010152019101909185926107d7565b60405190600082600e549161081f836103e3565b8083529260019081811690811561076257506001146108455750610713925003836106b7565b600e60009081529150600080516020615dc88339815191525b8483106108775750610713935050810160200138610706565b81935090816020925483858a0101520191019091859261085e565b60405190600082600f54916108a6836103e3565b8083529260019081811690811561076257506001146108cc5750610713925003836106b7565b600f60009081529150600080516020615e488339815191525b8483106108fe5750610713935050810160200138610706565b81935090816020925483858a010152019101909185926108e5565b9061071361092d9260405193848092610599565b03836106b7565b60005b8381106109475750506000910152565b8181015183820152602001610937565b9060209161097081518092818552858086019101610934565b601f01601f1916010190565b97936109a56109e1989497936101409b97939e9d9c9e8b526101608060208d01528b0190610957565b60408a0197909752606089015215156080880152151560a087015260c08601526001600160a01b031660e0850152838203610100850152610957565b946101208201520152565b34610a8a576020366003190112610a8a57600435600052601a60205260406000208054610a8660405191610a2e83610a278160018801610599565b03846106b7565b600284015460038501546004860154600587015460068801549397929492936001600160a01b031691610a6360078601610919565b93600a6008870154960154966040519a8b9a60ff808660081c169516938c61097c565b0390f35b600080fd5b906020610aa0928181520190610957565b90565b34610a8a57600080600319360112610b81576040519080600354610ac6816103e3565b80855291600191808316908115610b575750600114610afc575b610a8685610af0818703826106b7565b60405191829182610a8f565b9250600383527fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b5b828410610b3f575050508101602001610af082610a86610ae0565b80546020858701810191909152909301928101610b24565b869550610a8696935060209250610af094915060ff191682840152151560051b8201019293610ae0565b80fd5b34610a8a576000366003190112610a8a576060601554601754601d549060405192835260208301526040820152f35b6001600160a01b03811603610a8a57565b34610a8a576040366003190112610a8a57610be0600435610bb3565b60405162461bcd60e51b815260206004820152604860248201527f44697265637420617070726f76616c732064697361626c65642e20557365206760448201527f6f7665726e616e63652070726f706f73616c7320666f7220746f6b656e20747260648201526730b739b332b9399760c11b608482015260a490fd5b34610a8a576000366003190112610a8a576020601654604051908152f35b34610a8a576020366003190112610a8a577fbadbd87941bb6424ed4aa4719bf01a3319b64480e49f89018c718603239553d260043580600052601a60205260076040600020610ccb83825414613d01565b610d3a60048201610cec610ce7610ce3835460ff1690565b1590565b613d88565b610cfd601754600885015414613f0f565b610d2d610d0986613ea1565b60058601544210801590610d69575b610d2190613f5a565b81610d61575b50613fb6565b805460ff19166001179055565b0190610d4d610d4883610919565b614749565b610d5c60405192839283613ff8565b0390a1005b905038610d27565b5080610d18565b34610a8a576000366003190112610a8a576020600254604051908152f35b90815180825260208092019182818360051b85019501936000915b848310610db95750505050505090565b9091929394958480610dd383856001950387528a51610957565b9801930193019194939290610da9565b610aa090602081528251610e71610e0861012092836020860152610140850190610957565b610e52610e3e610e2a602089015193601f1994858983030160408a0152610957565b604089015184888303016060890152610957565b606088015183878303016080880152610957565b90608087015160a086015260a0870151908583030160c0860152610d8e565b9360c081015160e084015260e0810151906101009182850152015191019015159052565b34610a8a57600080600319360112610b8157610a8690610f5c604051610eba81610645565b60609283825283602083015283604083015283808301528060808301528360a08301528060c08301528060e083015261010080920152610ef8610fff565b92610f016106d8565b8452610f0b610784565b6020850152610f1861080b565b6040850152610f25610892565b908401526010546080840152610f396154ee565b60a084015260125460c084015260135460e084015260145460ff16151590830152565b60405191829182610de3565b34610a8a576020366003190112610a8a576004356000526018602052602060018060a01b0360406000205416604051908152f35b34610a8a576000366003190112610a8a5760ff601e54161580610fc7575b6020906040519015158152f35b5060145460ff16610fba565b34610a8a576060366003190112610a8a57610fef600435610bb3565b610ffa602435610bb3565b615d2b565b6040519061071382610645565b6040519061071382610666565b6001600160401b03811161066157601f01601f191660200190565b92919261104082611019565b9161104e60405193846106b7565b829481845281830111610a8a578281602093846000960137010152565b9080601f83011215610a8a57816020610aa093359101611034565b34610a8a5760a0366003190112610a8a576004356001600160401b038111610a8a576110b690369060040161106b565b606435906044356110c683610bb3565b611181608435916110f36110ee6110e785600052601c602052604060002090565b5460ff1690565b613345565b6111076001600160a01b038616151561530b565b611129611124610ce36110e7846000526019602052604060002090565b615346565b336000908152602081905260409020611145905b5415156132ed565b6040516304fa45bf60e31b602082015260248101919091526001600160a01b03909416604485015283606481015b03601f1981018552846106b7565b601d549261118e84612d77565b9360005b8181106111bc57610a866111ac338887876024358b613b12565b6040519081529081906020820190565b806111d66111cc6111e6936113c4565b90549060031b1c90565b6111e082896139b9565b52613414565b611192565b34610a8a576000366003190112610a8a57602060405160128152f35b34610a8a576000366003190112610a8a576020611222612c0f565b604051908152f35b34610a8a576040366003190112610a8a57602061122260043561124c81610bb3565b60243590612894565b34610a8a576020366003190112610a8a5760043580600052601a602052611283604060002091825414613d01565b60646112ae60018060d01b036112a461129f600a86015461294e565b612fc5565b1660155490613e8e565b04906003600282015491015491828201908183116112e657604080519384526020840194909452928201526060810191909152608090f35b61298f565b34610a8a576020366003190112610a8a576004356000526019602052602060ff604060002054166040519015158152f35b34610a8a576000366003190112610a8a5761133643612f5c565b65ffffffffffff8061134743612f5c565b1691160361139c57610a8660405161135e81610666565b601d81527f6d6f64653d626c6f636b6e756d6265722666726f6d3d64656661756c740000006020820152604051918291602083526020830190610957565b6040516301bfc1c560e61b8152600490fd5b634e487b7160e01b600052603260045260246000fd5b601d548110156113e957601d600052600080516020615de88339815191520190600090565b6113ae565b80548210156113e95760005260206000200190600090565b34610a8a576020366003190112610a8a57600435601d54811015610a8a57602090601d600052600080516020615de88339815191520154604051908152f35b90815180825260208080930193019160005b828110611465575050505090565b835185529381019392810192600101611457565b34610a8a576000366003190112610a8a5760405180601d54808252826020809301601d600052600080516020615de88339815191529260005b858282106114dd575050506114c9925003836106b7565b610a86604051928284938452830190611445565b85548452600195860195889550930192016114b2565b34610a8a576020366003190112610a8a576020611520600435600052601c60205260ff6040600020541690565b6040519015158152f35b34610a8a576000366003190112610a8a576020601554604051908152f35b34610a8a576020366003190112610a8a57600435600052601c602052602060ff604060002054166040519015158152f35b34610a8a576020366003190112610a8a57602060043561159881610bb3565b60018060a01b038091166000526008825260406000205416604051908152f35b34610a8a576020366003190112610a8a576115de6004356115d881610bb3565b33615c5b565b005b34610a8a576000366003190112610a8a576020601754604051908152f35b34610a8a576000366003190112610a8a57602060ff601e54166040519015158152f35b34610a8a576020366003190112610a8a5760043561163e81610bb3565b6001600160a01b031660009081526009602052604090205463ffffffff9081811161166f5760209160405191168152f35b604490604051906306dfcc6560e41b8252602060048301526024820152fd5b34610a8a576020366003190112610a8a5760206112226004356116b081610bb3565b6001600160a01b031660009081526020819052604090205490565b34610a8a576020366003190112610a8a576004356116e881614485565b1561171a5760207f57df5a6a467271f04b10f7fe9e66d21dcd8ae7eaf079099d48959f24a53b691091604051908152a1005b60405162461bcd60e51b81526020600482015260146024820152734e6f7420616c6c20636861696e7320726561647960601b6044820152606490fd5b34610a8a576020366003190112610a8a576040611774600435613ea1565b8251911515825215156020820152f35b34610a8a576020366003190112610a8a576004356117a181610bb3565b60018060a01b031660005260076020526020604060002054604051908152f35b34610a8a576040366003190112610a8a57610a866117e36024356004356155c0565b604051918291602083526020830190611445565b34610a8a576000366003190112610a8a5761188a6118347f0000000000000000000000000000000000000000000000000000000000000000612da9565b610a866118607f0000000000000000000000000000000000000000000000000000000000000000612ea2565b61189861186b612d4f565b91604051958695600f60f81b875260e0602088015260e0870190610957565b908582036040870152610957565b90466060850152306080850152600060a085015283820360c0850152611445565b34610a8a576020366003190112610a8a57602060646118e76001600160d01b036112a461129f60043561294e565b04604051908152f35b34610a8a576020366003190112610a8a5760206001600160d01b0361191961129f60043561294e565b16604051908152f35b34610a8a576020366003190112610a8a576020611940600435615665565b60ff60405191168152f35b34610a8a576000366003190112610a8a57602061196743612f5c565b65ffffffffffff60405191168152f35b34610a8a57600080600319360112610b8157604051908060045461199a816103e3565b80855291600191808316908115610b5757506001146119c357610a8685610af0818703826106b7565b9250600483527f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b5b828410611a06575050508101602001610af082610a86610ae0565b805460208587018101919091529093019281016119eb565b34610a8a576000366003190112610a8a576020601b54604051908152f35b34610a8a576020366003190112610a8a5760206112226004356144ec565b34610a8a576020366003190112610a8a57600435611a7781610bb3565b6001600160a01b031660009081526009602090815260409091206001600160d01b03906119199061325e565b34610a8a576040366003190112610a8a576004356001600160401b03602435818111610a8a5736602382011215610a8a578060040135918211610a8a573660248383010111610a8a57610d5c602492847fc7c129e53e59dadfa16305619e80c7519f1f6912c10915359fd75b56bcecdd7b95600052601a602052611bcd6040600020611b3183825414613d01565b611bbe600a6004830192611b51611b4c610ce3865460ff1690565b61409a565b611b6060058201544210613d4d565b6006810154611b8a90611b83906001600160a01b03165b6001600160a01b031690565b33146140d9565b0154611bb7611b998233612894565b916001600160d01b0390611bb09061129f9061294e565b1691613e78565b1015614116565b805461ff001916610100179055565b60405194859401908461416e565b34610a8a576040366003190112610a8a57610ffa600435610bb3565b9181601f84011215610a8a578235916001600160401b038311610a8a576020808501948460051b010111610a8a57565b34610a8a576060366003190112610a8a576001600160401b03600435602435828111610a8a57611c5b903690600401611bf7565b92604435908111610a8a5783611c7684923690600401611bf7565b611c7e613e55565b611c9284600052601a602052604060002090565b90611c9f85835414613d01565b6004820192611cba611cb5610ce3865460ff1690565b61419c565b60175494611cce60088501548714156141f8565b611ce0611cdb8786615728565b614254565b611ceb838214614297565b611d75876007860197611d6d600a611d028b610919565b6020815191012098015497611d5f896040519485936020850197889094939260809260a08301967f45de75acfcd4cbcc5691559486749bf0d5eb65e4b24c59ac2f258ba6bfceaa3484526020840152604083015260608201520152565b03601f1981018352826106b7565b519020612d29565b9760009889945b838610611e3d575050507fda7dba8f94d70cde423cce3a243bebf95d2ec927507b566f67e329dcfe2d06bb877fbadbd87941bb6424ed4aa4719bf01a3319b64480e49f89018c718603239553d2611e1689611dfd8a610d2d8f611df6611def8e6112a461129f60018060d01b039261294e565b6064900490565b11156143f6565b611e09610d4882610919565b6040519182918583613ff8565b0390a1601754604080519283526020830191909152819081015b0390a16115de6001600b55565b909192939499868b611e79611b77611e74611e6c611e66611e5f868a8f6142d4565b3691611034565b89614442565b938a8a614315565b614325565b6001600160a01b03821690611e8f90821461432f565b8d88886000925b8310611ed2575050505091611eb1611ec292611ec894612894565b90611ebd8215156143aa565b612fb8565b9a613414565b9493929190611d7c565b8394955092611eee611b77611e7485611ef595611efa98614315565b141561436b565b613414565b90899291888f8990611e96565b6064359060ff82168203610a8a57565b6084359060ff82168203610a8a57565b34610a8a5760c0366003190112610a8a57600435611f4481610bb3565b60443590602435611f53611f07565b834211611fdb57611fcf6115de94611fd6926040519060208201927fe48329057bfd03d55e49b547132e39cffd9c1820ad7b9d4c5307691425d15adf845260018060a01b0388166040840152866060840152608083015260808252611fb782610681565b611fca60a4359360843593519020612d29565b612aba565b9182612a64565b615c5b565b604051632341d78760e11b815260048101859052602490fd5b6001600160401b0381116106615760051b60200190565b81601f82011215610a8a5780359161202283611ff4565b9261203060405194856106b7565b808452602092838086019260051b820101928311610a8a578301905b82821061205a575050505090565b8135815290830190830161204c565b34610a8a5760c0366003190112610a8a576001600160401b03600435818111610a8a5761209a90369060040161106b565b90604435818111610a8a5736602382011215610a8a576120c4903690602481600401359101611034565b608435918211610a8a57610a86926120e36111ac93369060040161200b565b916064359160243590613387565b34610a8a576020366003190112610a8a57600435601b54811015610a8a57602090601b6000527f3ad8aa4f87544323a9d1e5dd902f40c356527a7955687113db5f9a85ad579dc10154604051908152f35b34610a8a576080366003190112610a8a576004356001600160401b038111610a8a5761217561117391369060040161106b565b6044356121f2606435916121996110ee6110e785600052601c602052604060002090565b6121b86121b36110e7836000526019602052604060002090565b61538a565b3360009081526020819052604090206121d09061113d565b604051633972e9fb60e21b602082015260248101919091529384906044820190565b601d54926121ff84612d77565b9360005b81811061221d57610a866111ac338887876024358b613b12565b806111d66111cc61222d936113c4565b612203565b34610a8a576040366003190112610a8a576004356024358015158103610a8a577f78975aaf742630489badd22949b88ac50eaaea576339ee05440b671a33bfb6a99161227c613e55565b611e3061229382600052601a602052604060002090565b61229f83825414613d01565b6122ae60058201544210613d4d565b6122c2610ce7610ce3600484015460ff1690565b600b8101906122f16122ec610ce36110e733869060018060a01b0316600052602052604060002090565b613dd4565b612302601754600883015414613e10565b61232a610d2d612316600a84015433612894565b336000908152602095909552604090942090565b841561236a5760020161233e828254612fb8565b90555b604080519384523360208501529315159383019390935260608201929092529081906080820190565b600301612378828254612fb8565b9055612341565b34610a8a5760e0366003190112610a8a5760043561239c81610bb3565b6024356123a881610bb3565b604435906064356123b7611f17565b8142116124a2576001600160a01b0385811660008181526007602090815260409182902080546001810190915582517f6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c99281019283529283019390935292861660608201526080810187905260a081019190915260c08082019490945292835261245b92909161244860e0836106b7565b611fca60c4359360a43593519020612d29565b6001600160a01b038481169082160361247857506115de926129a5565b6040516325c0072360e11b81526001600160a01b0391821660048201529084166024820152604490fd5b60405163313c898160e11b815260048101839052602490fd5b9794916124e090610aa09c9a97949b9895928a526101608060208c01528a0190610957565b604089019a909a52606088015215156080870152151560a086015260c08501526001600160a01b031660e084015261010083015261012082015280830361014090910152611445565b34610a8a576020366003190112610a8a5760043580600052601a60205260406000206125588154928314613d01565b610a8660028201549260038301549060048401546005850154612584600687015460018060a01b031690565b90600887015492600a880154946125a960096125a260018c01610919565b9a01615571565b966040519a8b9a60ff808660081c169516938c6124bb565b34610a8a576040366003190112610a8a57602061261b6004356125e381610bb3565b602435906125f082610bb3565b60018060a01b03166000526001835260406000209060018060a01b0316600052602052604060002090565b54604051908152f35b34610a8a576020366003190112610a8a576020611520600435614485565b34610a8a576000366003190112610a8a576020601d54604051908152f35b34610a8a576040366003190112610a8a5760043561267d81610bb3565b6024359063ffffffff82168203610a8a57610a86916126cd9161269e612a4b565b506126a7612a4b565b506001600160a01b031660009081526009602052604090206126c7612a4b565b506113ee565b50604051906126db82610666565b5465ffffffffffff811680835260309190911c60209283019081526040805192835290516001600160d01b031692820192909252918291820190565b96939060e0969361274d6127699461273f61275b949d9c999d8c6101008091528d0190610957565b908b820360208d0152610957565b9089820360408b0152610957565b908782036060890152610957565b96608086015260a085015260c08401521515910152565b34610a8a57600080600319360112610b8157604051908181600c546127a4816103e3565b808452936001918083169081156128705750600114612825575b50506127cc925003826106b7565b604051906127dd8261092d8161041d565b610a866040516127f7816127f0816104af565b03826106b7565b604051612807816127f081610524565b601054601254906013549260ff601454169460405198899889612717565b9150600c8252600080516020615da88339815191525b84831061285557506127cc935050810160200138806127be565b8193509081602092548385890101520191019091849261283b565b915050602092506127cc94915060ff191682840152151560051b82010138806127be565b6001600160a01b0316600090815260096020526040812090916128b69061294e565b815490838291600584116128ff575b6128d093508461328c565b806128e45750505b6001600160d01b031690565b916128f160209293612f8e565b92815220015460301c6128d8565b919261290a816130e9565b81039081116112e6576128d09385875265ffffffffffff808360208a200154169085161060001461293c5750916128c5565b92915061294890612faa565b906128c5565b65ffffffffffff61295e43612f5c565b16808210156129715750610aa090612f5c565b6044925060405191637669fc0f60e11b835260048301526024820152fd5b634e487b7160e01b600052601160045260246000fd5b90916001600160a01b03918216918215612a32578316928315612a1957817f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92592612a0f602093866000526001855260406000209060018060a01b0316600052602052604060002090565b55604051908152a3565b604051634a1406b160e11b815260006004820152602490fd5b60405163e602df0560e01b815260006004820152602490fd5b60405190612a5882610666565b60006020838281520152565b6001600160a01b03811660009081526007602052604090208054600181019091559091819003612a92575050565b6040516301d4b62360e61b81526001600160a01b039092166004830152602482015260449150fd5b91610aa09391612ac993612ad2565b90929192612b82565b91907f7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a08411612b5657926020929160ff608095604051948552168484015260408301526060820152600092839182805260015afa15612b4a5780516001600160a01b03811615612b4157918190565b50809160019190565b604051903d90823e3d90fd5b50505060009160039190565b60041115612b6c57565b634e487b7160e01b600052602160045260246000fd5b612b8b81612b62565b80612b94575050565b612b9d81612b62565b60018103612bb75760405163f645eedf60e01b8152600490fd5b612bc081612b62565b60028103612be15760405163fce698f760e01b815260048101839052602490fd5b80612bed600392612b62565b14612bf55750565b6040516335e2f38360e21b81526004810191909152602490fd5b307f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03161480612d00575b15612c6a577f000000000000000000000000000000000000000000000000000000000000000090565b60405160208101907f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f82527f000000000000000000000000000000000000000000000000000000000000000060408201527f000000000000000000000000000000000000000000000000000000000000000060608201524660808201523060a082015260a08152612cfa8161069c565b51902090565b507f00000000000000000000000000000000000000000000000000000000000000004614612c41565b604290612d34612c0f565b906040519161190160f01b8352600283015260228201522090565b604051602081018181106001600160401b038211176106615760405260008152906000368137565b90612d8182611ff4565b612d8e60405191826106b7565b8281528092612d9f601f1991611ff4565b0190602036910137565b60ff8114612de75760ff811690601f8211612dd55760405191612dcb83610666565b8252602082015290565b604051632cd44ac360e21b8152600490fd5b50604051600554816000612dfa836103e3565b80835292600190818116908115612e805750600114612e21575b50610aa0925003826106b7565b6005600090815291507f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db05b848310612e655750610aa0935050810160200138612e14565b81935090816020925483858901015201910190918492612e4c565b905060209250610aa094915060ff191682840152151560051b82010138612e14565b60ff8114612ec45760ff811690601f8211612dd55760405191612dcb83610666565b50604051600654816000612ed7836103e3565b80835292600190818116908115612e805750600114612efd5750610aa0925003826106b7565b6006600090815291507ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f5b848310612f415750610aa0935050810160200138612e14565b81935090816020925483858901015201910190918492612f28565b65ffffffffffff90818111612f6f571690565b604490604051906306dfcc6560e41b8252603060048301526024820152fd5b6000198101919082116112e657565b919082039182116112e657565b90600182018092116112e657565b919082018092116112e657565b600a805460008160058111613073575b509290925b8381106130195750506000918015600014612ff757505050600090565b61300090612f8e565b9152600080516020615e08833981519152015460301c90565b90928082169080831860011c82018092116112e6578360005265ffffffffffff8083600080516020615e08833981519152015416908616106000146130615750925b90612fda565b93915061306d90612faa565b9061305b565b909161307e826130e9565b82039182116112e65783835265ffffffffffff8083600080516020615e08833981519152015416908616106000146130b95750905b38612fd5565b91506130c490612faa565b6130b3565b81156130d3570490565b634e487b7160e01b600052601260045260246000fd5b6001811115610aa057600181600160801b811015613202575b6131aa6131a061319661318c6131826131786131b697600488600160401b6131b19a10156131f5575b6401000000008110156131e8575b620100008110156131db575b6101008110156131cf575b60108110156131c3575b10156131bb575b60030260011c613171818b6130c9565b0160011c90565b613171818a6130c9565b61317181896130c9565b61317181886130c9565b61317181876130c9565b61317181866130c9565b80936130c9565b821190565b900390565b60011b613161565b811c9160021b9161315a565b60081c91811b91613150565b60101c9160081b91613145565b60201c9160101b91613139565b60401c9160201b9161312b565b50600160401b9050608082901c613102565b600a5460009080613226575050600090565b806000198101116112e657600a7fc65a7bb8d6351c1cf70c95a316cc6a92839c986682d98bc35f958f4883f9d2a79252015460301c90565b80546000918161327057505050600090565b6000199282848101116112e65760209181522001015460301c90565b91905b83821061329c5750505090565b9091928083169080841860011c82018092116112e65760008581526020902082015465ffffffffffff90811690841610156132db5750925b919061328f565b9392506132e790612faa565b916132d4565b156132f457565b60405162461bcd60e51b815260206004820152602360248201527f4d75737420686f6c6420746f6b656e7320746f206372656174652070726f706f6044820152621cd85b60ea1b6064820152608490fd5b1561334c57565b60405162461bcd60e51b815260206004820152601360248201527210da185a5b881b9bdd081cdd5c1c1bdc9d1959606a1b6044820152606490fd5b929093913360005260006020526133a460406000205415156132ed565b84156133cf57610aa09482600052601c6020526133c860ff60406000205416613345565b3394613b12565b60405162461bcd60e51b815260206004820152601960248201527f4475726174696f6e206d75737420626520706f736974697665000000000000006044820152606490fd5b60001981146112e65760010190565b81811061342e575050565b60008155600101613423565b90601f8211613447575050565b61071391600c600052600080516020615da8833981519152906020601f840160051c8301931061347f575b601f0160051c0190613423565b9091508190613472565b90601f8211613496575050565b61071391600d600052600080516020615e28833981519152906020601f840160051c8301931061347f57601f0160051c0190613423565b90601f82116134da575050565b61071391600e600052600080516020615dc8833981519152906020601f840160051c8301931061347f57601f0160051c0190613423565b90601f821161351e575050565b61071391600f600052600080516020615e48833981519152906020601f840160051c8301931061347f57601f0160051c0190613423565b9190601f811161356457505050565b610713926000526020600020906020601f840160051c8301931061347f57601f0160051c0190613423565b9081516001600160401b038111610661576135b4816135af600c546103e3565b61343a565b602080601f83116001146135f057508192936000926135e5575b50508160011b916000199060031b1c191617600c55565b0151905038806135ce565b90601f19831694613611600c600052600080516020615da883398151915290565b926000905b87821061364e575050836001959610613635575b505050811b01600c55565b015160001960f88460031b161c1916905538808061362a565b80600185968294968601518155019501930190613616565b9081516001600160401b0381116106615761368b81613686600d546103e3565b613489565b602080601f83116001146136c757508192936000926136bc575b50508160011b916000199060031b1c191617600d55565b0151905038806136a5565b90601f198316946136e8600d600052600080516020615e2883398151915290565b926000905b87821061372557505083600195961061370c575b505050811b01600d55565b015160001960f88460031b161c19169055388080613701565b806001859682949686015181550195019301906136ed565b9081516001600160401b038111610661576137628161375d600e546103e3565b6134cd565b602080601f831160011461379e5750819293600092613793575b50508160011b916000199060031b1c191617600e55565b01519050388061377c565b90601f198316946137bf600e600052600080516020615dc883398151915290565b926000905b8782106137fc5750508360019596106137e3575b505050811b01600e55565b015160001960f88460031b161c191690553880806137d8565b806001859682949686015181550195019301906137c4565b9081516001600160401b0381116106615761383981613834600f546103e3565b613511565b602080601f8311600114613875575081929360009261386a575b50508160011b916000199060031b1c191617600f55565b015190503880613853565b90601f19831694613896600f600052600080516020615e4883398151915290565b926000905b8782106138d35750508360019596106138ba575b505050811b01600f55565b015160001960f88460031b161c191690553880806138af565b8060018596829496860151815501950193019061389b565b91909182516001600160401b038111610661576139128161390c84546103e3565b84613555565b602080601f831160011461394e575081929394600092613943575b50508160011b916000199060031b1c1916179055565b01519050388061392d565b90601f1983169561396485600052602060002090565b926000905b8882106139a157505083600195969710613988575b505050811b019055565b015160001960f88460031b161c1916905538808061397e565b80600185968294968601518155019501930190613969565b80518210156113e95760209160051b010190565b156139d457565b60405162461bcd60e51b815260206004820152601a60248201527f54617267657420636861696e206e6f7420737570706f727465640000000000006044820152606490fd5b601b54600160401b811015610661576001810180601b558110156113e957601b6000527f3ad8aa4f87544323a9d1e5dd902f40c356527a7955687113db5f9a85ad579dc10155565b601d54600160401b811015610661576001810180601d558110156113e957601d600052600080516020615de88339815191520155565b90815491600160401b8310156106615782613aba916001610713950181556113ee565b90919082549060031b91821b91600019901b1916179055565b9081526001600160a01b039091166020820152606060408201819052610aa092910190610957565b604090610aa0939281528160208201520190611445565b91949060165495613b2a613b2588613414565b601655565b613ba7613b4188600052601a602052604060002090565b91888355613b7c600194613b57888787016138eb565b6000600286015560006003860155613b766004860160ff198154169055565b42612fb8565b60058401556006830180546001600160a01b0319166001600160a01b038716179055600783016138eb565b846008820155613bc4613bb943612f5c565b65ffffffffffff1690565b80613cf05750819060005b600a820155600960009101925b613c9b575b505050613c85613c95937f7585f467599d0f008985f231af99293be388626ac16ca59505c2f8f88969cd637f5d1231ca3a274bcd2f510e0d53a889213ebf0315b86ee6bb9d73da08fba7460696947fdb17271edb72bcaba16ce918d885db2e701491c9ff3f713f80caf9d614aa9ff494613c5a8a613a19565b613c6a6040519283928c84613ad3565b0390a160408051888152602081019290925290918291820190565b0390a16040519182918583613afb565b0390a190565b8651811015613ceb5780613cd1613ccc6110e7613cbb613ce5958c6139b9565b51600052601c602052604060002090565b6139cd565b611ef5613cde828a6139b9565b5185613a97565b81613bdc565b613be1565b613cf990612f8e565b908291613bcf565b15613d0857565b60405162461bcd60e51b815260206004820152601760248201527f50726f706f73616c20646f6573206e6f742065786973740000000000000000006044820152606490fd5b15613d5457565b60405162461bcd60e51b815260206004820152600c60248201526b159bdd1a5b99c8195b99195960a21b6044820152606490fd5b15613d8f57565b60405162461bcd60e51b815260206004820152601960248201527f50726f706f73616c20616c7265616479206578656375746564000000000000006044820152606490fd5b15613ddb57565b60405162461bcd60e51b815260206004820152600d60248201526c105b1c9958591e481d9bdd1959609a1b6044820152606490fd5b15613e1757565b60405162461bcd60e51b815260206004820152601660248201527557726f6e6720636861696e20666f7220766f74696e6760501b6044820152606490fd5b6002600b5414613e66576002600b55565b604051633ee5aeb560e01b8152600490fd5b90600a820291808304600a14901517156112e657565b818102929181159184041417156112e657565b9081600052601a602052613ebc604060002092835414613d01565b6002820154600383015492838201908183116112e657600a0154606490613ef3906001600160d01b03906112a49061129f9061294e565b04111592839182613f05575b50509190565b1190503880613eff565b15613f1657565b606460405162461bcd60e51b815260206004820152602060248201527f45786563757465206f6e6c7920696e20676f7665726e616e636520636861696e6044820152fd5b15613f6157565b60405162461bcd60e51b815260206004820152602760248201527f566f74696e67206e6f7420656e64656420616e642071756f72756d206e6f74206044820152661c995858da195960ca1b6064820152608490fd5b15613fbd57565b60405162461bcd60e51b8152602060048201526013602482015272141c9bdc1bdcd85b081b9bdd081c185cdcd959606a1b6044820152606490fd5b919082526020916040838201526000928254614013816103e3565b938460408501526001918281169081600014614075575060011461403a575b505050505090565b6000908152828120949550935b858510614061575050506060925001013880808080614032565b805485850160600152938201938101614047565b93505050506060935060ff929192191683830152151560051b01013880808080614032565b156140a157565b60405162461bcd60e51b815260206004820152601060248201526f105b1c9958591e48195e1958dd5d195960821b6044820152606490fd5b156140e057565b60405162461bcd60e51b815260206004820152600e60248201526d27b7363c9034b734ba34b0ba37b960911b6044820152606490fd5b1561411d57565b60405162461bcd60e51b815260206004820152602360248201527f496e73756666696369656e7420766f74696e6720706f77657220746f2063616e60448201526218d95b60ea1b6064820152608490fd5b91926060938192845260406020850152816040850152848401376000828201840152601f01601f1916010190565b156141a357565b60405162461bcd60e51b815260206004820152602760248201527f50726f706f73616c20616c726561647920657865637574656420696e20746869604482015266399031b430b4b760c91b6064820152608490fd5b156141ff57565b60405162461bcd60e51b815260206004820152602760248201527f557365206578656375746550726f706f73616c20696e20676f7665726e616e63604482015266329031b430b4b760c91b6064820152608490fd5b1561425b57565b60405162461bcd60e51b8152602060048201526014602482015273436861696e206e6f7420696e207461726765747360601b6044820152606490fd5b1561429e57565b60405162461bcd60e51b815260206004820152600e60248201526d426164207369676e61747572657360901b6044820152606490fd5b91908110156113e95760051b81013590601e1981360301821215610a8a5701908135916001600160401b038311610a8a576020018236038113610a8a579190565b91908110156113e95760051b0190565b35610aa081610bb3565b1561433657565b60405162461bcd60e51b815260206004820152600d60248201526c426164207369676e617475726560981b6044820152606490fd5b1561437257565b60405162461bcd60e51b815260206004820152601060248201526f223ab83634b1b0ba329039b4b3b732b960811b6044820152606490fd5b156143b157565b60405162461bcd60e51b815260206004820152601b60248201527f4e6f20766f74696e6720706f77657220617420736e617073686f7400000000006044820152606490fd5b156143fd57565b60405162461bcd60e51b815260206004820152601a60248201527f51756f72756d206e6f74207265616368656420627920736967730000000000006044820152606490fd5b8151610aa092612ac992604019830161447a5761447392506020820151906060604084015193015160001a90612ad2565b9192909190565b505060009160029190565b61449e600091808352601a602052604083205414613d01565b80601d54915b8281106144b357505050600190565b6144d36144bf826144ec565b600052601c60205260ff6040600020541690565b156144e6576144e190613414565b6144a4565b50905090565b601d5481101561450f57601d600052600080516020615de8833981519152015490565b60405162461bcd60e51b8152602060048201526013602482015272092dcecc2d8d2c840c6d0c2d2dc40d2dcc8caf606b1b6044820152606490fd5b9092919261455781611019565b9161456560405193846106b7565b829482845282820111610a8a576020610713930190610934565b9190604083820312610a8a5782516001600160e01b031981168103610a8a57926020810151906001600160401b038211610a8a57019080601f83011215610a8a578151610aa09260200161454a565b9190826040910312610a8a57602082516145e781610bb3565b92015190565b90816020910312610a8a575190565b9190826040910312610a8a5760208251920151610aa081610bb3565b9080601f83011215610a8a578151610aa09260200161454a565b9080601f83011215610a8a5781519061464a82611ff4565b9261465860405194856106b7565b828452602092838086019160051b83010192808411610a8a57848301915b8483106146865750505050505090565b82516001600160401b038111610a8a5786916146a784848094890101614618565b815201920191614676565b909160e082840312610a8a578151926001600160401b0393848111610a8a57816146dd918501614618565b936020840151818111610a8a57826146f6918601614618565b936040810151828111610a8a578361470f918301614618565b936060820151838111610a8a5784614728918401614618565b9360808301519360a0840151908111610a8a5760c0916145e7918501614632565b61475d60209182808251830101910161457f565b91906001600160e01b0319166364ba33f760e11b81036147995750818161478d92610713945183010191016146b2565b95949094939193614e8a565b63f0f9e6b760e01b81036147c2575081816147bd92610713945183010191016145ed565b614f74565b632ab43f7f60e11b81036147eb575081816147e692610713945183010191016145ed565b615014565b6304fa45bf60e31b810361481e5750818161480f92610713945183010191016145fc565b6001600160a01b0316906153ce565b633972e9fb60e21b81036148475750818161484292610713945183010191016145ed565b61547e565b63093f734560e31b81036148705750818161486b92610713945183010191016145ed565b614916565b633e78500160e21b81036148995750818161489492610713945183010191016145ed565b614ab1565b63177dcde960e01b81036148cc575081816148bd92610713945183010191016145ce565b906001600160a01b03166150fa565b633cdb568760e11b14915061071390505760405162461bcd60e51b81526020600482015260116024820152702ab735b737bbb71037b832b930ba34b7b760791b6044820152606490fd5b80600052601c60205260ff604060002054166149c457601754811461497f5761497a81614971610d2d7fbba9d55e9fd1a441b1617724e2fdb76777d15ec77ab2b72ac15952cbe97085db94600052601c602052604060002090565b6111ac81613a61565b0390a1565b60405162461bcd60e51b815260206004820152601860248201527f43616e6e6f74206164642063757272656e7420636861696e00000000000000006044820152606490fd5b60405162461bcd60e51b815260206004820152601760248201527f436861696e20616c726561647920737570706f727465640000000000000000006044820152606490fd5b15614a1057565b60405162461bcd60e51b815260206004820152601b60248201527f43616e6e6f742072656d6f76652063757272656e7420636861696e00000000006044820152606490fd5b601d548015614a9b57600019810190808210156113e9577f6d4407e7be21f808e6509aa9fa9143369579dd7d760fe20a2c09680fc146134e600091601d83520155601d55565b634e487b7160e01b600052603160045260246000fd5b614ad160ff614aca83600052601c602052604060002090565b5416613345565b614adf601754821415614a09565b614b00614af682600052601c602052604060002090565b805460ff19169055565b60005b601d5480821015614b7d5782614b1b6111cc846113c4565b14614b2f5750614b2a90613414565b614b03565b91614b7561497a92613aba614b6f6111cc614b6a7f11a9d1a77f76361ed131c19b1dc5758504c51dbde2e49fc973a0ef9577ad13d598612f8e565b6113c4565b916113c4565b6111ac614a55565b505061497a7f11a9d1a77f76361ed131c19b1dc5758504c51dbde2e49fc973a0ef9577ad13d5916111ac565b15614bb057565b60405162461bcd60e51b815260206004820152601660248201527553796d626f6c2063616e6e6f7420626520656d70747960501b6044820152606490fd5b15614bf557565b60405162461bcd60e51b815260206004820152601860248201527f4c6f636174696f6e2063616e6e6f7420626520656d70747900000000000000006044820152606490fd5b15614c4157565b60405162461bcd60e51b815260206004820152601460248201527324b73b30b634b210353ab934b9b234b1ba34b7b760611b6044820152606490fd5b15614c8457565b60405162461bcd60e51b815260206004820152600b60248201526a0496e76616c6964204b50560ac1b6044820152606490fd5b805190600160401b82116106615760115482601155808310614d2f575b5060116000526020908101907f31ecc21a745e3968a04e9570e4425bc18fa8019c68028196b546d1669c200c686000925b848410614d13575050505050565b60018382614d23839451866138eb565b01920193019290614d05565b600060118152837f31ecc21a745e3968a04e9570e4425bc18fa8019c68028196b546d1669c200c6892830192015b828110614d6b575050614cd4565b80614d78600192546103e3565b80614d85575b5001614d5d565b601f908181118414614d9d5750508281555b38614d7e565b83614dbf92614db185600052602060002090565b920160051c82019101613423565b60008181526020812081835555614d97565b9796959390614e1f9293614e03614df3614e119360e08d5260e08d0190610957565b6020968c88818403910152610957565b908a820360408c0152610957565b9088820360608a0152610957565b92608087015285830360a08701528151908184528084019381808460051b8301019401946000915b848310614e5c57505050505060c09150930152565b90919293948480614e79600193601f198682030187528a51610957565b980193019301919594939290614e47565b9395919295949094845115614f38577f7ea9c3d75799a3cd5cdec3738a5a177d47693f37db1400ed10dcbd88e946e7b09661497a94614ecb88511515614ba9565b614ed781511515614bee565b614ee2831515614c3a565b614eed851515614c7d565b614ef68761358f565b614eff88613666565b614f088161373d565b614f1182613814565b614f1a83601055565b614f2384614cb7565b614f2c85601255565b60405197889788614dd1565b60405162461bcd60e51b81526020600482015260146024820152734e616d652063616e6e6f7420626520656d70747960601b6044820152606490fd5b80151580615009575b15614fc45760158054908290556040805191825260208201929092527fd0198ea88bf9c4ad5317b68e697944e524541fcb494d854f095b1cd88a097ab6918190810161497a565b60405162461bcd60e51b815260206004820152601960248201527f496e76616c69642071756f72756d2070657263656e74616765000000000000006044820152606490fd5b506064811115614f7d565b80600052601c60205261502e60ff60406000205416613345565b601754908181146150795760178190556040805192835260208301919091527f979103c7afbf0138fe781172504ceb318ff78f9a420de8cabac8141f0121b52191908190810161497a565b60405162461bcd60e51b815260206004820152600d60248201526c14d85b594818da185a5b881251609a1b6044820152606490fd5b156150b557565b60405162461bcd60e51b815260206004820152601860248201527f496e73756666696369656e7420444c452062616c616e636500000000000000006044820152606490fd5b6001600160a01b038116919082156151b457811561516f57816111ac8161516a936151647f60fa5854360cb5191bf1cd5e60e12730f045ba03e89460f03cc47d6969f0649f9661515c3060018060a01b03166000526000602052604060002090565b5410156150ae565b306151f9565b0390a2565b60405162461bcd60e51b815260206004820152601760248201527f416d6f756e74206d75737420626520706f7369746976650000000000000000006044820152606490fd5b60405162461bcd60e51b815260206004820152601f60248201527f43616e6e6f74207472616e7366657220746f207a65726f2061646472657373006044820152606490fd5b6001600160a01b03808216949392919085156152f257821680156152d9576001600160a01b038216600090815260208190526040902054958487106152aa578461071396970361525b8460018060a01b03166000526000602052604060002090565b556001600160a01b0384166000908152602081815260409182902080548801905590518681527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9190a3615773565b60405163391434e360e21b81526001600160a01b03841660048201526024810188905260448101869052606490fd5b60405163ec442f0560e01b815260006004820152602490fd5b604051634b637e8f60e11b815260006004820152602490fd5b1561531257565b60405162461bcd60e51b815260206004820152600c60248201526b5a65726f206164647265737360a01b6044820152606490fd5b1561534d57565b60405162461bcd60e51b81526020600482015260156024820152744d6f64756c6520616c72656164792065786973747360581b6044820152606490fd5b1561539157565b60405162461bcd60e51b8152602060048201526015602482015274135bd91d5b1948191bd95cc81b9bdd08195e1a5cdd605a1b6044820152606490fd5b7ff14475b19484bf096265507cc0c41cd3bf1994992088806830686e2d7272271991906154056001600160a01b038316151561530b565b80600052601960205261542060ff6040600020541615615346565b600081815260186020526040902080546001600160a01b0319166001600160a01b0384161790556019602090815260406000819020805460ff1916600117905580519283526001600160a01b0390931690820152908190810161497a565b60207f4c7c76abe482a2c36ea52f1b999474c69f8b4afeeac5635f8aea2526864ba8539180600052601982526154bb60ff6040600020541661538a565b600081815260188352604080822080546001600160a01b03191690556019845290819020805460ff1916905551908152a1565b601154906154fb82611ff4565b91604061550a815194856106b7565b8184528360208091019160116000527f31ecc21a745e3968a04e9570e4425bc18fa8019c68028196b546d1669c200c68906000935b85851061554e57505050505050565b60018481928451615563816127f0818a610599565b81520193019401939161553f565b9060405191828154918282526020928383019160005283600020936000905b8282106155a657505050610713925003836106b7565b855484526001958601958895509381019390910190615590565b601b9081549283821015615659578101918282116112e657838311615651575b8183038381116112e6576155f390612d77565b93825b84811061560557505050505090565b818110156113e95761564c9083600052807f3ad8aa4f87544323a9d1e5dd902f40c356527a7955687113db5f9a85ad579dc101546111e06156468784612f9d565b896139b9565b6155f6565b8392506155e0565b50505050610aa0612d4f565b61567981600052601a602052604060002090565b61568582825414613d01565b600481015460ff8160081c166157205760ff16615719576156a7600592613ea1565b92909101544210918215928280615712575b615709578291826156f0575b50506156e957816156e0575b506156db57600090565b600290565b905015386156d1565b5050600190565b84925090615701575b5038806156c5565b9050386156f9565b50505050600590565b50816156b9565b5050600390565b505050600490565b9060005b60098301805482101561576a576157448284926113ee565b90549060031b1c146157625761575b600991613414565b905061572c565b505050600190565b50505050600090565b6001600160a01b039081169291819084156157ff575b169081156157b7575b6107139360005260086020528060406000205416916000526040600020541690615844565b6157c0836159cc565b936157ca43612f5c565b6001600160d01b039586806157dd613214565b16911690039586116112e657610713956157f691615ab6565b50509350615792565b905061580a836159cc565b9061581443612f5c565b6001600160d01b03928380615827613214565b169116019283116112e657839261583d91615ab6565b5050615789565b6001600160a01b0380831693929190811690818514158061598d575b61586c575b5050505050565b816158f1575b505082615881575b8080615865565b6001600160a01b031660009081526009602052604090207fdec2bacdd2f05b59de34da9b523dff8be42e5e38e818c82fdb0bae774387a724916158ce916158c890916159cc565b90615996565b604080516001600160d01b039384168152919092166020820152a238808061587a565b6001600160a01b03166000908152600960205260409020615911846159cc565b61591a43612f5c565b6001600160d01b0391828061592e8661325e565b1691169003928284116112e6577fdec2bacdd2f05b59de34da9b523dff8be42e5e38e818c82fdb0bae774387a724936159839261596a92615b9f565b6040805192851683529316602082015291829190820190565b0390a23880615872565b50831515615860565b906159a043612f5c565b6001600160d01b039182806159b48661325e565b169116019182116112e6576159c892615b9f565b9091565b6001600160d01b03908181116159e0571690565b604490604051906306dfcc6560e41b825260d060048301526024820152fd5b600a5490600160401b821015610661576001820180600a558210156113e957600a600052805160209091015160301b65ffffffffffff191665ffffffffffff9190911617600080516020615e0883398151915290910155565b8054600160401b81101561066157615a75916001820181556113ee565b615aa057815160209092015160301b65ffffffffffff191665ffffffffffff92909216919091179055565b634e487b7160e01b600052600060045260246000fd5b600a549192918015615b7557615ace615ae691612f8e565b600a600052600080516020615e088339815191520190565b9081549165ffffffffffff90818416918316808311615b6357869203615b2b57615b2492509065ffffffffffff82549181199060301b169116179055565b60301c9190565b5050615b5e90615b4a615b3c61100c565b65ffffffffffff9092168252565b6001600160d01b03851660208201526159ff565b615b24565b604051632520601d60e01b8152600490fd5b50615b9990615b85615b3c61100c565b6001600160d01b03841660208201526159ff565b60009190565b80549293928015615c3657615bb6615bc391612f8e565b8260005260206000200190565b9182549265ffffffffffff91828516928116808411615b6357879303615c025750615b2492509065ffffffffffff82549181199060301b169116179055565b915050615b5e91615c22615c1461100c565b65ffffffffffff9093168352565b6001600160d01b0386166020830152615a58565b5090615b9991615c47615c1461100c565b6001600160d01b0385166020830152615a58565b6001600160a01b03808316929181811690848203615cf057600082815260086020526040902080546001600160a01b031981166001600160a01b038716179091556107139593169392615cea9285907f3134e8a2e6d97e929a7e54011ea5485d7d196dd5f0ba4d4ef95803e8e3fc257f600080a46001600160a01b031660009081526020819052604090205490565b91615844565b60405162461bcd60e51b815260206004820152601360248201527211195b1959d85d1a5bdb88191a5cd8589b1959606a1b6044820152606490fd5b60405162461bcd60e51b815260206004820152604860248201527f446972656374207472616e73666572732064697361626c65642e20557365206760448201527f6f7665726e616e63652070726f706f73616c7320666f7220746f6b656e20747260648201526730b739b332b9399760c11b608482015260a490fdfedf6966c971051c3d54ec59162606531493a51404a002842f56009d7e5cf4a8c7bb7b4a454dc3493923482f07822329ed19e8244eff582cc204f8554c3620c3fd6d4407e7be21f808e6509aa9fa9143369579dd7d760fe20a2c09680fc146134fc65a7bb8d6351c1cf70c95a316cc6a92839c986682d98bc35f958f4883f9d2a8d7b6990105719101dabeb77144f2a3385c8033acd3af97e9423a695e81ad1eb58d1108e10bcb7c27dddfc02ed9d693a074039d026cf4ea4240b40f7d581ac802a2646970667358221220c599bb658e087751702c65c6d16b9e770d39f64e8630fa12bcd892bf0084c35e64736f6c63430008140033c65a7bb8d6351c1cf70c95a316cc6a92839c986682d98bc35f958f4883f9d2a8dec2bacdd2f05b59de34da9b523dff8be42e5e38e818c82fdb0bae774387a724", - "deployedBytecode": "0x6080604052600436101561001257600080fd5b60003560e01c8063013cf08b146103de57806306fdde03146103d9578063078f6208146103d4578063095ea7b3146103cf5780630c0512e9146103ca5780630d61b519146103c557806318160ddd146103c0578063204c5d1f146103bb57806322dbefbb1461030c57806322f3e2d4146103b657806323b872dd146103b15780632519ae5c146103ac578063313ce567146103a75780633644e515146103a25780633a46b1a8146102d557806347c661401461039d5780634b145793146103075780634bf5d7e9146103985780634cf2ab32146103935780634cfd16bb1461038e5780634de184f6146103845780634fa76ec9146103895780635221c1f014610384578063548d496f1461037f578063587cde1e1461037a5780635c19a95c146103755780635cf0e8a4146103705780636cbadbfa146103705780636dcf811d1461036b5780636fcfff451461036657806370a08231146103615780637ce288ea1461035c5780637e5a9b47146103575780637ecebe00146103525780637f6dda141461034d57806384b0196e1461034857806385e59ce2146103435780638e539e8c1461033e5780639080936f1461033957806391ddadf41461033457806395d89b411461032f57806398e527d31461032a5780639a49bdde146103255780639ab24eb014610320578063a351f6151461031b578063a9059cbb14610316578063adf7420714610311578063b0b6cc1a1461030c578063b3fe8bcb14610307578063c3cda52014610302578063c8a6d06e146102fd578063c97bfe6b146102f8578063c9a3c0c7146102f3578063c9d27afe146102ee578063d505accf146102e9578063dcf628c0146102e4578063dd62ed3e146102df578063e49a62e9146102da578063eaeded5f146102d5578063eced3dfb146102d0578063f1127ed8146102cb5763f2c26a47146102c657600080fd5b612780565b612660565b612642565b61122a565b612624565b6125c1565b612529565b61237f565b612232565b612142565b6120f1565b612069565b611f27565b6112eb565b610f68565b611c27565b611bdb565b611aa3565b611a5a565b611a3c565b611a1e565b611977565b61194b565b611922565b6118f0565b6118b9565b6117f7565b6117c1565b611784565b611756565b6116cb565b61168e565b611621565b6115fe565b6115e0565b6115b8565b611579565b611548565b6114f3565b61152a565b611479565b611406565b61131c565b611255565b611207565b6111eb565b611086565b610fd3565b610f9c565b610e95565b610d70565b610c7a565b610c5c565b610bc4565b610b84565b610aa3565b6109ec565b90600182811c92168015610413575b60208310146103fd57565b634e487b7160e01b600052602260045260246000fd5b91607f16916103f2565b600d546000929161042d826103e3565b80825291600190818116908115610492575060011461044b57505050565b91929350600d600052600080516020615e28833981519152916000925b84841061047a57505060209250010190565b80546020858501810191909152909301928101610468565b915050602093945060ff929192191683830152151560051b010190565b600e54600092916104bf826103e3565b8082529160019081811690811561049257506001146104dd57505050565b91929350600e600052600080516020615dc8833981519152916000925b84841061050c57505060209250010190565b805460208585018101919091529093019281016104fa565b600f5460009291610534826103e3565b80825291600190818116908115610492575060011461055257505050565b91929350600f600052600080516020615e48833981519152916000925b84841061058157505060209250010190565b8054602085850181019190915290930192810161056f565b90600092918054916105aa836103e3565b91828252600193848116908160001461060c57506001146105cc575b50505050565b90919394506000526020928360002092846000945b8386106105f85750505050010190388080806105c6565b8054858701830152940193859082016105e1565b9294505050602093945060ff191683830152151560051b010190388080806105c6565b634e487b7160e01b600052604160045260246000fd5b61012081019081106001600160401b0382111761066157604052565b61062f565b604081019081106001600160401b0382111761066157604052565b60a081019081106001600160401b0382111761066157604052565b60c081019081106001600160401b0382111761066157604052565b90601f801991011681019081106001600160401b0382111761066157604052565b60405190600082600c54916106ec836103e3565b808352926001908181169081156107625750600114610715575b50610713925003836106b7565b565b600c60009081529150600080516020615da88339815191525b8483106107475750610713935050810160200138610706565b81935090816020925483858a0101520191019091859261072e565b90506020925061071394915060ff191682840152151560051b82010138610706565b60405190600082600d5491610798836103e3565b8083529260019081811690811561076257506001146107be5750610713925003836106b7565b600d60009081529150600080516020615e288339815191525b8483106107f05750610713935050810160200138610706565b81935090816020925483858a010152019101909185926107d7565b60405190600082600e549161081f836103e3565b8083529260019081811690811561076257506001146108455750610713925003836106b7565b600e60009081529150600080516020615dc88339815191525b8483106108775750610713935050810160200138610706565b81935090816020925483858a0101520191019091859261085e565b60405190600082600f54916108a6836103e3565b8083529260019081811690811561076257506001146108cc5750610713925003836106b7565b600f60009081529150600080516020615e488339815191525b8483106108fe5750610713935050810160200138610706565b81935090816020925483858a010152019101909185926108e5565b9061071361092d9260405193848092610599565b03836106b7565b60005b8381106109475750506000910152565b8181015183820152602001610937565b9060209161097081518092818552858086019101610934565b601f01601f1916010190565b97936109a56109e1989497936101409b97939e9d9c9e8b526101608060208d01528b0190610957565b60408a0197909752606089015215156080880152151560a087015260c08601526001600160a01b031660e0850152838203610100850152610957565b946101208201520152565b34610a8a576020366003190112610a8a57600435600052601a60205260406000208054610a8660405191610a2e83610a278160018801610599565b03846106b7565b600284015460038501546004860154600587015460068801549397929492936001600160a01b031691610a6360078601610919565b93600a6008870154960154966040519a8b9a60ff808660081c169516938c61097c565b0390f35b600080fd5b906020610aa0928181520190610957565b90565b34610a8a57600080600319360112610b81576040519080600354610ac6816103e3565b80855291600191808316908115610b575750600114610afc575b610a8685610af0818703826106b7565b60405191829182610a8f565b9250600383527fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b5b828410610b3f575050508101602001610af082610a86610ae0565b80546020858701810191909152909301928101610b24565b869550610a8696935060209250610af094915060ff191682840152151560051b8201019293610ae0565b80fd5b34610a8a576000366003190112610a8a576060601554601754601d549060405192835260208301526040820152f35b6001600160a01b03811603610a8a57565b34610a8a576040366003190112610a8a57610be0600435610bb3565b60405162461bcd60e51b815260206004820152604860248201527f44697265637420617070726f76616c732064697361626c65642e20557365206760448201527f6f7665726e616e63652070726f706f73616c7320666f7220746f6b656e20747260648201526730b739b332b9399760c11b608482015260a490fd5b34610a8a576000366003190112610a8a576020601654604051908152f35b34610a8a576020366003190112610a8a577fbadbd87941bb6424ed4aa4719bf01a3319b64480e49f89018c718603239553d260043580600052601a60205260076040600020610ccb83825414613d01565b610d3a60048201610cec610ce7610ce3835460ff1690565b1590565b613d88565b610cfd601754600885015414613f0f565b610d2d610d0986613ea1565b60058601544210801590610d69575b610d2190613f5a565b81610d61575b50613fb6565b805460ff19166001179055565b0190610d4d610d4883610919565b614749565b610d5c60405192839283613ff8565b0390a1005b905038610d27565b5080610d18565b34610a8a576000366003190112610a8a576020600254604051908152f35b90815180825260208092019182818360051b85019501936000915b848310610db95750505050505090565b9091929394958480610dd383856001950387528a51610957565b9801930193019194939290610da9565b610aa090602081528251610e71610e0861012092836020860152610140850190610957565b610e52610e3e610e2a602089015193601f1994858983030160408a0152610957565b604089015184888303016060890152610957565b606088015183878303016080880152610957565b90608087015160a086015260a0870151908583030160c0860152610d8e565b9360c081015160e084015260e0810151906101009182850152015191019015159052565b34610a8a57600080600319360112610b8157610a8690610f5c604051610eba81610645565b60609283825283602083015283604083015283808301528060808301528360a08301528060c08301528060e083015261010080920152610ef8610fff565b92610f016106d8565b8452610f0b610784565b6020850152610f1861080b565b6040850152610f25610892565b908401526010546080840152610f396154ee565b60a084015260125460c084015260135460e084015260145460ff16151590830152565b60405191829182610de3565b34610a8a576020366003190112610a8a576004356000526018602052602060018060a01b0360406000205416604051908152f35b34610a8a576000366003190112610a8a5760ff601e54161580610fc7575b6020906040519015158152f35b5060145460ff16610fba565b34610a8a576060366003190112610a8a57610fef600435610bb3565b610ffa602435610bb3565b615d2b565b6040519061071382610645565b6040519061071382610666565b6001600160401b03811161066157601f01601f191660200190565b92919261104082611019565b9161104e60405193846106b7565b829481845281830111610a8a578281602093846000960137010152565b9080601f83011215610a8a57816020610aa093359101611034565b34610a8a5760a0366003190112610a8a576004356001600160401b038111610a8a576110b690369060040161106b565b606435906044356110c683610bb3565b611181608435916110f36110ee6110e785600052601c602052604060002090565b5460ff1690565b613345565b6111076001600160a01b038616151561530b565b611129611124610ce36110e7846000526019602052604060002090565b615346565b336000908152602081905260409020611145905b5415156132ed565b6040516304fa45bf60e31b602082015260248101919091526001600160a01b03909416604485015283606481015b03601f1981018552846106b7565b601d549261118e84612d77565b9360005b8181106111bc57610a866111ac338887876024358b613b12565b6040519081529081906020820190565b806111d66111cc6111e6936113c4565b90549060031b1c90565b6111e082896139b9565b52613414565b611192565b34610a8a576000366003190112610a8a57602060405160128152f35b34610a8a576000366003190112610a8a576020611222612c0f565b604051908152f35b34610a8a576040366003190112610a8a57602061122260043561124c81610bb3565b60243590612894565b34610a8a576020366003190112610a8a5760043580600052601a602052611283604060002091825414613d01565b60646112ae60018060d01b036112a461129f600a86015461294e565b612fc5565b1660155490613e8e565b04906003600282015491015491828201908183116112e657604080519384526020840194909452928201526060810191909152608090f35b61298f565b34610a8a576020366003190112610a8a576004356000526019602052602060ff604060002054166040519015158152f35b34610a8a576000366003190112610a8a5761133643612f5c565b65ffffffffffff8061134743612f5c565b1691160361139c57610a8660405161135e81610666565b601d81527f6d6f64653d626c6f636b6e756d6265722666726f6d3d64656661756c740000006020820152604051918291602083526020830190610957565b6040516301bfc1c560e61b8152600490fd5b634e487b7160e01b600052603260045260246000fd5b601d548110156113e957601d600052600080516020615de88339815191520190600090565b6113ae565b80548210156113e95760005260206000200190600090565b34610a8a576020366003190112610a8a57600435601d54811015610a8a57602090601d600052600080516020615de88339815191520154604051908152f35b90815180825260208080930193019160005b828110611465575050505090565b835185529381019392810192600101611457565b34610a8a576000366003190112610a8a5760405180601d54808252826020809301601d600052600080516020615de88339815191529260005b858282106114dd575050506114c9925003836106b7565b610a86604051928284938452830190611445565b85548452600195860195889550930192016114b2565b34610a8a576020366003190112610a8a576020611520600435600052601c60205260ff6040600020541690565b6040519015158152f35b34610a8a576000366003190112610a8a576020601554604051908152f35b34610a8a576020366003190112610a8a57600435600052601c602052602060ff604060002054166040519015158152f35b34610a8a576020366003190112610a8a57602060043561159881610bb3565b60018060a01b038091166000526008825260406000205416604051908152f35b34610a8a576020366003190112610a8a576115de6004356115d881610bb3565b33615c5b565b005b34610a8a576000366003190112610a8a576020601754604051908152f35b34610a8a576000366003190112610a8a57602060ff601e54166040519015158152f35b34610a8a576020366003190112610a8a5760043561163e81610bb3565b6001600160a01b031660009081526009602052604090205463ffffffff9081811161166f5760209160405191168152f35b604490604051906306dfcc6560e41b8252602060048301526024820152fd5b34610a8a576020366003190112610a8a5760206112226004356116b081610bb3565b6001600160a01b031660009081526020819052604090205490565b34610a8a576020366003190112610a8a576004356116e881614485565b1561171a5760207f57df5a6a467271f04b10f7fe9e66d21dcd8ae7eaf079099d48959f24a53b691091604051908152a1005b60405162461bcd60e51b81526020600482015260146024820152734e6f7420616c6c20636861696e7320726561647960601b6044820152606490fd5b34610a8a576020366003190112610a8a576040611774600435613ea1565b8251911515825215156020820152f35b34610a8a576020366003190112610a8a576004356117a181610bb3565b60018060a01b031660005260076020526020604060002054604051908152f35b34610a8a576040366003190112610a8a57610a866117e36024356004356155c0565b604051918291602083526020830190611445565b34610a8a576000366003190112610a8a5761188a6118347f0000000000000000000000000000000000000000000000000000000000000000612da9565b610a866118607f0000000000000000000000000000000000000000000000000000000000000000612ea2565b61189861186b612d4f565b91604051958695600f60f81b875260e0602088015260e0870190610957565b908582036040870152610957565b90466060850152306080850152600060a085015283820360c0850152611445565b34610a8a576020366003190112610a8a57602060646118e76001600160d01b036112a461129f60043561294e565b04604051908152f35b34610a8a576020366003190112610a8a5760206001600160d01b0361191961129f60043561294e565b16604051908152f35b34610a8a576020366003190112610a8a576020611940600435615665565b60ff60405191168152f35b34610a8a576000366003190112610a8a57602061196743612f5c565b65ffffffffffff60405191168152f35b34610a8a57600080600319360112610b8157604051908060045461199a816103e3565b80855291600191808316908115610b5757506001146119c357610a8685610af0818703826106b7565b9250600483527f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b5b828410611a06575050508101602001610af082610a86610ae0565b805460208587018101919091529093019281016119eb565b34610a8a576000366003190112610a8a576020601b54604051908152f35b34610a8a576020366003190112610a8a5760206112226004356144ec565b34610a8a576020366003190112610a8a57600435611a7781610bb3565b6001600160a01b031660009081526009602090815260409091206001600160d01b03906119199061325e565b34610a8a576040366003190112610a8a576004356001600160401b03602435818111610a8a5736602382011215610a8a578060040135918211610a8a573660248383010111610a8a57610d5c602492847fc7c129e53e59dadfa16305619e80c7519f1f6912c10915359fd75b56bcecdd7b95600052601a602052611bcd6040600020611b3183825414613d01565b611bbe600a6004830192611b51611b4c610ce3865460ff1690565b61409a565b611b6060058201544210613d4d565b6006810154611b8a90611b83906001600160a01b03165b6001600160a01b031690565b33146140d9565b0154611bb7611b998233612894565b916001600160d01b0390611bb09061129f9061294e565b1691613e78565b1015614116565b805461ff001916610100179055565b60405194859401908461416e565b34610a8a576040366003190112610a8a57610ffa600435610bb3565b9181601f84011215610a8a578235916001600160401b038311610a8a576020808501948460051b010111610a8a57565b34610a8a576060366003190112610a8a576001600160401b03600435602435828111610a8a57611c5b903690600401611bf7565b92604435908111610a8a5783611c7684923690600401611bf7565b611c7e613e55565b611c9284600052601a602052604060002090565b90611c9f85835414613d01565b6004820192611cba611cb5610ce3865460ff1690565b61419c565b60175494611cce60088501548714156141f8565b611ce0611cdb8786615728565b614254565b611ceb838214614297565b611d75876007860197611d6d600a611d028b610919565b6020815191012098015497611d5f896040519485936020850197889094939260809260a08301967f45de75acfcd4cbcc5691559486749bf0d5eb65e4b24c59ac2f258ba6bfceaa3484526020840152604083015260608201520152565b03601f1981018352826106b7565b519020612d29565b9760009889945b838610611e3d575050507fda7dba8f94d70cde423cce3a243bebf95d2ec927507b566f67e329dcfe2d06bb877fbadbd87941bb6424ed4aa4719bf01a3319b64480e49f89018c718603239553d2611e1689611dfd8a610d2d8f611df6611def8e6112a461129f60018060d01b039261294e565b6064900490565b11156143f6565b611e09610d4882610919565b6040519182918583613ff8565b0390a1601754604080519283526020830191909152819081015b0390a16115de6001600b55565b909192939499868b611e79611b77611e74611e6c611e66611e5f868a8f6142d4565b3691611034565b89614442565b938a8a614315565b614325565b6001600160a01b03821690611e8f90821461432f565b8d88886000925b8310611ed2575050505091611eb1611ec292611ec894612894565b90611ebd8215156143aa565b612fb8565b9a613414565b9493929190611d7c565b8394955092611eee611b77611e7485611ef595611efa98614315565b141561436b565b613414565b90899291888f8990611e96565b6064359060ff82168203610a8a57565b6084359060ff82168203610a8a57565b34610a8a5760c0366003190112610a8a57600435611f4481610bb3565b60443590602435611f53611f07565b834211611fdb57611fcf6115de94611fd6926040519060208201927fe48329057bfd03d55e49b547132e39cffd9c1820ad7b9d4c5307691425d15adf845260018060a01b0388166040840152866060840152608083015260808252611fb782610681565b611fca60a4359360843593519020612d29565b612aba565b9182612a64565b615c5b565b604051632341d78760e11b815260048101859052602490fd5b6001600160401b0381116106615760051b60200190565b81601f82011215610a8a5780359161202283611ff4565b9261203060405194856106b7565b808452602092838086019260051b820101928311610a8a578301905b82821061205a575050505090565b8135815290830190830161204c565b34610a8a5760c0366003190112610a8a576001600160401b03600435818111610a8a5761209a90369060040161106b565b90604435818111610a8a5736602382011215610a8a576120c4903690602481600401359101611034565b608435918211610a8a57610a86926120e36111ac93369060040161200b565b916064359160243590613387565b34610a8a576020366003190112610a8a57600435601b54811015610a8a57602090601b6000527f3ad8aa4f87544323a9d1e5dd902f40c356527a7955687113db5f9a85ad579dc10154604051908152f35b34610a8a576080366003190112610a8a576004356001600160401b038111610a8a5761217561117391369060040161106b565b6044356121f2606435916121996110ee6110e785600052601c602052604060002090565b6121b86121b36110e7836000526019602052604060002090565b61538a565b3360009081526020819052604090206121d09061113d565b604051633972e9fb60e21b602082015260248101919091529384906044820190565b601d54926121ff84612d77565b9360005b81811061221d57610a866111ac338887876024358b613b12565b806111d66111cc61222d936113c4565b612203565b34610a8a576040366003190112610a8a576004356024358015158103610a8a577f78975aaf742630489badd22949b88ac50eaaea576339ee05440b671a33bfb6a99161227c613e55565b611e3061229382600052601a602052604060002090565b61229f83825414613d01565b6122ae60058201544210613d4d565b6122c2610ce7610ce3600484015460ff1690565b600b8101906122f16122ec610ce36110e733869060018060a01b0316600052602052604060002090565b613dd4565b612302601754600883015414613e10565b61232a610d2d612316600a84015433612894565b336000908152602095909552604090942090565b841561236a5760020161233e828254612fb8565b90555b604080519384523360208501529315159383019390935260608201929092529081906080820190565b600301612378828254612fb8565b9055612341565b34610a8a5760e0366003190112610a8a5760043561239c81610bb3565b6024356123a881610bb3565b604435906064356123b7611f17565b8142116124a2576001600160a01b0385811660008181526007602090815260409182902080546001810190915582517f6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c99281019283529283019390935292861660608201526080810187905260a081019190915260c08082019490945292835261245b92909161244860e0836106b7565b611fca60c4359360a43593519020612d29565b6001600160a01b038481169082160361247857506115de926129a5565b6040516325c0072360e11b81526001600160a01b0391821660048201529084166024820152604490fd5b60405163313c898160e11b815260048101839052602490fd5b9794916124e090610aa09c9a97949b9895928a526101608060208c01528a0190610957565b604089019a909a52606088015215156080870152151560a086015260c08501526001600160a01b031660e084015261010083015261012082015280830361014090910152611445565b34610a8a576020366003190112610a8a5760043580600052601a60205260406000206125588154928314613d01565b610a8660028201549260038301549060048401546005850154612584600687015460018060a01b031690565b90600887015492600a880154946125a960096125a260018c01610919565b9a01615571565b966040519a8b9a60ff808660081c169516938c6124bb565b34610a8a576040366003190112610a8a57602061261b6004356125e381610bb3565b602435906125f082610bb3565b60018060a01b03166000526001835260406000209060018060a01b0316600052602052604060002090565b54604051908152f35b34610a8a576020366003190112610a8a576020611520600435614485565b34610a8a576000366003190112610a8a576020601d54604051908152f35b34610a8a576040366003190112610a8a5760043561267d81610bb3565b6024359063ffffffff82168203610a8a57610a86916126cd9161269e612a4b565b506126a7612a4b565b506001600160a01b031660009081526009602052604090206126c7612a4b565b506113ee565b50604051906126db82610666565b5465ffffffffffff811680835260309190911c60209283019081526040805192835290516001600160d01b031692820192909252918291820190565b96939060e0969361274d6127699461273f61275b949d9c999d8c6101008091528d0190610957565b908b820360208d0152610957565b9089820360408b0152610957565b908782036060890152610957565b96608086015260a085015260c08401521515910152565b34610a8a57600080600319360112610b8157604051908181600c546127a4816103e3565b808452936001918083169081156128705750600114612825575b50506127cc925003826106b7565b604051906127dd8261092d8161041d565b610a866040516127f7816127f0816104af565b03826106b7565b604051612807816127f081610524565b601054601254906013549260ff601454169460405198899889612717565b9150600c8252600080516020615da88339815191525b84831061285557506127cc935050810160200138806127be565b8193509081602092548385890101520191019091849261283b565b915050602092506127cc94915060ff191682840152151560051b82010138806127be565b6001600160a01b0316600090815260096020526040812090916128b69061294e565b815490838291600584116128ff575b6128d093508461328c565b806128e45750505b6001600160d01b031690565b916128f160209293612f8e565b92815220015460301c6128d8565b919261290a816130e9565b81039081116112e6576128d09385875265ffffffffffff808360208a200154169085161060001461293c5750916128c5565b92915061294890612faa565b906128c5565b65ffffffffffff61295e43612f5c565b16808210156129715750610aa090612f5c565b6044925060405191637669fc0f60e11b835260048301526024820152fd5b634e487b7160e01b600052601160045260246000fd5b90916001600160a01b03918216918215612a32578316928315612a1957817f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92592612a0f602093866000526001855260406000209060018060a01b0316600052602052604060002090565b55604051908152a3565b604051634a1406b160e11b815260006004820152602490fd5b60405163e602df0560e01b815260006004820152602490fd5b60405190612a5882610666565b60006020838281520152565b6001600160a01b03811660009081526007602052604090208054600181019091559091819003612a92575050565b6040516301d4b62360e61b81526001600160a01b039092166004830152602482015260449150fd5b91610aa09391612ac993612ad2565b90929192612b82565b91907f7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a08411612b5657926020929160ff608095604051948552168484015260408301526060820152600092839182805260015afa15612b4a5780516001600160a01b03811615612b4157918190565b50809160019190565b604051903d90823e3d90fd5b50505060009160039190565b60041115612b6c57565b634e487b7160e01b600052602160045260246000fd5b612b8b81612b62565b80612b94575050565b612b9d81612b62565b60018103612bb75760405163f645eedf60e01b8152600490fd5b612bc081612b62565b60028103612be15760405163fce698f760e01b815260048101839052602490fd5b80612bed600392612b62565b14612bf55750565b6040516335e2f38360e21b81526004810191909152602490fd5b307f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03161480612d00575b15612c6a577f000000000000000000000000000000000000000000000000000000000000000090565b60405160208101907f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f82527f000000000000000000000000000000000000000000000000000000000000000060408201527f000000000000000000000000000000000000000000000000000000000000000060608201524660808201523060a082015260a08152612cfa8161069c565b51902090565b507f00000000000000000000000000000000000000000000000000000000000000004614612c41565b604290612d34612c0f565b906040519161190160f01b8352600283015260228201522090565b604051602081018181106001600160401b038211176106615760405260008152906000368137565b90612d8182611ff4565b612d8e60405191826106b7565b8281528092612d9f601f1991611ff4565b0190602036910137565b60ff8114612de75760ff811690601f8211612dd55760405191612dcb83610666565b8252602082015290565b604051632cd44ac360e21b8152600490fd5b50604051600554816000612dfa836103e3565b80835292600190818116908115612e805750600114612e21575b50610aa0925003826106b7565b6005600090815291507f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db05b848310612e655750610aa0935050810160200138612e14565b81935090816020925483858901015201910190918492612e4c565b905060209250610aa094915060ff191682840152151560051b82010138612e14565b60ff8114612ec45760ff811690601f8211612dd55760405191612dcb83610666565b50604051600654816000612ed7836103e3565b80835292600190818116908115612e805750600114612efd5750610aa0925003826106b7565b6006600090815291507ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f5b848310612f415750610aa0935050810160200138612e14565b81935090816020925483858901015201910190918492612f28565b65ffffffffffff90818111612f6f571690565b604490604051906306dfcc6560e41b8252603060048301526024820152fd5b6000198101919082116112e657565b919082039182116112e657565b90600182018092116112e657565b919082018092116112e657565b600a805460008160058111613073575b509290925b8381106130195750506000918015600014612ff757505050600090565b61300090612f8e565b9152600080516020615e08833981519152015460301c90565b90928082169080831860011c82018092116112e6578360005265ffffffffffff8083600080516020615e08833981519152015416908616106000146130615750925b90612fda565b93915061306d90612faa565b9061305b565b909161307e826130e9565b82039182116112e65783835265ffffffffffff8083600080516020615e08833981519152015416908616106000146130b95750905b38612fd5565b91506130c490612faa565b6130b3565b81156130d3570490565b634e487b7160e01b600052601260045260246000fd5b6001811115610aa057600181600160801b811015613202575b6131aa6131a061319661318c6131826131786131b697600488600160401b6131b19a10156131f5575b6401000000008110156131e8575b620100008110156131db575b6101008110156131cf575b60108110156131c3575b10156131bb575b60030260011c613171818b6130c9565b0160011c90565b613171818a6130c9565b61317181896130c9565b61317181886130c9565b61317181876130c9565b61317181866130c9565b80936130c9565b821190565b900390565b60011b613161565b811c9160021b9161315a565b60081c91811b91613150565b60101c9160081b91613145565b60201c9160101b91613139565b60401c9160201b9161312b565b50600160401b9050608082901c613102565b600a5460009080613226575050600090565b806000198101116112e657600a7fc65a7bb8d6351c1cf70c95a316cc6a92839c986682d98bc35f958f4883f9d2a79252015460301c90565b80546000918161327057505050600090565b6000199282848101116112e65760209181522001015460301c90565b91905b83821061329c5750505090565b9091928083169080841860011c82018092116112e65760008581526020902082015465ffffffffffff90811690841610156132db5750925b919061328f565b9392506132e790612faa565b916132d4565b156132f457565b60405162461bcd60e51b815260206004820152602360248201527f4d75737420686f6c6420746f6b656e7320746f206372656174652070726f706f6044820152621cd85b60ea1b6064820152608490fd5b1561334c57565b60405162461bcd60e51b815260206004820152601360248201527210da185a5b881b9bdd081cdd5c1c1bdc9d1959606a1b6044820152606490fd5b929093913360005260006020526133a460406000205415156132ed565b84156133cf57610aa09482600052601c6020526133c860ff60406000205416613345565b3394613b12565b60405162461bcd60e51b815260206004820152601960248201527f4475726174696f6e206d75737420626520706f736974697665000000000000006044820152606490fd5b60001981146112e65760010190565b81811061342e575050565b60008155600101613423565b90601f8211613447575050565b61071391600c600052600080516020615da8833981519152906020601f840160051c8301931061347f575b601f0160051c0190613423565b9091508190613472565b90601f8211613496575050565b61071391600d600052600080516020615e28833981519152906020601f840160051c8301931061347f57601f0160051c0190613423565b90601f82116134da575050565b61071391600e600052600080516020615dc8833981519152906020601f840160051c8301931061347f57601f0160051c0190613423565b90601f821161351e575050565b61071391600f600052600080516020615e48833981519152906020601f840160051c8301931061347f57601f0160051c0190613423565b9190601f811161356457505050565b610713926000526020600020906020601f840160051c8301931061347f57601f0160051c0190613423565b9081516001600160401b038111610661576135b4816135af600c546103e3565b61343a565b602080601f83116001146135f057508192936000926135e5575b50508160011b916000199060031b1c191617600c55565b0151905038806135ce565b90601f19831694613611600c600052600080516020615da883398151915290565b926000905b87821061364e575050836001959610613635575b505050811b01600c55565b015160001960f88460031b161c1916905538808061362a565b80600185968294968601518155019501930190613616565b9081516001600160401b0381116106615761368b81613686600d546103e3565b613489565b602080601f83116001146136c757508192936000926136bc575b50508160011b916000199060031b1c191617600d55565b0151905038806136a5565b90601f198316946136e8600d600052600080516020615e2883398151915290565b926000905b87821061372557505083600195961061370c575b505050811b01600d55565b015160001960f88460031b161c19169055388080613701565b806001859682949686015181550195019301906136ed565b9081516001600160401b038111610661576137628161375d600e546103e3565b6134cd565b602080601f831160011461379e5750819293600092613793575b50508160011b916000199060031b1c191617600e55565b01519050388061377c565b90601f198316946137bf600e600052600080516020615dc883398151915290565b926000905b8782106137fc5750508360019596106137e3575b505050811b01600e55565b015160001960f88460031b161c191690553880806137d8565b806001859682949686015181550195019301906137c4565b9081516001600160401b0381116106615761383981613834600f546103e3565b613511565b602080601f8311600114613875575081929360009261386a575b50508160011b916000199060031b1c191617600f55565b015190503880613853565b90601f19831694613896600f600052600080516020615e4883398151915290565b926000905b8782106138d35750508360019596106138ba575b505050811b01600f55565b015160001960f88460031b161c191690553880806138af565b8060018596829496860151815501950193019061389b565b91909182516001600160401b038111610661576139128161390c84546103e3565b84613555565b602080601f831160011461394e575081929394600092613943575b50508160011b916000199060031b1c1916179055565b01519050388061392d565b90601f1983169561396485600052602060002090565b926000905b8882106139a157505083600195969710613988575b505050811b019055565b015160001960f88460031b161c1916905538808061397e565b80600185968294968601518155019501930190613969565b80518210156113e95760209160051b010190565b156139d457565b60405162461bcd60e51b815260206004820152601a60248201527f54617267657420636861696e206e6f7420737570706f727465640000000000006044820152606490fd5b601b54600160401b811015610661576001810180601b558110156113e957601b6000527f3ad8aa4f87544323a9d1e5dd902f40c356527a7955687113db5f9a85ad579dc10155565b601d54600160401b811015610661576001810180601d558110156113e957601d600052600080516020615de88339815191520155565b90815491600160401b8310156106615782613aba916001610713950181556113ee565b90919082549060031b91821b91600019901b1916179055565b9081526001600160a01b039091166020820152606060408201819052610aa092910190610957565b604090610aa0939281528160208201520190611445565b91949060165495613b2a613b2588613414565b601655565b613ba7613b4188600052601a602052604060002090565b91888355613b7c600194613b57888787016138eb565b6000600286015560006003860155613b766004860160ff198154169055565b42612fb8565b60058401556006830180546001600160a01b0319166001600160a01b038716179055600783016138eb565b846008820155613bc4613bb943612f5c565b65ffffffffffff1690565b80613cf05750819060005b600a820155600960009101925b613c9b575b505050613c85613c95937f7585f467599d0f008985f231af99293be388626ac16ca59505c2f8f88969cd637f5d1231ca3a274bcd2f510e0d53a889213ebf0315b86ee6bb9d73da08fba7460696947fdb17271edb72bcaba16ce918d885db2e701491c9ff3f713f80caf9d614aa9ff494613c5a8a613a19565b613c6a6040519283928c84613ad3565b0390a160408051888152602081019290925290918291820190565b0390a16040519182918583613afb565b0390a190565b8651811015613ceb5780613cd1613ccc6110e7613cbb613ce5958c6139b9565b51600052601c602052604060002090565b6139cd565b611ef5613cde828a6139b9565b5185613a97565b81613bdc565b613be1565b613cf990612f8e565b908291613bcf565b15613d0857565b60405162461bcd60e51b815260206004820152601760248201527f50726f706f73616c20646f6573206e6f742065786973740000000000000000006044820152606490fd5b15613d5457565b60405162461bcd60e51b815260206004820152600c60248201526b159bdd1a5b99c8195b99195960a21b6044820152606490fd5b15613d8f57565b60405162461bcd60e51b815260206004820152601960248201527f50726f706f73616c20616c7265616479206578656375746564000000000000006044820152606490fd5b15613ddb57565b60405162461bcd60e51b815260206004820152600d60248201526c105b1c9958591e481d9bdd1959609a1b6044820152606490fd5b15613e1757565b60405162461bcd60e51b815260206004820152601660248201527557726f6e6720636861696e20666f7220766f74696e6760501b6044820152606490fd5b6002600b5414613e66576002600b55565b604051633ee5aeb560e01b8152600490fd5b90600a820291808304600a14901517156112e657565b818102929181159184041417156112e657565b9081600052601a602052613ebc604060002092835414613d01565b6002820154600383015492838201908183116112e657600a0154606490613ef3906001600160d01b03906112a49061129f9061294e565b04111592839182613f05575b50509190565b1190503880613eff565b15613f1657565b606460405162461bcd60e51b815260206004820152602060248201527f45786563757465206f6e6c7920696e20676f7665726e616e636520636861696e6044820152fd5b15613f6157565b60405162461bcd60e51b815260206004820152602760248201527f566f74696e67206e6f7420656e64656420616e642071756f72756d206e6f74206044820152661c995858da195960ca1b6064820152608490fd5b15613fbd57565b60405162461bcd60e51b8152602060048201526013602482015272141c9bdc1bdcd85b081b9bdd081c185cdcd959606a1b6044820152606490fd5b919082526020916040838201526000928254614013816103e3565b938460408501526001918281169081600014614075575060011461403a575b505050505090565b6000908152828120949550935b858510614061575050506060925001013880808080614032565b805485850160600152938201938101614047565b93505050506060935060ff929192191683830152151560051b01013880808080614032565b156140a157565b60405162461bcd60e51b815260206004820152601060248201526f105b1c9958591e48195e1958dd5d195960821b6044820152606490fd5b156140e057565b60405162461bcd60e51b815260206004820152600e60248201526d27b7363c9034b734ba34b0ba37b960911b6044820152606490fd5b1561411d57565b60405162461bcd60e51b815260206004820152602360248201527f496e73756666696369656e7420766f74696e6720706f77657220746f2063616e60448201526218d95b60ea1b6064820152608490fd5b91926060938192845260406020850152816040850152848401376000828201840152601f01601f1916010190565b156141a357565b60405162461bcd60e51b815260206004820152602760248201527f50726f706f73616c20616c726561647920657865637574656420696e20746869604482015266399031b430b4b760c91b6064820152608490fd5b156141ff57565b60405162461bcd60e51b815260206004820152602760248201527f557365206578656375746550726f706f73616c20696e20676f7665726e616e63604482015266329031b430b4b760c91b6064820152608490fd5b1561425b57565b60405162461bcd60e51b8152602060048201526014602482015273436861696e206e6f7420696e207461726765747360601b6044820152606490fd5b1561429e57565b60405162461bcd60e51b815260206004820152600e60248201526d426164207369676e61747572657360901b6044820152606490fd5b91908110156113e95760051b81013590601e1981360301821215610a8a5701908135916001600160401b038311610a8a576020018236038113610a8a579190565b91908110156113e95760051b0190565b35610aa081610bb3565b1561433657565b60405162461bcd60e51b815260206004820152600d60248201526c426164207369676e617475726560981b6044820152606490fd5b1561437257565b60405162461bcd60e51b815260206004820152601060248201526f223ab83634b1b0ba329039b4b3b732b960811b6044820152606490fd5b156143b157565b60405162461bcd60e51b815260206004820152601b60248201527f4e6f20766f74696e6720706f77657220617420736e617073686f7400000000006044820152606490fd5b156143fd57565b60405162461bcd60e51b815260206004820152601a60248201527f51756f72756d206e6f74207265616368656420627920736967730000000000006044820152606490fd5b8151610aa092612ac992604019830161447a5761447392506020820151906060604084015193015160001a90612ad2565b9192909190565b505060009160029190565b61449e600091808352601a602052604083205414613d01565b80601d54915b8281106144b357505050600190565b6144d36144bf826144ec565b600052601c60205260ff6040600020541690565b156144e6576144e190613414565b6144a4565b50905090565b601d5481101561450f57601d600052600080516020615de8833981519152015490565b60405162461bcd60e51b8152602060048201526013602482015272092dcecc2d8d2c840c6d0c2d2dc40d2dcc8caf606b1b6044820152606490fd5b9092919261455781611019565b9161456560405193846106b7565b829482845282820111610a8a576020610713930190610934565b9190604083820312610a8a5782516001600160e01b031981168103610a8a57926020810151906001600160401b038211610a8a57019080601f83011215610a8a578151610aa09260200161454a565b9190826040910312610a8a57602082516145e781610bb3565b92015190565b90816020910312610a8a575190565b9190826040910312610a8a5760208251920151610aa081610bb3565b9080601f83011215610a8a578151610aa09260200161454a565b9080601f83011215610a8a5781519061464a82611ff4565b9261465860405194856106b7565b828452602092838086019160051b83010192808411610a8a57848301915b8483106146865750505050505090565b82516001600160401b038111610a8a5786916146a784848094890101614618565b815201920191614676565b909160e082840312610a8a578151926001600160401b0393848111610a8a57816146dd918501614618565b936020840151818111610a8a57826146f6918601614618565b936040810151828111610a8a578361470f918301614618565b936060820151838111610a8a5784614728918401614618565b9360808301519360a0840151908111610a8a5760c0916145e7918501614632565b61475d60209182808251830101910161457f565b91906001600160e01b0319166364ba33f760e11b81036147995750818161478d92610713945183010191016146b2565b95949094939193614e8a565b63f0f9e6b760e01b81036147c2575081816147bd92610713945183010191016145ed565b614f74565b632ab43f7f60e11b81036147eb575081816147e692610713945183010191016145ed565b615014565b6304fa45bf60e31b810361481e5750818161480f92610713945183010191016145fc565b6001600160a01b0316906153ce565b633972e9fb60e21b81036148475750818161484292610713945183010191016145ed565b61547e565b63093f734560e31b81036148705750818161486b92610713945183010191016145ed565b614916565b633e78500160e21b81036148995750818161489492610713945183010191016145ed565b614ab1565b63177dcde960e01b81036148cc575081816148bd92610713945183010191016145ce565b906001600160a01b03166150fa565b633cdb568760e11b14915061071390505760405162461bcd60e51b81526020600482015260116024820152702ab735b737bbb71037b832b930ba34b7b760791b6044820152606490fd5b80600052601c60205260ff604060002054166149c457601754811461497f5761497a81614971610d2d7fbba9d55e9fd1a441b1617724e2fdb76777d15ec77ab2b72ac15952cbe97085db94600052601c602052604060002090565b6111ac81613a61565b0390a1565b60405162461bcd60e51b815260206004820152601860248201527f43616e6e6f74206164642063757272656e7420636861696e00000000000000006044820152606490fd5b60405162461bcd60e51b815260206004820152601760248201527f436861696e20616c726561647920737570706f727465640000000000000000006044820152606490fd5b15614a1057565b60405162461bcd60e51b815260206004820152601b60248201527f43616e6e6f742072656d6f76652063757272656e7420636861696e00000000006044820152606490fd5b601d548015614a9b57600019810190808210156113e9577f6d4407e7be21f808e6509aa9fa9143369579dd7d760fe20a2c09680fc146134e600091601d83520155601d55565b634e487b7160e01b600052603160045260246000fd5b614ad160ff614aca83600052601c602052604060002090565b5416613345565b614adf601754821415614a09565b614b00614af682600052601c602052604060002090565b805460ff19169055565b60005b601d5480821015614b7d5782614b1b6111cc846113c4565b14614b2f5750614b2a90613414565b614b03565b91614b7561497a92613aba614b6f6111cc614b6a7f11a9d1a77f76361ed131c19b1dc5758504c51dbde2e49fc973a0ef9577ad13d598612f8e565b6113c4565b916113c4565b6111ac614a55565b505061497a7f11a9d1a77f76361ed131c19b1dc5758504c51dbde2e49fc973a0ef9577ad13d5916111ac565b15614bb057565b60405162461bcd60e51b815260206004820152601660248201527553796d626f6c2063616e6e6f7420626520656d70747960501b6044820152606490fd5b15614bf557565b60405162461bcd60e51b815260206004820152601860248201527f4c6f636174696f6e2063616e6e6f7420626520656d70747900000000000000006044820152606490fd5b15614c4157565b60405162461bcd60e51b815260206004820152601460248201527324b73b30b634b210353ab934b9b234b1ba34b7b760611b6044820152606490fd5b15614c8457565b60405162461bcd60e51b815260206004820152600b60248201526a0496e76616c6964204b50560ac1b6044820152606490fd5b805190600160401b82116106615760115482601155808310614d2f575b5060116000526020908101907f31ecc21a745e3968a04e9570e4425bc18fa8019c68028196b546d1669c200c686000925b848410614d13575050505050565b60018382614d23839451866138eb565b01920193019290614d05565b600060118152837f31ecc21a745e3968a04e9570e4425bc18fa8019c68028196b546d1669c200c6892830192015b828110614d6b575050614cd4565b80614d78600192546103e3565b80614d85575b5001614d5d565b601f908181118414614d9d5750508281555b38614d7e565b83614dbf92614db185600052602060002090565b920160051c82019101613423565b60008181526020812081835555614d97565b9796959390614e1f9293614e03614df3614e119360e08d5260e08d0190610957565b6020968c88818403910152610957565b908a820360408c0152610957565b9088820360608a0152610957565b92608087015285830360a08701528151908184528084019381808460051b8301019401946000915b848310614e5c57505050505060c09150930152565b90919293948480614e79600193601f198682030187528a51610957565b980193019301919594939290614e47565b9395919295949094845115614f38577f7ea9c3d75799a3cd5cdec3738a5a177d47693f37db1400ed10dcbd88e946e7b09661497a94614ecb88511515614ba9565b614ed781511515614bee565b614ee2831515614c3a565b614eed851515614c7d565b614ef68761358f565b614eff88613666565b614f088161373d565b614f1182613814565b614f1a83601055565b614f2384614cb7565b614f2c85601255565b60405197889788614dd1565b60405162461bcd60e51b81526020600482015260146024820152734e616d652063616e6e6f7420626520656d70747960601b6044820152606490fd5b80151580615009575b15614fc45760158054908290556040805191825260208201929092527fd0198ea88bf9c4ad5317b68e697944e524541fcb494d854f095b1cd88a097ab6918190810161497a565b60405162461bcd60e51b815260206004820152601960248201527f496e76616c69642071756f72756d2070657263656e74616765000000000000006044820152606490fd5b506064811115614f7d565b80600052601c60205261502e60ff60406000205416613345565b601754908181146150795760178190556040805192835260208301919091527f979103c7afbf0138fe781172504ceb318ff78f9a420de8cabac8141f0121b52191908190810161497a565b60405162461bcd60e51b815260206004820152600d60248201526c14d85b594818da185a5b881251609a1b6044820152606490fd5b156150b557565b60405162461bcd60e51b815260206004820152601860248201527f496e73756666696369656e7420444c452062616c616e636500000000000000006044820152606490fd5b6001600160a01b038116919082156151b457811561516f57816111ac8161516a936151647f60fa5854360cb5191bf1cd5e60e12730f045ba03e89460f03cc47d6969f0649f9661515c3060018060a01b03166000526000602052604060002090565b5410156150ae565b306151f9565b0390a2565b60405162461bcd60e51b815260206004820152601760248201527f416d6f756e74206d75737420626520706f7369746976650000000000000000006044820152606490fd5b60405162461bcd60e51b815260206004820152601f60248201527f43616e6e6f74207472616e7366657220746f207a65726f2061646472657373006044820152606490fd5b6001600160a01b03808216949392919085156152f257821680156152d9576001600160a01b038216600090815260208190526040902054958487106152aa578461071396970361525b8460018060a01b03166000526000602052604060002090565b556001600160a01b0384166000908152602081815260409182902080548801905590518681527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9190a3615773565b60405163391434e360e21b81526001600160a01b03841660048201526024810188905260448101869052606490fd5b60405163ec442f0560e01b815260006004820152602490fd5b604051634b637e8f60e11b815260006004820152602490fd5b1561531257565b60405162461bcd60e51b815260206004820152600c60248201526b5a65726f206164647265737360a01b6044820152606490fd5b1561534d57565b60405162461bcd60e51b81526020600482015260156024820152744d6f64756c6520616c72656164792065786973747360581b6044820152606490fd5b1561539157565b60405162461bcd60e51b8152602060048201526015602482015274135bd91d5b1948191bd95cc81b9bdd08195e1a5cdd605a1b6044820152606490fd5b7ff14475b19484bf096265507cc0c41cd3bf1994992088806830686e2d7272271991906154056001600160a01b038316151561530b565b80600052601960205261542060ff6040600020541615615346565b600081815260186020526040902080546001600160a01b0319166001600160a01b0384161790556019602090815260406000819020805460ff1916600117905580519283526001600160a01b0390931690820152908190810161497a565b60207f4c7c76abe482a2c36ea52f1b999474c69f8b4afeeac5635f8aea2526864ba8539180600052601982526154bb60ff6040600020541661538a565b600081815260188352604080822080546001600160a01b03191690556019845290819020805460ff1916905551908152a1565b601154906154fb82611ff4565b91604061550a815194856106b7565b8184528360208091019160116000527f31ecc21a745e3968a04e9570e4425bc18fa8019c68028196b546d1669c200c68906000935b85851061554e57505050505050565b60018481928451615563816127f0818a610599565b81520193019401939161553f565b9060405191828154918282526020928383019160005283600020936000905b8282106155a657505050610713925003836106b7565b855484526001958601958895509381019390910190615590565b601b9081549283821015615659578101918282116112e657838311615651575b8183038381116112e6576155f390612d77565b93825b84811061560557505050505090565b818110156113e95761564c9083600052807f3ad8aa4f87544323a9d1e5dd902f40c356527a7955687113db5f9a85ad579dc101546111e06156468784612f9d565b896139b9565b6155f6565b8392506155e0565b50505050610aa0612d4f565b61567981600052601a602052604060002090565b61568582825414613d01565b600481015460ff8160081c166157205760ff16615719576156a7600592613ea1565b92909101544210918215928280615712575b615709578291826156f0575b50506156e957816156e0575b506156db57600090565b600290565b905015386156d1565b5050600190565b84925090615701575b5038806156c5565b9050386156f9565b50505050600590565b50816156b9565b5050600390565b505050600490565b9060005b60098301805482101561576a576157448284926113ee565b90549060031b1c146157625761575b600991613414565b905061572c565b505050600190565b50505050600090565b6001600160a01b039081169291819084156157ff575b169081156157b7575b6107139360005260086020528060406000205416916000526040600020541690615844565b6157c0836159cc565b936157ca43612f5c565b6001600160d01b039586806157dd613214565b16911690039586116112e657610713956157f691615ab6565b50509350615792565b905061580a836159cc565b9061581443612f5c565b6001600160d01b03928380615827613214565b169116019283116112e657839261583d91615ab6565b5050615789565b6001600160a01b0380831693929190811690818514158061598d575b61586c575b5050505050565b816158f1575b505082615881575b8080615865565b6001600160a01b031660009081526009602052604090207fdec2bacdd2f05b59de34da9b523dff8be42e5e38e818c82fdb0bae774387a724916158ce916158c890916159cc565b90615996565b604080516001600160d01b039384168152919092166020820152a238808061587a565b6001600160a01b03166000908152600960205260409020615911846159cc565b61591a43612f5c565b6001600160d01b0391828061592e8661325e565b1691169003928284116112e6577fdec2bacdd2f05b59de34da9b523dff8be42e5e38e818c82fdb0bae774387a724936159839261596a92615b9f565b6040805192851683529316602082015291829190820190565b0390a23880615872565b50831515615860565b906159a043612f5c565b6001600160d01b039182806159b48661325e565b169116019182116112e6576159c892615b9f565b9091565b6001600160d01b03908181116159e0571690565b604490604051906306dfcc6560e41b825260d060048301526024820152fd5b600a5490600160401b821015610661576001820180600a558210156113e957600a600052805160209091015160301b65ffffffffffff191665ffffffffffff9190911617600080516020615e0883398151915290910155565b8054600160401b81101561066157615a75916001820181556113ee565b615aa057815160209092015160301b65ffffffffffff191665ffffffffffff92909216919091179055565b634e487b7160e01b600052600060045260246000fd5b600a549192918015615b7557615ace615ae691612f8e565b600a600052600080516020615e088339815191520190565b9081549165ffffffffffff90818416918316808311615b6357869203615b2b57615b2492509065ffffffffffff82549181199060301b169116179055565b60301c9190565b5050615b5e90615b4a615b3c61100c565b65ffffffffffff9092168252565b6001600160d01b03851660208201526159ff565b615b24565b604051632520601d60e01b8152600490fd5b50615b9990615b85615b3c61100c565b6001600160d01b03841660208201526159ff565b60009190565b80549293928015615c3657615bb6615bc391612f8e565b8260005260206000200190565b9182549265ffffffffffff91828516928116808411615b6357879303615c025750615b2492509065ffffffffffff82549181199060301b169116179055565b915050615b5e91615c22615c1461100c565b65ffffffffffff9093168352565b6001600160d01b0386166020830152615a58565b5090615b9991615c47615c1461100c565b6001600160d01b0385166020830152615a58565b6001600160a01b03808316929181811690848203615cf057600082815260086020526040902080546001600160a01b031981166001600160a01b038716179091556107139593169392615cea9285907f3134e8a2e6d97e929a7e54011ea5485d7d196dd5f0ba4d4ef95803e8e3fc257f600080a46001600160a01b031660009081526020819052604090205490565b91615844565b60405162461bcd60e51b815260206004820152601360248201527211195b1959d85d1a5bdb88191a5cd8589b1959606a1b6044820152606490fd5b60405162461bcd60e51b815260206004820152604860248201527f446972656374207472616e73666572732064697361626c65642e20557365206760448201527f6f7665726e616e63652070726f706f73616c7320666f7220746f6b656e20747260648201526730b739b332b9399760c11b608482015260a490fdfedf6966c971051c3d54ec59162606531493a51404a002842f56009d7e5cf4a8c7bb7b4a454dc3493923482f07822329ed19e8244eff582cc204f8554c3620c3fd6d4407e7be21f808e6509aa9fa9143369579dd7d760fe20a2c09680fc146134fc65a7bb8d6351c1cf70c95a316cc6a92839c986682d98bc35f958f4883f9d2a8d7b6990105719101dabeb77144f2a3385c8033acd3af97e9423a695e81ad1eb58d1108e10bcb7c27dddfc02ed9d693a074039d026cf4ea4240b40f7d581ac802a2646970667358221220c599bb658e087751702c65c6d16b9e770d39f64e8630fa12bcd892bf0084c35e64736f6c63430008140033", - "linkReferences": {}, - "deployedLinkReferences": {} -} diff --git a/backend/cache/solidity-files-cache.json b/backend/cache/solidity-files-cache.json deleted file mode 100644 index 6703a89..0000000 --- a/backend/cache/solidity-files-cache.json +++ /dev/null @@ -1,1137 +0,0 @@ -{ - "_format": "hh-sol-cache-2", - "files": { - "/home/alex/Digital_Legal_Entity(DLE)/backend/contracts/DLE.sol": { - "lastModificationDate": 1756115917209, - "contentHash": "47d6b51ed0025b36c50649b175745512", - "sourceName": "contracts/DLE.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [ - "@openzeppelin/contracts/token/ERC20/ERC20.sol", - "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol", - "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol", - "@openzeppelin/contracts/utils/ReentrancyGuard.sol", - "@openzeppelin/contracts/utils/cryptography/ECDSA.sol" - ], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "DLE" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/utils/ReentrancyGuard.sol": { - "lastModificationDate": 1754306760451, - "contentHash": "190613e556d509d9e9a0ea43dc5d891d", - "sourceName": "@openzeppelin/contracts/utils/ReentrancyGuard.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "ReentrancyGuard" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol": { - "lastModificationDate": 1754306764456, - "contentHash": "227a6eb2225701c12d9c959b758b6333", - "sourceName": "@openzeppelin/contracts/token/ERC20/ERC20.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [ - "./IERC20.sol", - "./extensions/IERC20Metadata.sol", - "../../utils/Context.sol", - "../../interfaces/draft-IERC6093.sol" - ], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "ERC20" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/utils/Context.sol": { - "lastModificationDate": 1754306760451, - "contentHash": "67bfbc07588eb8683b3fd8f6f909563e", - "sourceName": "@openzeppelin/contracts/utils/Context.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "Context" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/interfaces/draft-IERC6093.sol": { - "lastModificationDate": 1754306760460, - "contentHash": "267d92fe4de67b1bdb3302c08f387dbf", - "sourceName": "@openzeppelin/contracts/interfaces/draft-IERC6093.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "IERC1155Errors", - "IERC20Errors", - "IERC721Errors" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/token/ERC20/IERC20.sol": { - "lastModificationDate": 1754306764456, - "contentHash": "8f19f64d2adadf448840908bbaf431c8", - "sourceName": "@openzeppelin/contracts/token/ERC20/IERC20.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "IERC20" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol": { - "lastModificationDate": 1754306768254, - "contentHash": "794db3115001aa372c79326fcfd44b1f", - "sourceName": "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [ - "../IERC20.sol" - ], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "IERC20Metadata" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol": { - "lastModificationDate": 1756116057319, - "contentHash": "b1a8fc63b83ce00408e0c9ed1230b717", - "sourceName": "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [ - "./IERC20Permit.sol", - "../ERC20.sol", - "../../../utils/cryptography/ECDSA.sol", - "../../../utils/cryptography/EIP712.sol", - "../../../utils/Nonces.sol" - ], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "ERC20Permit" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol": { - "lastModificationDate": 1756116057319, - "contentHash": "51c2083b160453420aaa0a046c16d5ca", - "sourceName": "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [ - "../ERC20.sol", - "../../../governance/utils/Votes.sol", - "../../../utils/structs/Checkpoints.sol" - ], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "ERC20Votes" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/utils/cryptography/ECDSA.sol": { - "lastModificationDate": 1756116054610, - "contentHash": "81de029d56aa803972be03c5d277cb6c", - "sourceName": "@openzeppelin/contracts/utils/cryptography/ECDSA.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "ECDSA" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/utils/Nonces.sol": { - "lastModificationDate": 1756116051370, - "contentHash": "c32d108058718efb9061b88e83a83f79", - "sourceName": "@openzeppelin/contracts/utils/Nonces.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "Nonces" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/utils/cryptography/EIP712.sol": { - "lastModificationDate": 1756116054610, - "contentHash": "8dbb261c55f358342798c4d1803d4f8e", - "sourceName": "@openzeppelin/contracts/utils/cryptography/EIP712.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [ - "./MessageHashUtils.sol", - "../ShortStrings.sol", - "../../interfaces/IERC5267.sol" - ], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "EIP712" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/token/ERC20/extensions/IERC20Permit.sol": { - "lastModificationDate": 1756116057319, - "contentHash": "94ec15baf0d5df863f45b8f351937ec7", - "sourceName": "@openzeppelin/contracts/token/ERC20/extensions/IERC20Permit.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "IERC20Permit" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/interfaces/IERC5267.sol": { - "lastModificationDate": 1756116051370, - "contentHash": "94364524cb1a39dcbc3d3afff6d8e53e", - "sourceName": "@openzeppelin/contracts/interfaces/IERC5267.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "IERC5267" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/utils/ShortStrings.sol": { - "lastModificationDate": 1756116051370, - "contentHash": "94e7feaf138d08fb736e43ca0be9bf26", - "sourceName": "@openzeppelin/contracts/utils/ShortStrings.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [ - "./StorageSlot.sol" - ], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "ShortStrings" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol": { - "lastModificationDate": 1756116054610, - "contentHash": "86fd93657e4e27ff76c38699e9b9fcef", - "sourceName": "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [ - "../Strings.sol" - ], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "MessageHashUtils" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/utils/StorageSlot.sol": { - "lastModificationDate": 1756116051379, - "contentHash": "e656d64c4ce918f3d13030b91c935134", - "sourceName": "@openzeppelin/contracts/utils/StorageSlot.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "StorageSlot" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/utils/Strings.sol": { - "lastModificationDate": 1756116051379, - "contentHash": "a55fef2557b35bac18a1880d3c2e6740", - "sourceName": "@openzeppelin/contracts/utils/Strings.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [ - "./math/Math.sol", - "./math/SafeCast.sol", - "./math/SignedMath.sol" - ], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "Strings" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/utils/math/Math.sol": { - "lastModificationDate": 1756116054610, - "contentHash": "2b2665ae9bdb1af440658741a77fe213", - "sourceName": "@openzeppelin/contracts/utils/math/Math.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [ - "../Panic.sol", - "./SafeCast.sol" - ], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "Math" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/utils/math/SafeCast.sol": { - "lastModificationDate": 1756116054610, - "contentHash": "2adca1150f58fc6f3d1f0a0f22ee7cca", - "sourceName": "@openzeppelin/contracts/utils/math/SafeCast.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "SafeCast" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/utils/math/SignedMath.sol": { - "lastModificationDate": 1756116054610, - "contentHash": "ae3528afb8bdb0a7dcfba5b115ee8074", - "sourceName": "@openzeppelin/contracts/utils/math/SignedMath.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [ - "./SafeCast.sol" - ], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "SignedMath" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/utils/Panic.sol": { - "lastModificationDate": 1756116051370, - "contentHash": "2133dc13536b4a6a98131e431fac59e1", - "sourceName": "@openzeppelin/contracts/utils/Panic.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "Panic" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/governance/utils/Votes.sol": { - "lastModificationDate": 1756116054601, - "contentHash": "95aceafdc639babdd22576e5e3774d64", - "sourceName": "@openzeppelin/contracts/governance/utils/Votes.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [ - "../../interfaces/IERC5805.sol", - "../../utils/Context.sol", - "../../utils/Nonces.sol", - "../../utils/cryptography/EIP712.sol", - "../../utils/structs/Checkpoints.sol", - "../../utils/math/SafeCast.sol", - "../../utils/cryptography/ECDSA.sol", - "../../utils/types/Time.sol" - ], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "Votes" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/utils/structs/Checkpoints.sol": { - "lastModificationDate": 1756116054610, - "contentHash": "657c6dfea3bae1af948de6113ba01cea", - "sourceName": "@openzeppelin/contracts/utils/structs/Checkpoints.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [ - "../math/Math.sol" - ], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "Checkpoints" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/interfaces/IERC5805.sol": { - "lastModificationDate": 1756116051370, - "contentHash": "65ba9f89b1057e2192e341b286d4e261", - "sourceName": "@openzeppelin/contracts/interfaces/IERC5805.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [ - "../governance/utils/IVotes.sol", - "./IERC6372.sol" - ], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "IERC5805" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/utils/types/Time.sol": { - "lastModificationDate": 1756116054610, - "contentHash": "d83e7814a059fc1287fd765f424ce004", - "sourceName": "@openzeppelin/contracts/utils/types/Time.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [ - "../math/Math.sol", - "../math/SafeCast.sol" - ], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "Time" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/governance/utils/IVotes.sol": { - "lastModificationDate": 1756116054601, - "contentHash": "905ffceb29869fee4b5a649abe7e2927", - "sourceName": "@openzeppelin/contracts/governance/utils/IVotes.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "IVotes" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/node_modules/@openzeppelin/contracts/interfaces/IERC6372.sol": { - "lastModificationDate": 1756116051370, - "contentHash": "414cd6acf090e4009cf016ff62ecbd88", - "sourceName": "@openzeppelin/contracts/interfaces/IERC6372.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "IERC6372" - ] - }, - "/home/alex/Digital_Legal_Entity(DLE)/backend/contracts/FactoryDeployer.sol": { - "lastModificationDate": 1756115917209, - "contentHash": "6161bbb21af830bc05d6acd8682d9678", - "sourceName": "contracts/FactoryDeployer.sol", - "solcConfig": { - "version": "0.8.20", - "settings": { - "optimizer": { - "enabled": true, - "runs": 200 - }, - "viaIR": true, - "evmVersion": "paris", - "outputSelection": { - "*": { - "*": [ - "abi", - "evm.bytecode", - "evm.deployedBytecode", - "evm.methodIdentifiers", - "metadata" - ], - "": [ - "ast" - ] - } - } - } - }, - "imports": [], - "versionPragmas": [ - "^0.8.20" - ], - "artifacts": [ - "FactoryDeployer" - ] - } - } -} diff --git a/backend/contracts/DLE.sol b/backend/contracts/DLE.sol index 6f746d9..19eebf4 100644 --- a/backend/contracts/DLE.sol +++ b/backend/contracts/DLE.sol @@ -16,6 +16,10 @@ import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol"; import "@openzeppelin/contracts/utils/ReentrancyGuard.sol"; import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; +interface IERC1271 { + function isValidSignature(bytes32 hash, bytes calldata signature) external view returns (bytes4 magicValue); +} + /** * @title DLE (Digital Legal Entity) * @dev Основной контракт DLE с модульной архитектурой, Single-Chain Governance @@ -78,10 +82,14 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { uint256 public quorumPercentage; uint256 public proposalCounter; uint256 public currentChainId; + // Публичный URI логотипа токена/организации (можно установить при деплое через инициализатор) + string public logoURI; // Модули mapping(bytes32 => address) public modules; mapping(bytes32 => bool) public activeModules; + bool public modulesInitialized; // Флаг инициализации базовых модулей + address public immutable initializer; // Адрес, имеющий право на однократную инициализацию модулей // Предложения mapping(uint256 => Proposal) public proposals; @@ -120,16 +128,66 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { event CurrentChainIdUpdated(uint256 oldChainId, uint256 newChainId); event TokensTransferredByGovernance(address indexed recipient, uint256 amount); - // EIP712 typehash для подписи одобрения исполнения предложения в целевой сети - // ExecutionApproval(uint256 proposalId, bytes32 operationHash, uint256 chainId, uint256 snapshotTimepoint) + event VotingDurationsUpdated(uint256 oldMinDuration, uint256 newMinDuration, uint256 oldMaxDuration, uint256 newMaxDuration); + event LogoURIUpdated(string oldURI, string newURI); + + // EIP712 typehash для подписи одобрения исполнения предложения bytes32 private constant EXECUTION_APPROVAL_TYPEHASH = keccak256( "ExecutionApproval(uint256 proposalId,bytes32 operationHash,uint256 chainId,uint256 snapshotTimepoint)" ); + // Custom errors (reduce bytecode size) + error ErrZeroAddress(); + error ErrArrayMismatch(); + error ErrNoPartners(); + error ErrZeroAmount(); + error ErrOnlyInitializer(); + error ErrLogoAlreadySet(); + error ErrNotHolder(); + error ErrTooShort(); + error ErrTooLong(); + error ErrBadChain(); + error ErrProposalMissing(); + error ErrProposalEnded(); + error ErrProposalExecuted(); + error ErrAlreadyVoted(); + error ErrWrongChain(); + error ErrNoPower(); + error ErrNotReady(); + error ErrNotInitiator(); + error ErrLowPower(); + error ErrBadTarget(); + error ErrBadSig1271(); + error ErrBadSig(); + error ErrDuplicateSigner(); + error ErrNoSigners(); + error ErrSigLengthMismatch(); + error ErrInvalidOperation(); + error ErrNameEmpty(); + error ErrSymbolEmpty(); + error ErrLocationEmpty(); + error ErrBadJurisdiction(); + error ErrBadKPP(); + error ErrBadQuorum(); + error ErrChainAlreadySupported(); + error ErrCannotAddCurrentChain(); + error ErrChainNotSupported(); + error ErrCannotRemoveCurrentChain(); + error ErrTransfersDisabled(); + error ErrApprovalsDisabled(); + error ErrProposalCanceled(); + + // Константы безопасности (можно изменять через governance) + uint256 public maxVotingDuration = 30 days; // Максимальное время голосования + uint256 public minVotingDuration = 1 hours; // Минимальное время голосования + // Удалён буфер ограничения голосования в последние минуты перед дедлайном constructor( DLEConfig memory config, - uint256 _currentChainId + uint256 _currentChainId, + address _initializer ) ERC20(config.name, config.symbol) ERC20Permit(config.name) { + if (_initializer == address(0)) revert ErrZeroAddress(); + initializer = _initializer; dleInfo = DLEInfo({ name: config.name, symbol: config.symbol, @@ -152,14 +210,14 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { } // Распределяем начальные токены партнерам - require(config.initialPartners.length == config.initialAmounts.length, "Arrays length mismatch"); - require(config.initialPartners.length > 0, "No initial partners"); + if (config.initialPartners.length != config.initialAmounts.length) revert ErrArrayMismatch(); + if (config.initialPartners.length == 0) revert ErrNoPartners(); for (uint256 i = 0; i < config.initialPartners.length; i++) { address partner = config.initialPartners[i]; uint256 amount = config.initialAmounts[i]; - require(partner != address(0), "Zero address"); - require(amount > 0, "Zero amount"); + if (partner == address(0)) revert ErrZeroAddress(); + if (amount == 0) revert ErrZeroAmount(); _mint(partner, amount); // Авто-делегирование голосов себе, чтобы getPastVotes работал без действия пользователя _delegate(partner, partner); @@ -179,6 +237,17 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { ); } + /** + * @dev Одноразовая инициализация URI логотипа. Доступно только инициализатору и только один раз. + */ + function initializeLogoURI(string calldata _logoURI) external { + if (msg.sender != initializer) revert ErrOnlyInitializer(); + if (bytes(logoURI).length != 0) revert ErrLogoAlreadySet(); + string memory old = logoURI; + logoURI = _logoURI; + emit LogoURIUpdated(old, _logoURI); + } + /** * @dev Создать предложение с выбором цепочки для кворума * @param _description Описание предложения @@ -194,9 +263,10 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { uint256[] memory _targetChains, uint256 /* _timelockDelay */ ) external returns (uint256) { - require(balanceOf(msg.sender) > 0, "Must hold tokens to create proposal"); - require(_duration > 0, "Duration must be positive"); - require(supportedChains[_governanceChainId], "Chain not supported"); + if (balanceOf(msg.sender) == 0) revert ErrNotHolder(); + if (_duration < minVotingDuration) revert ErrTooShort(); + if (_duration > maxVotingDuration) revert ErrTooLong(); + if (!supportedChains[_governanceChainId]) revert ErrBadChain(); // _timelockDelay параметр игнорируется; timelock вынесем в отдельный модуль return _createProposalInternal( _description, @@ -235,7 +305,7 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { // запись целевых сетей for (uint256 i = 0; i < _targetChains.length; i++) { - require(supportedChains[_targetChains[i]], "Target chain not supported"); + if (!supportedChains[_targetChains[i]]) revert ErrBadTarget(); proposal.targetChains.push(_targetChains[i]); } @@ -253,14 +323,15 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { */ function vote(uint256 _proposalId, bool _support) external nonReentrant { Proposal storage proposal = proposals[_proposalId]; - require(proposal.id == _proposalId, "Proposal does not exist"); - require(block.timestamp < proposal.deadline, "Voting ended"); - require(!proposal.executed, "Proposal already executed"); - require(!proposal.hasVoted[msg.sender], "Already voted"); - require(currentChainId == proposal.governanceChainId, "Wrong chain for voting"); + if (proposal.id != _proposalId) revert ErrProposalMissing(); + if (block.timestamp >= proposal.deadline) revert ErrProposalEnded(); + if (proposal.executed) revert ErrProposalExecuted(); + if (proposal.canceled) revert ErrProposalCanceled(); + if (proposal.hasVoted[msg.sender]) revert ErrAlreadyVoted(); + if (currentChainId != proposal.governanceChainId) revert ErrWrongChain(); - // используем снапшот голосов для защиты от перелива uint256 votingPower = getPastVotes(msg.sender, proposal.snapshotTimepoint); + if (votingPower == 0) revert ErrNoPower(); proposal.hasVoted[msg.sender] = true; if (_support) { @@ -273,16 +344,9 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { } // УДАЛЕНО: syncVoteFromChain с MerkleProof — небезопасно без доверенного моста - - /** - * @dev Проверить результат предложения - * @param _proposalId ID предложения - * @return passed Прошло ли предложение - * @return quorumReached Достигнут ли кворум - */ function checkProposalResult(uint256 _proposalId) public view returns (bool passed, bool quorumReached) { Proposal storage proposal = proposals[_proposalId]; - require(proposal.id == _proposalId, "Proposal does not exist"); + if (proposal.id != _proposalId) revert ErrProposalMissing(); uint256 totalVotes = proposal.forVotes + proposal.againstVotes; // Используем снапшот totalSupply на момент начала голосования @@ -295,25 +359,20 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { return (passed, quorumReached); } - /** - * @dev Исполнить предложение - * @param _proposalId ID предложения - */ + function executeProposal(uint256 _proposalId) external { Proposal storage proposal = proposals[_proposalId]; - require(proposal.id == _proposalId, "Proposal does not exist"); - require(!proposal.executed, "Proposal already executed"); - require(currentChainId == proposal.governanceChainId, "Execute only in governance chain"); + if (proposal.id != _proposalId) revert ErrProposalMissing(); + if (proposal.executed) revert ErrProposalExecuted(); + if (proposal.canceled) revert ErrProposalCanceled(); + if (currentChainId != proposal.governanceChainId) revert ErrWrongChain(); (bool passed, bool quorumReached) = checkProposalResult(_proposalId); // Предложение можно выполнить если: // 1. Дедлайн истек ИЛИ кворум достигнут - require( - block.timestamp >= proposal.deadline || quorumReached, - "Voting not ended and quorum not reached" - ); - require(passed && quorumReached, "Proposal not passed"); + if (!(block.timestamp >= proposal.deadline || quorumReached)) revert ErrNotReady(); + if (!(passed && quorumReached)) revert ErrNotReady(); proposal.executed = true; @@ -323,42 +382,38 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { emit ProposalExecuted(_proposalId, proposal.operation); } - /** - * @dev Отмена предложения до истечения голосования инициатором при наличии достаточной голосующей силы. - * Это soft-cancel для защиты от явных ошибок. Порог: >= 10% от снапшотного supply. - */ + function cancelProposal(uint256 _proposalId, string calldata reason) external { Proposal storage proposal = proposals[_proposalId]; - require(proposal.id == _proposalId, "Proposal does not exist"); - require(!proposal.executed, "Already executed"); - require(block.timestamp < proposal.deadline, "Voting ended"); - require(msg.sender == proposal.initiator, "Only initiator"); + if (proposal.id != _proposalId) revert ErrProposalMissing(); + if (proposal.executed) revert ErrProposalExecuted(); + if (block.timestamp + 900 >= proposal.deadline) revert ErrProposalEnded(); + if (msg.sender != proposal.initiator) revert ErrNotInitiator(); uint256 vp = getPastVotes(msg.sender, proposal.snapshotTimepoint); uint256 pastSupply = getPastTotalSupply(proposal.snapshotTimepoint); - require(vp * 10 >= pastSupply, "Insufficient voting power to cancel"); + if (vp * 10 < pastSupply) revert ErrLowPower(); proposal.canceled = true; emit ProposalCancelled(_proposalId, reason); } // УДАЛЕНО: syncExecutionFromChain с MerkleProof — небезопасно без доверенного моста - - /** - * @dev Исполнение предложения в НЕ governance-сети по подписям холдеров на снапшоте. - * Подходит для target chains. Не требует внешнего моста. - */ function executeProposalBySignatures( uint256 _proposalId, address[] calldata signers, bytes[] calldata signatures ) external nonReentrant { Proposal storage proposal = proposals[_proposalId]; - require(proposal.id == _proposalId, "Proposal does not exist"); - require(!proposal.executed, "Proposal already executed in this chain"); - require(currentChainId != proposal.governanceChainId, "Use executeProposal in governance chain"); - require(_isTargetChain(proposal, currentChainId), "Chain not in targets"); + if (proposal.id != _proposalId) revert ErrProposalMissing(); + if (proposal.executed) revert ErrProposalExecuted(); + if (proposal.canceled) revert ErrProposalCanceled(); + if (currentChainId == proposal.governanceChainId) revert ErrWrongChain(); + if (!_isTargetChain(proposal, currentChainId)) revert ErrBadTarget(); - require(signers.length == signatures.length, "Bad signatures"); + if (signers.length != signatures.length) revert ErrSigLengthMismatch(); + if (signers.length == 0) revert ErrNoSigners(); + // Все держатели токенов имеют право голосовать + bytes32 opHash = keccak256(proposal.operation); bytes32 structHash = keccak256(abi.encode( EXECUTION_APPROVAL_TYPEHASH, @@ -370,76 +425,44 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { bytes32 digest = _hashTypedDataV4(structHash); uint256 votesFor = 0; - // простая защита от дублей адресов (O(n^2) по малому n) + for (uint256 i = 0; i < signers.length; i++) { - address recovered = ECDSA.recover(digest, signatures[i]); - require(recovered == signers[i], "Bad signature"); - // проверка на дубли - for (uint256 j = 0; j < i; j++) { - require(signers[j] != recovered, "Duplicate signer"); + address signer = signers[i]; + if (signer.code.length > 0) { + // Контрактный кошелёк: проверяем подпись по EIP-1271 + try IERC1271(signer).isValidSignature(digest, signatures[i]) returns (bytes4 magic) { + if (magic != 0x1626ba7e) revert ErrBadSig1271(); + } catch { + revert ErrBadSig1271(); + } + } else { + // EOA подпись через ECDSA + address recovered = ECDSA.recover(digest, signatures[i]); + if (recovered != signer) revert ErrBadSig(); } - uint256 vp = getPastVotes(recovered, proposal.snapshotTimepoint); - require(vp > 0, "No voting power at snapshot"); + + for (uint256 j = 0; j < i; j++) { + if (signers[j] == signer) revert ErrDuplicateSigner(); + } + + uint256 vp = getPastVotes(signer, proposal.snapshotTimepoint); + if (vp == 0) revert ErrNoPower(); votesFor += vp; } uint256 pastSupply = getPastTotalSupply(proposal.snapshotTimepoint); uint256 quorumRequired = (pastSupply * quorumPercentage) / 100; - require(votesFor >= quorumRequired, "Quorum not reached by sigs"); + if (votesFor < quorumRequired) revert ErrNoPower(); proposal.executed = true; _executeOperation(proposal.operation); emit ProposalExecuted(_proposalId, proposal.operation); emit ProposalExecutionApprovedInChain(_proposalId, currentChainId); + } - /** - * @dev Проверить подключение к цепочке - * @param _chainId ID цепочки - * @return isAvailable Доступна ли цепочка - */ - function checkChainConnection(uint256 _chainId) public view returns (bool isAvailable) { - // Упрощенная проверка: цепочка объявлена как поддерживаемая - return supportedChains[_chainId]; - } + // Sync функции удалены для экономии байт-кода - /** - * @dev Проверить все подключения перед синхронизацией - * @param _proposalId ID предложения - * @return allChainsReady Готовы ли все цепочки - */ - function checkSyncReadiness(uint256 _proposalId) public view returns (bool allChainsReady) { - Proposal storage proposal = proposals[_proposalId]; - require(proposal.id == _proposalId, "Proposal does not exist"); - - // Проверяем все поддерживаемые цепочки - for (uint256 i = 0; i < getSupportedChainCount(); i++) { - uint256 chainId = getSupportedChainId(i); - if (!checkChainConnection(chainId)) { - return false; - } - } - - return true; - } - - /** - * @dev Синхронизация только при 100% готовности - * @param _proposalId ID предложения - */ - function syncToAllChains(uint256 _proposalId) external { - require(checkSyncReadiness(_proposalId), "Not all chains ready"); - - // В этой версии без внешнего моста синхронизация выполняется - // через executeProposalBySignatures в целевых сетях. - emit SyncCompleted(_proposalId); - } - - /** - * @dev Синхронизация в конкретную цепочку - * @param _proposalId ID предложения - * @param _chainId ID цепочки - */ // УДАЛЕНО: syncToChain — не используется в подпись‑ориентированной схеме /** @@ -508,23 +531,28 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { * @param _operation Операция для исполнения */ function _executeOperation(bytes memory _operation) internal { - // Декодируем операцию - (bytes4 selector, bytes memory data) = abi.decode(_operation, (bytes4, bytes)); + if (_operation.length < 4) revert ErrInvalidOperation(); - if (selector == bytes4(keccak256("updateDLEInfo(string,string,string,string,uint256,string[],uint256)"))) { - // Операция обновления информации DLE - (string memory name, string memory symbol, string memory location, string memory coordinates, - uint256 jurisdiction, string[] memory okvedCodes, uint256 kpp) = abi.decode(data, (string, string, string, string, uint256, string[], uint256)); - _updateDLEInfo(name, symbol, location, coordinates, jurisdiction, okvedCodes, kpp); - } else if (selector == bytes4(keccak256("updateQuorumPercentage(uint256)"))) { - // Операция обновления процента кворума - (uint256 newQuorumPercentage) = abi.decode(data, (uint256)); - _updateQuorumPercentage(newQuorumPercentage); - } else if (selector == bytes4(keccak256("updateCurrentChainId(uint256)"))) { - // Операция обновления текущей цепочки - (uint256 newChainId) = abi.decode(data, (uint256)); - _updateCurrentChainId(newChainId); - } else if (selector == bytes4(keccak256("_addModule(bytes32,address)"))) { + // Декодируем операцию из formата abi.encodeWithSelector + bytes4 selector; + bytes memory data; + + // Извлекаем селектор (первые 4 байта) + assembly { + selector := mload(add(_operation, 0x20)) + } + + // Извлекаем данные (все после первых 4 байтов) + if (_operation.length > 4) { + data = new bytes(_operation.length - 4); + for (uint256 i = 0; i < data.length; i++) { + data[i] = _operation[i + 4]; + } + } else { + data = new bytes(0); + } + + if (selector == bytes4(keccak256("_addModule(bytes32,address)"))) { // Операция добавления модуля (bytes32 moduleId, address moduleAddress) = abi.decode(data, (bytes32, address)); _addModule(moduleId, moduleAddress); @@ -542,13 +570,32 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { // Операция перевода токенов через governance (address recipient, uint256 amount) = abi.decode(data, (address, uint256)); _transferTokens(recipient, amount); + } else if (selector == bytes4(keccak256("_updateVotingDurations(uint256,uint256)"))) { + // Операция обновления времени голосования + (uint256 newMinDuration, uint256 newMaxDuration) = abi.decode(data, (uint256, uint256)); + _updateVotingDurations(newMinDuration, newMaxDuration); + } else if (selector == bytes4(keccak256("_setLogoURI(string)"))) { + // Обновление логотипа через governance + (string memory newLogo) = abi.decode(data, (string)); + _setLogoURI(newLogo); + } else if (selector == bytes4(keccak256("_updateQuorumPercentage(uint256)"))) { + // Операция обновления процента кворума + (uint256 newQuorumPercentage) = abi.decode(data, (uint256)); + _updateQuorumPercentage(newQuorumPercentage); + } else if (selector == bytes4(keccak256("_updateCurrentChainId(uint256)"))) { + // Операция обновления текущей цепочки + (uint256 newChainId) = abi.decode(data, (uint256)); + _updateCurrentChainId(newChainId); + } else if (selector == bytes4(keccak256("_updateDLEInfo(string,string,string,string,uint256,string[],uint256)"))) { + // Операция обновления информации DLE + (string memory name, string memory symbol, string memory location, string memory coordinates, uint256 jurisdiction, string[] memory okvedCodes, uint256 kpp) = abi.decode(data, (string, string, string, string, uint256, string[], uint256)); + _updateDLEInfo(name, symbol, location, coordinates, jurisdiction, okvedCodes, kpp); } else if (selector == bytes4(keccak256("offchainAction(bytes32,string,bytes32)"))) { // Оффчейн операция для приложения: идентификатор, тип, хеш полезной нагрузки // (bytes32 actionId, string memory kind, bytes32 payloadHash) = abi.decode(data, (bytes32, string, bytes32)); // Ончейн-побочных эффектов нет. Факт решения фиксируется событием ProposalExecuted. } else { - // Неизвестная операция - revert("Unknown operation"); + revert ErrInvalidOperation(); } } @@ -571,11 +618,11 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { string[] memory _okvedCodes, uint256 _kpp ) internal { - require(bytes(_name).length > 0, "Name cannot be empty"); - require(bytes(_symbol).length > 0, "Symbol cannot be empty"); - require(bytes(_location).length > 0, "Location cannot be empty"); - require(_jurisdiction > 0, "Invalid jurisdiction"); - require(_kpp > 0, "Invalid KPP"); + if (bytes(_name).length == 0) revert ErrNameEmpty(); + if (bytes(_symbol).length == 0) revert ErrSymbolEmpty(); + if (bytes(_location).length == 0) revert ErrLocationEmpty(); + if (_jurisdiction == 0) revert ErrBadJurisdiction(); + if (_kpp == 0) revert ErrBadKPP(); dleInfo.name = _name; dleInfo.symbol = _symbol; @@ -593,7 +640,7 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { * @param _newQuorumPercentage Новый процент кворума */ function _updateQuorumPercentage(uint256 _newQuorumPercentage) internal { - require(_newQuorumPercentage > 0 && _newQuorumPercentage <= 100, "Invalid quorum percentage"); + if (!(_newQuorumPercentage > 0 && _newQuorumPercentage <= 100)) revert ErrBadQuorum(); uint256 oldQuorumPercentage = quorumPercentage; quorumPercentage = _newQuorumPercentage; @@ -606,8 +653,8 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { * @param _newChainId Новый ID цепочки */ function _updateCurrentChainId(uint256 _newChainId) internal { - require(supportedChains[_newChainId], "Chain not supported"); - require(_newChainId != currentChainId, "Same chain ID"); + if (!supportedChains[_newChainId]) revert ErrChainNotSupported(); + if (_newChainId == currentChainId) revert ErrCannotAddCurrentChain(); uint256 oldChainId = currentChainId; currentChainId = _newChainId; @@ -621,8 +668,8 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { * @param _amount Количество токенов для перевода */ function _transferTokens(address _recipient, uint256 _amount) internal { - require(_recipient != address(0), "Cannot transfer to zero address"); - require(_amount > 0, "Amount must be positive"); + if (_recipient == address(0)) revert ErrZeroAddress(); + if (_amount == 0) revert ErrZeroAmount(); require(balanceOf(address(this)) >= _amount, "Insufficient DLE balance"); // Переводим токены от имени DLE (address(this)) @@ -631,6 +678,73 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { emit TokensTransferredByGovernance(_recipient, _amount); } + /** + * @dev Обновить время голосования (только через governance) + * @param _newMinDuration Новое минимальное время голосования + * @param _newMaxDuration Новое максимальное время голосования + */ + function _updateVotingDurations(uint256 _newMinDuration, uint256 _newMaxDuration) internal { + if (_newMinDuration == 0) revert ErrTooShort(); + if (!(_newMaxDuration > _newMinDuration)) revert ErrTooLong(); + if (_newMinDuration < 10 minutes) revert ErrTooShort(); + if (_newMaxDuration > 365 days) revert ErrTooLong(); + + uint256 oldMinDuration = minVotingDuration; + uint256 oldMaxDuration = maxVotingDuration; + + minVotingDuration = _newMinDuration; + maxVotingDuration = _newMaxDuration; + + emit VotingDurationsUpdated(oldMinDuration, _newMinDuration, oldMaxDuration, _newMaxDuration); + } + + /** + * @dev Внутреннее обновление URI логотипа (только через governance). + */ + function _setLogoURI(string memory _logoURI) internal { + string memory old = logoURI; + logoURI = _logoURI; + emit LogoURIUpdated(old, _logoURI); + } + + + + /** + * @dev Инициализировать базовые модули (вызывается только один раз при деплое) + * @param _treasuryAddress Адрес Treasury модуля + * @param _timelockAddress Адрес Timelock модуля + * @param _readerAddress Адрес Reader модуля + */ + function initializeBaseModules( + address _treasuryAddress, + address _timelockAddress, + address _readerAddress + ) external { + if (modulesInitialized) revert ErrProposalExecuted(); // keep existing error to avoid new identifier + if (msg.sender != initializer) revert ErrOnlyInitializer(); + if (_treasuryAddress == address(0) || _timelockAddress == address(0) || _readerAddress == address(0)) revert ErrZeroAddress(); + + // Добавляем базовые модули без голосования (только при инициализации) + bytes32 treasuryId = keccak256("TREASURY"); + bytes32 timelockId = keccak256("TIMELOCK"); + bytes32 readerId = keccak256("READER"); + + modules[treasuryId] = _treasuryAddress; + activeModules[treasuryId] = true; + + modules[timelockId] = _timelockAddress; + activeModules[timelockId] = true; + + modules[readerId] = _readerAddress; + activeModules[readerId] = true; + + modulesInitialized = true; + + emit ModuleAdded(treasuryId, _treasuryAddress); + emit ModuleAdded(timelockId, _timelockAddress); + emit ModuleAdded(readerId, _readerAddress); + } + /** * @dev Создать предложение о добавлении модуля * @param _description Описание предложения @@ -646,10 +760,10 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { address _moduleAddress, uint256 _chainId ) external returns (uint256) { - require(supportedChains[_chainId], "Chain not supported"); - require(_moduleAddress != address(0), "Zero address"); - require(!activeModules[_moduleId], "Module already exists"); - require(balanceOf(msg.sender) > 0, "Must hold tokens to create proposal"); + if (!supportedChains[_chainId]) revert ErrChainNotSupported(); + if (_moduleAddress == address(0)) revert ErrZeroAddress(); + if (activeModules[_moduleId]) revert ErrProposalExecuted(); + if (balanceOf(msg.sender) == 0) revert ErrNotHolder(); // Операция добавления модуля bytes memory operation = abi.encodeWithSelector( @@ -688,9 +802,9 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { bytes32 _moduleId, uint256 _chainId ) external returns (uint256) { - require(supportedChains[_chainId], "Chain not supported"); - require(activeModules[_moduleId], "Module does not exist"); - require(balanceOf(msg.sender) > 0, "Must hold tokens to create proposal"); + if (!supportedChains[_chainId]) revert ErrChainNotSupported(); + if (!activeModules[_moduleId]) revert ErrProposalMissing(); + if (balanceOf(msg.sender) == 0) revert ErrNotHolder(); // Операция удаления модуля bytes memory operation = abi.encodeWithSelector( @@ -715,14 +829,16 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { ); } + // Treasury операции перенесены в TreasuryModule для экономии байт-кода + /** * @dev Добавить модуль (внутренняя функция, вызывается через кворум) * @param _moduleId ID модуля * @param _moduleAddress Адрес модуля */ function _addModule(bytes32 _moduleId, address _moduleAddress) internal { - require(_moduleAddress != address(0), "Zero address"); - require(!activeModules[_moduleId], "Module already exists"); + if (_moduleAddress == address(0)) revert ErrZeroAddress(); + if (activeModules[_moduleId]) revert ErrProposalExecuted(); modules[_moduleId] = _moduleAddress; activeModules[_moduleId] = true; @@ -735,7 +851,7 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { * @param _moduleId ID модуля */ function _removeModule(bytes32 _moduleId) internal { - require(activeModules[_moduleId], "Module does not exist"); + if (!activeModules[_moduleId]) revert ErrProposalMissing(); delete modules[_moduleId]; activeModules[_moduleId] = false; @@ -781,73 +897,7 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { return currentChainId; } - // ===== Интерфейс аналитики для API ===== - function getProposalSummary(uint256 _proposalId) external view returns ( - uint256 id, - string memory description, - uint256 forVotes, - uint256 againstVotes, - bool executed, - bool canceled, - uint256 deadline, - address initiator, - uint256 governanceChainId, - - uint256 snapshotTimepoint, - uint256[] memory targets - ) { - Proposal storage p = proposals[_proposalId]; - require(p.id == _proposalId, "Proposal does not exist"); - return ( - p.id, - p.description, - p.forVotes, - p.againstVotes, - p.executed, - p.canceled, - p.deadline, - p.initiator, - p.governanceChainId, - - p.snapshotTimepoint, - p.targetChains - ); - } - - function getGovernanceParams() external view returns ( - uint256 quorumPct, - uint256 chainId, - uint256 supportedCount - ) { - return (quorumPercentage, currentChainId, supportedChainIds.length); - } - - function listSupportedChains() external view returns (uint256[] memory) { - return supportedChainIds; - } - - function getVotingPowerAt(address voter, uint256 timepoint) external view returns (uint256) { - return getPastVotes(voter, timepoint); - } - - // ===== Пагинация и агрегирование ===== - function getProposalsCount() external view returns (uint256) { - return allProposalIds.length; - } - - function listProposals(uint256 offset, uint256 limit) external view returns (uint256[] memory) { - uint256 total = allProposalIds.length; - if (offset >= total) { - return new uint256[](0); - } - uint256 end = offset + limit; - if (end > total) end = total; - uint256[] memory page = new uint256[](end - offset); - for (uint256 i = offset; i < end; i++) { - page[i - offset] = allProposalIds[i]; - } - return page; - } + // API функции вынесены в отдельный reader контракт для экономии байт-кода // 0=Pending, 1=Succeeded, 2=Defeated, 3=Executed, 4=Canceled, 5=ReadyForExecution function getProposalState(uint256 _proposalId) public view returns (uint8 state) { @@ -864,33 +914,11 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { return 0; // Pending } - function getQuorumAt(uint256 timepoint) external view returns (uint256) { - uint256 supply = getPastTotalSupply(timepoint); - return (supply * quorumPercentage) / 100; - } - - function getProposalVotes(uint256 _proposalId) external view returns ( - uint256 forVotes, - uint256 againstVotes, - uint256 totalVotes, - uint256 quorumRequired - ) { - Proposal storage p = proposals[_proposalId]; - require(p.id == _proposalId, "Proposal does not exist"); - uint256 supply = getPastTotalSupply(p.snapshotTimepoint); - uint256 quorumReq = (supply * quorumPercentage) / 100; - return (p.forVotes, p.againstVotes, p.forVotes + p.againstVotes, quorumReq); - } - - // События для новых функций - event SyncCompleted(uint256 proposalId); - event DLEDeactivated(address indexed deactivatedBy, uint256 timestamp); - - bool public isDeactivated; + // Функции для подсчёта голосов вынесены в reader контракт // Деактивация вынесена в отдельный модуль. См. DeactivationModule. function isActive() external view returns (bool) { - return !isDeactivated && dleInfo.isActive; + return dleInfo.isActive; } // ===== Вспомогательные функции ===== function _isTargetChain(Proposal storage p, uint256 chainId) internal view returns (bool) { @@ -908,7 +936,7 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { super._update(from, to, value); } - // Разрешаем неоднозначность nonces из базовых классов + // Разрешение неоднозначности nonces между ERC20Permit и Nonces function nonces(address owner) public view @@ -929,32 +957,28 @@ contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { /** * @dev Блокирует прямые переводы токенов - * @param to Адрес получателя (не используется) - * @param amount Количество токенов (не используется) - * @return Всегда возвращает false + * @return Всегда ревертится */ - function transfer(address to, uint256 amount) public override returns (bool) { - revert("Direct transfers disabled. Use governance proposals for token transfers."); + function transfer(address /*to*/, uint256 /*amount*/) public pure override returns (bool) { + // coverage:ignore-line + revert ErrTransfersDisabled(); } /** * @dev Блокирует прямые переводы токенов через approve/transferFrom - * @param from Адрес отправителя (не используется) - * @param to Адрес получателя (не используется) - * @param amount Количество токенов (не используется) - * @return Всегда возвращает false + * @return Всегда ревертится */ - function transferFrom(address from, address to, uint256 amount) public override returns (bool) { - revert("Direct transfers disabled. Use governance proposals for token transfers."); + function transferFrom(address /*from*/, address /*to*/, uint256 /*amount*/) public pure override returns (bool) { + // coverage:ignore-line + revert ErrTransfersDisabled(); } /** * @dev Блокирует прямые разрешения на перевод токенов - * @param spender Адрес, которому разрешается тратить токены (не используется) - * @param amount Количество токенов (не используется) - * @return Всегда возвращает false + * @return Всегда ревертится */ - function approve(address spender, uint256 amount) public override returns (bool) { - revert("Direct approvals disabled. Use governance proposals for token transfers."); + function approve(address /*spender*/, uint256 /*amount*/) public pure override returns (bool) { + // coverage:ignore-line + revert ErrApprovalsDisabled(); } } diff --git a/backend/contracts/DLEReader.sol b/backend/contracts/DLEReader.sol new file mode 100644 index 0000000..0427309 --- /dev/null +++ b/backend/contracts/DLEReader.sol @@ -0,0 +1,360 @@ +// SPDX-License-Identifier: PROPRIETARY AND MIT +// Copyright (c) 2024-2025 Тарабанов Александр Викторович +// All rights reserved. + +pragma solidity ^0.8.20; + +interface IDLEReader { + // Структуры из основного контракта + struct DLEInfo { + string name; + string symbol; + string location; + string coordinates; + uint256 jurisdiction; + string[] okvedCodes; + uint256 kpp; + uint256 creationTimestamp; + bool isActive; + } + + struct Proposal { + uint256 id; + string description; + uint256 forVotes; + uint256 againstVotes; + bool executed; + bool canceled; + uint256 deadline; + address initiator; + bytes operation; + uint256 governanceChainId; + uint256[] targetChains; + uint256 snapshotTimepoint; + } + + // Основные функции чтения + function getDLEInfo() external view returns (DLEInfo memory); + function proposals(uint256) external view returns ( + uint256 id, + string memory description, + uint256 forVotes, + uint256 againstVotes, + bool executed, + bool canceled, + uint256 deadline, + address initiator, + bytes memory operation, + uint256 governanceChainId, + uint256 snapshotTimepoint + ); + function allProposalIds(uint256) external view returns (uint256); + function supportedChainIds(uint256) external view returns (uint256); + function quorumPercentage() external view returns (uint256); + function currentChainId() external view returns (uint256); + function totalSupply() external view returns (uint256); + function getPastTotalSupply(uint256) external view returns (uint256); + function getPastVotes(address, uint256) external view returns (uint256); + function checkProposalResult(uint256) external view returns (bool, bool); + function getProposalState(uint256) external view returns (uint8); + function balanceOf(address) external view returns (uint256); + function isChainSupported(uint256) external view returns (bool); + function isModuleActive(bytes32) external view returns (bool); + function getModuleAddress(bytes32) external view returns (address); +} + +/** + * @title DLEReader + * @dev Read-only контракт для API функций DLE + * + * БЕЗОПАСНОСТЬ: + * - Только чтение данных (view/pure функции) + * - Не изменяет состояние основного контракта + * - Можно безопасно обновлять независимо от DLE + * - Нет доступа к приватным данным + */ +contract DLEReader { + + address public immutable dleContract; + + constructor(address _dleContract) { + require(_dleContract != address(0), "DLE contract cannot be zero"); + require(_dleContract.code.length > 0, "DLE contract must exist"); + dleContract = _dleContract; + } + + // ===== АГРЕГИРОВАННЫЕ ДАННЫЕ ===== + + /** + * @dev Получить полную сводку по предложению + */ + function getProposalSummary(uint256 _proposalId) external view returns ( + uint256 id, + string memory description, + uint256 forVotes, + uint256 againstVotes, + bool executed, + bool canceled, + uint256 deadline, + address initiator, + uint256 governanceChainId, + uint256 snapshotTimepoint, + uint256[] memory targetChains, + uint8 state, + bool passed, + bool quorumReached + ) { + IDLEReader dle = IDLEReader(dleContract); + + // Получаем основные данные предложения + ( + id, + description, + forVotes, + againstVotes, + executed, + canceled, + deadline, + initiator, + , // operation не нужна для сводки + governanceChainId, + snapshotTimepoint + ) = dle.proposals(_proposalId); + + // Получаем дополнительные данные + state = dle.getProposalState(_proposalId); + (passed, quorumReached) = dle.checkProposalResult(_proposalId); + + // TODO: targetChains требует отдельной функции в основном контракте + targetChains = new uint256[](0); + } + + /** + * @dev Получить параметры governance + */ + function getGovernanceParams() external view returns ( + uint256 quorumPct, + uint256 chainId, + uint256 supportedCount, + uint256 totalSupply, + uint256 proposalsCount + ) { + IDLEReader dle = IDLEReader(dleContract); + + quorumPct = dle.quorumPercentage(); + chainId = dle.currentChainId(); + totalSupply = dle.totalSupply(); + + // Считаем поддерживаемые сети + supportedCount = 0; + for (uint256 i = 0; i < 50; i++) { // Ограничиваем итерации + try dle.supportedChainIds(i) returns (uint256) { + supportedCount++; + } catch { + break; + } + } + + // Считаем предложения + proposalsCount = 0; + for (uint256 i = 0; i < 1000; i++) { // Ограничиваем итерации + try dle.allProposalIds(i) returns (uint256) { + proposalsCount++; + } catch { + break; + } + } + } + + /** + * @dev Получить список поддерживаемых сетей + */ + function listSupportedChains() external view returns (uint256[] memory chains) { + IDLEReader dle = IDLEReader(dleContract); + + // Сначала считаем количество + uint256 count = 0; + for (uint256 i = 0; i < 50; i++) { + try dle.supportedChainIds(i) returns (uint256) { + count++; + } catch { + break; + } + } + + // Затем заполняем массив + chains = new uint256[](count); + for (uint256 i = 0; i < count; i++) { + chains[i] = dle.supportedChainIds(i); + } + } + + /** + * @dev Получить список предложений с пагинацией + */ + function listProposals(uint256 offset, uint256 limit) external view returns ( + uint256[] memory proposalIds, + uint256 total + ) { + IDLEReader dle = IDLEReader(dleContract); + + // Считаем общее количество + total = 0; + for (uint256 i = 0; i < 10000; i++) { // Увеличиваем лимит для предложений + try dle.allProposalIds(i) returns (uint256) { + total++; + } catch { + break; + } + } + + // Проверяем границы + if (offset >= total) { + return (new uint256[](0), total); + } + + uint256 end = offset + limit; + if (end > total) end = total; + + // Заполняем страницу + proposalIds = new uint256[](end - offset); + for (uint256 i = offset; i < end; i++) { + proposalIds[i - offset] = dle.allProposalIds(i); + } + } + + /** + * @dev Получить голосующую силу на определённый момент времени + */ + function getVotingPowerAt(address voter, uint256 timepoint) external view returns (uint256) { + return IDLEReader(dleContract).getPastVotes(voter, timepoint); + } + + /** + * @dev Получить размер кворума на определённый момент времени + */ + function getQuorumAt(uint256 timepoint) external view returns (uint256) { + IDLEReader dle = IDLEReader(dleContract); + uint256 supply = dle.getPastTotalSupply(timepoint); + uint256 quorumPct = dle.quorumPercentage(); + return (supply * quorumPct) / 100; + } + + /** + * @dev Получить детали голосования по предложению + */ + function getProposalVotes(uint256 _proposalId) external view returns ( + uint256 forVotes, + uint256 againstVotes, + uint256 totalVotes, + uint256 quorumRequired, + uint256 quorumCurrent, + bool quorumReached + ) { + IDLEReader dle = IDLEReader(dleContract); + + // Получаем основные данные предложения + uint256 snapshotTimepoint; + ( + , // id + , // description + forVotes, + againstVotes, + , // executed + , // canceled + , // deadline + , // initiator + , // operation + , // governanceChainId + snapshotTimepoint + ) = dle.proposals(_proposalId); + + totalVotes = forVotes + againstVotes; + + // Вычисляем кворум + uint256 supply = dle.getPastTotalSupply(snapshotTimepoint); + uint256 quorumPct = dle.quorumPercentage(); + quorumRequired = (supply * quorumPct) / 100; + quorumCurrent = totalVotes; + quorumReached = totalVotes >= quorumRequired; + } + + /** + * @dev Получить статистику по адресу + */ + function getAddressStats(address user) external view returns ( + uint256 tokenBalance, + uint256 currentVotingPower, + uint256 delegatedTo, + bool hasTokens + ) { + IDLEReader dle = IDLEReader(dleContract); + + tokenBalance = dle.balanceOf(user); + currentVotingPower = dle.getPastVotes(user, block.number - 1); + hasTokens = tokenBalance > 0; + + // delegatedTo требует дополнительных функций в основном контракте + delegatedTo = 0; // Placeholder + } + + /** + * @dev Получить информацию о модулях + */ + function getModulesInfo(bytes32[] memory moduleIds) external view returns ( + address[] memory addresses, + bool[] memory active + ) { + IDLEReader dle = IDLEReader(dleContract); + + addresses = new address[](moduleIds.length); + active = new bool[](moduleIds.length); + + for (uint256 i = 0; i < moduleIds.length; i++) { + addresses[i] = dle.getModuleAddress(moduleIds[i]); + active[i] = dle.isModuleActive(moduleIds[i]); + } + } + + /** + * @dev Получить состояние DLE + */ + function getDLEStatus() external view returns ( + IDLEReader.DLEInfo memory info, + uint256 totalSupply, + uint256 currentChain, + uint256 quorumPct, + uint256 totalProposals, + uint256 supportedChains + ) { + IDLEReader dle = IDLEReader(dleContract); + + info = dle.getDLEInfo(); + totalSupply = dle.totalSupply(); + currentChain = dle.currentChainId(); + quorumPct = dle.quorumPercentage(); + + // Считаем предложения и сети + (,, supportedChains, totalSupply, totalProposals) = this.getGovernanceParams(); + } + + /** + * @dev Batch получение состояний предложений + */ + function getProposalStates(uint256[] memory proposalIds) external view returns ( + uint8[] memory states, + bool[] memory passed, + bool[] memory quorumReached + ) { + IDLEReader dle = IDLEReader(dleContract); + + states = new uint8[](proposalIds.length); + passed = new bool[](proposalIds.length); + quorumReached = new bool[](proposalIds.length); + + for (uint256 i = 0; i < proposalIds.length; i++) { + states[i] = dle.getProposalState(proposalIds[i]); + (passed[i], quorumReached[i]) = dle.checkProposalResult(proposalIds[i]); + } + } +} diff --git a/backend/contracts/FactoryDeployer.sol b/backend/contracts/FactoryDeployer.sol index 31b6d14..485269e 100644 --- a/backend/contracts/FactoryDeployer.sol +++ b/backend/contracts/FactoryDeployer.sol @@ -18,6 +18,12 @@ contract FactoryDeployer { bytes32 hash = keccak256(abi.encodePacked(bytes1(0xff), address(this), salt, initCodeHash)); return address(uint160(uint256(hash))); } + + function computeAddressWithCreationCode(bytes32 salt, bytes memory creationCode) external view returns (address) { + bytes32 initCodeHash = keccak256(creationCode); + bytes32 hash = keccak256(abi.encodePacked(bytes1(0xff), address(this), salt, initCodeHash)); + return address(uint160(uint256(hash))); + } } diff --git a/backend/contracts/MockNoop.sol b/backend/contracts/MockNoop.sol new file mode 100644 index 0000000..a3776ee --- /dev/null +++ b/backend/contracts/MockNoop.sol @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.20; + +/** + * @title MockNoop + * @dev Простой мок-контракт для тестирования FactoryDeployer + */ +contract MockNoop { + uint256 public value; + + constructor() { + value = 42; + } + + function setValue(uint256 _value) external { + value = _value; + } + + function getValue() external view returns (uint256) { + return value; + } +} diff --git a/backend/contracts/MockToken.sol b/backend/contracts/MockToken.sol new file mode 100644 index 0000000..9c6ba6e --- /dev/null +++ b/backend/contracts/MockToken.sol @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.20; + +import "@openzeppelin/contracts/token/ERC20/ERC20.sol"; + +/** + * @title MockToken + * @dev Мок-токен для тестирования TreasuryModule + */ +contract MockToken is ERC20 { + address public minter; + + constructor(string memory name, string memory symbol) ERC20(name, symbol) { + minter = msg.sender; + } + + modifier onlyMinter() { + require(msg.sender == minter, "Only minter can call this function"); + _; + } + + function mint(address to, uint256 amount) external onlyMinter { + _mint(to, amount); + } + + function burn(uint256 amount) external { + _burn(msg.sender, amount); + } +} diff --git a/backend/contracts/TimelockModule.sol b/backend/contracts/TimelockModule.sol new file mode 100644 index 0000000..a452a7a --- /dev/null +++ b/backend/contracts/TimelockModule.sol @@ -0,0 +1,399 @@ +// SPDX-License-Identifier: PROPRIETARY AND MIT +// Copyright (c) 2024-2025 Тарабанов Александр Викторович +// All rights reserved. + +pragma solidity ^0.8.20; + +import "@openzeppelin/contracts/utils/ReentrancyGuard.sol"; + +/** + * @title TimelockModule + * @dev Модуль временной задержки для критических операций DLE + * + * НАЗНАЧЕНИЕ: + * - Добавляет обязательную задержку между принятием и исполнением решений + * - Даёт время сообществу на обнаружение и отмену вредоносных предложений + * - Повышает безопасность критических операций (смена кворума, добавление модулей) + * + * ПРИНЦИП РАБОТЫ: + * 1. DLE исполняет операцию не напрямую, а через Timelock + * 2. Timelock ставит операцию в очередь с задержкой + * 3. После истечения задержки любой может исполнить операцию + * 4. В период задержки операцию можно отменить через экстренное голосование + */ +contract TimelockModule is ReentrancyGuard { + + // Структура отложенной операции + struct QueuedOperation { + bytes32 id; // Уникальный ID операции + address target; // Целевой контракт (обычно DLE) + bytes data; // Данные для вызова + uint256 executeAfter; // Время, после которого можно исполнить + uint256 queuedAt; // Время постановки в очередь + bool executed; // Исполнена ли операция + bool cancelled; // Отменена ли операция + address proposer; // Кто поставил в очередь + string description; // Описание операции + uint256 delay; // Задержка для этой операции + } + + // Основные настройки + address public immutable dleContract; // Адрес DLE контракта + uint256 public defaultDelay = 2 days; // Стандартная задержка + uint256 public emergencyDelay = 30 minutes; // Экстренная задержка + uint256 public maxDelay = 30 days; // Максимальная задержка + uint256 public minDelay = 1 hours; // Минимальная задержка + + // Хранение операций + mapping(bytes32 => QueuedOperation) public queuedOperations; + bytes32[] public operationQueue; // Список всех операций + mapping(bytes32 => uint256) public operationIndex; // ID => индекс в очереди + + // Категории операций с разными задержками + mapping(bytes4 => uint256) public operationDelays; // selector => delay + mapping(bytes4 => bool) public criticalOperations; // критические операции + mapping(bytes4 => bool) public emergencyOperations; // экстренные операции + + // Статистика + uint256 public totalOperations; + uint256 public executedOperations; + uint256 public cancelledOperations; + + // События + event OperationQueued( + bytes32 indexed operationId, + address indexed target, + bytes data, + uint256 executeAfter, + uint256 delay, + string description + ); + event OperationExecuted(bytes32 indexed operationId, address indexed executor); + event OperationCancelled(bytes32 indexed operationId, address indexed canceller, string reason); + event DelayUpdated(bytes4 indexed selector, uint256 oldDelay, uint256 newDelay); + event DefaultDelayUpdated(uint256 oldDelay, uint256 newDelay); + event EmergencyExecution(bytes32 indexed operationId, string reason); + + // Модификаторы + modifier onlyDLE() { + require(msg.sender == dleContract, "Only DLE can call"); + _; + } + + modifier validOperation(bytes32 operationId) { + require(queuedOperations[operationId].id == operationId, "Operation not found"); + require(!queuedOperations[operationId].executed, "Already executed"); + require(!queuedOperations[operationId].cancelled, "Operation cancelled"); + _; + } + + constructor(address _dleContract) { + require(_dleContract != address(0), "DLE contract cannot be zero"); + require(_dleContract.code.length > 0, "DLE contract must exist"); + + dleContract = _dleContract; + totalOperations = 0; + + // Настраиваем задержки для разных типов операций + _setupOperationDelays(); + } + + /** + * @dev Поставить операцию в очередь (вызывается из DLE) + * @param target Целевой контракт + * @param data Данные операции + * @param description Описание операции + */ + function queueOperation( + address target, + bytes memory data, + string memory description + ) external onlyDLE returns (bytes32) { + require(target != address(0), "Target cannot be zero"); + require(data.length >= 4, "Invalid operation data"); + + // Определяем задержку для операции + bytes4 selector; + assembly { + selector := mload(add(data, 0x20)) + } + uint256 delay = _getOperationDelay(selector); + + // Создаём уникальный ID операции + bytes32 operationId = keccak256(abi.encodePacked( + target, + data, + block.timestamp, + totalOperations + )); + + // Проверяем что операция ещё не существует + require(queuedOperations[operationId].id == bytes32(0), "Operation already exists"); + + // Создаём операцию + queuedOperations[operationId] = QueuedOperation({ + id: operationId, + target: target, + data: data, + executeAfter: block.timestamp + delay, + queuedAt: block.timestamp, + executed: false, + cancelled: false, + proposer: msg.sender, // Адрес вызывающего (обычно DLE контракт) + description: description, + delay: delay + }); + + // Добавляем в очередь + operationQueue.push(operationId); + operationIndex[operationId] = operationQueue.length - 1; + totalOperations++; + + emit OperationQueued(operationId, target, data, block.timestamp + delay, delay, description); + + return operationId; + } + + /** + * @dev Исполнить операцию после истечения задержки (может любой) + * @param operationId ID операции + */ + function executeOperation(bytes32 operationId) external nonReentrant validOperation(operationId) { + QueuedOperation storage operation = queuedOperations[operationId]; + + require(block.timestamp >= operation.executeAfter, "Timelock not expired"); + require(block.timestamp <= operation.executeAfter + 7 days, "Operation expired"); // Операции истекают через неделю + + operation.executed = true; + executedOperations++; + + // Исполняем операцию + (bool success, bytes memory result) = operation.target.call(operation.data); + require(success, string(abi.encodePacked("Execution failed: ", result))); + + emit OperationExecuted(operationId, msg.sender); + } + + /** + * @dev Отменить операцию (только через DLE governance) + * @param operationId ID операции + * @param reason Причина отмены + */ + function cancelOperation( + bytes32 operationId, + string memory reason + ) external onlyDLE validOperation(operationId) { + QueuedOperation storage operation = queuedOperations[operationId]; + + operation.cancelled = true; + cancelledOperations++; + + emit OperationCancelled(operationId, msg.sender, reason); + } + + /** + * @dev Экстренное исполнение без задержки (только для критических ситуаций) + * @param operationId ID операции + * @param reason Причина экстренного исполнения + */ + function emergencyExecute( + bytes32 operationId, + string memory reason + ) external onlyDLE nonReentrant validOperation(operationId) { + QueuedOperation storage operation = queuedOperations[operationId]; + + // Проверяем что операция помечена как экстренная + bytes memory opData = operation.data; + bytes4 selector; + assembly { + selector := mload(add(opData, 0x20)) + } + require(emergencyOperations[selector], "Not emergency operation"); + + operation.executed = true; + executedOperations++; + + // Исполняем операцию + (bool success, bytes memory result) = operation.target.call(operation.data); + require(success, string(abi.encodePacked("Emergency execution failed: ", result))); + + emit OperationExecuted(operationId, msg.sender); + emit EmergencyExecution(operationId, reason); + } + + /** + * @dev Обновить задержку для типа операции (только через governance) + * @param selector Селектор функции + * @param newDelay Новая задержка + * @param isCritical Является ли операция критической + * @param isEmergency Может ли исполняться экстренно + */ + function updateOperationDelay( + bytes4 selector, + uint256 newDelay, + bool isCritical, + bool isEmergency + ) external onlyDLE { + require(newDelay >= minDelay, "Delay too short"); + require(newDelay <= maxDelay, "Delay too long"); + + uint256 oldDelay = operationDelays[selector]; + operationDelays[selector] = newDelay; + criticalOperations[selector] = isCritical; + emergencyOperations[selector] = isEmergency; + + emit DelayUpdated(selector, oldDelay, newDelay); + } + + /** + * @dev Обновить стандартную задержку (только через governance) + * @param newDelay Новая стандартная задержка + */ + function updateDefaultDelay(uint256 newDelay) external onlyDLE { + require(newDelay >= minDelay, "Delay too short"); + require(newDelay <= maxDelay, "Delay too long"); + + uint256 oldDelay = defaultDelay; + defaultDelay = newDelay; + + emit DefaultDelayUpdated(oldDelay, newDelay); + } + + // ===== VIEW ФУНКЦИИ ===== + + /** + * @dev Получить информацию об операции + */ + function getOperation(bytes32 operationId) external view returns (QueuedOperation memory) { + return queuedOperations[operationId]; + } + + /** + * @dev Проверить, готова ли операция к исполнению + */ + function isReady(bytes32 operationId) external view returns (bool) { + QueuedOperation storage operation = queuedOperations[operationId]; + return operation.id != bytes32(0) && + !operation.executed && + !operation.cancelled && + block.timestamp >= operation.executeAfter; + } + + /** + * @dev Получить время до исполнения операции + */ + function getTimeToExecution(bytes32 operationId) external view returns (uint256) { + QueuedOperation storage operation = queuedOperations[operationId]; + if (operation.executeAfter <= block.timestamp) { + return 0; + } + return operation.executeAfter - block.timestamp; + } + + /** + * @dev Получить список активных операций + */ + function getActiveOperations() external view returns (bytes32[] memory) { + uint256 activeCount = 0; + + // Считаем активные операции + for (uint256 i = 0; i < operationQueue.length; i++) { + QueuedOperation storage op = queuedOperations[operationQueue[i]]; + if (!op.executed && !op.cancelled) { + activeCount++; + } + } + + // Заполняем массив + bytes32[] memory activeOps = new bytes32[](activeCount); + uint256 index = 0; + + for (uint256 i = 0; i < operationQueue.length; i++) { + QueuedOperation storage op = queuedOperations[operationQueue[i]]; + if (!op.executed && !op.cancelled) { + activeOps[index] = operationQueue[i]; + index++; + } + } + + return activeOps; + } + + /** + * @dev Получить статистику Timelock + */ + function getTimelockStats() external view returns ( + uint256 total, + uint256 executed, + uint256 cancelled, + uint256 pending, + uint256 currentDelay + ) { + return ( + totalOperations, + executedOperations, + cancelledOperations, + totalOperations - executedOperations - cancelledOperations, + defaultDelay + ); + } + + // ===== ВНУТРЕННИЕ ФУНКЦИИ ===== + + /** + * @dev Определить задержку для операции + */ + function _getOperationDelay(bytes4 selector) internal view returns (uint256) { + uint256 customDelay = operationDelays[selector]; + if (customDelay > 0) { + return customDelay; + } + + // Используем стандартную задержку + return defaultDelay; + } + + /** + * @dev Настроить стандартные задержки для операций + */ + function _setupOperationDelays() internal { + // Критические операции - длинная задержка (7 дней) + bytes4 updateQuorum = bytes4(keccak256("updateQuorumPercentage(uint256)")); + bytes4 addModule = bytes4(keccak256("_addModule(bytes32,address)")); + bytes4 removeModule = bytes4(keccak256("_removeModule(bytes32)")); + bytes4 addChain = bytes4(keccak256("_addSupportedChain(uint256)")); + bytes4 removeChain = bytes4(keccak256("_removeSupportedChain(uint256)")); + + operationDelays[updateQuorum] = 7 days; + operationDelays[addModule] = 7 days; + operationDelays[removeModule] = 7 days; + operationDelays[addChain] = 5 days; + operationDelays[removeChain] = 5 days; + + criticalOperations[updateQuorum] = true; + criticalOperations[addModule] = true; + criticalOperations[removeModule] = true; + criticalOperations[addChain] = true; + criticalOperations[removeChain] = true; + + // Обычные операции - стандартная задержка (2 дня) + bytes4 updateDLEInfo = bytes4(keccak256("updateDLEInfo(string,string,string,string,uint256,string[],uint256)")); + bytes4 updateChainId = bytes4(keccak256("updateCurrentChainId(uint256)")); + bytes4 updateVotingDurations = bytes4(keccak256("_updateVotingDurations(uint256,uint256)")); + + operationDelays[updateDLEInfo] = 2 days; + operationDelays[updateChainId] = 3 days; + operationDelays[updateVotingDurations] = 1 days; + + // Treasury операции - короткая задержка (1 день) + bytes4 treasuryTransfer = bytes4(keccak256("treasuryTransfer(address,address,uint256)")); + bytes4 treasuryAddToken = bytes4(keccak256("treasuryAddToken(address,string,uint8)")); + + operationDelays[treasuryTransfer] = 1 days; + operationDelays[treasuryAddToken] = 1 days; + + // Экстренные операции (могут исполняться немедленно при необходимости) + emergencyOperations[removeModule] = true; // Удаление вредоносного модуля + emergencyOperations[removeChain] = true; // Отключение скомпрометированной сети + } +} diff --git a/backend/contracts/TreasuryModule.sol b/backend/contracts/TreasuryModule.sol new file mode 100644 index 0000000..edd50e3 --- /dev/null +++ b/backend/contracts/TreasuryModule.sol @@ -0,0 +1,527 @@ +// SPDX-License-Identifier: PROPRIETARY AND MIT +// Copyright (c) 2024-2025 Тарабанов Александр Викторович +// All rights reserved. +// +// This software is proprietary and confidential. +// Unauthorized copying, modification, or distribution is prohibited. +// +// For licensing inquiries: info@hb3-accelerator.com +// Website: https://hb3-accelerator.com +// GitHub: https://github.com/HB3-ACCELERATOR + +pragma solidity ^0.8.20; + +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; +import "@openzeppelin/contracts/utils/ReentrancyGuard.sol"; +import "@openzeppelin/contracts/utils/Address.sol"; + +/** + * @title TreasuryModule + * @dev Модуль казны для управления активами DLE + * + * ОСНОВНЫЕ ФУНКЦИИ: + * - Управление различными ERC20 токенами + * - Хранение и перевод нативных монет (ETH, BNB, MATIC и т.д.) + * - Интеграция с DLE governance для авторизации операций + * - Поддержка мульти-чейн операций + * - Batch операции для оптимизации газа + * + * БЕЗОПАСНОСТЬ: + * - Только DLE контракт может выполнять операции + * - Защита от реентерабельности + * - Валидация всех входных параметров + * - Поддержка emergency pause + */ +contract TreasuryModule is ReentrancyGuard { + using SafeERC20 for IERC20; + using Address for address payable; + + // Структура для информации о токене + struct TokenInfo { + address tokenAddress; // Адрес токена (0x0 для нативной монеты) + string symbol; // Символ токена + uint8 decimals; // Количество знаков после запятой + bool isActive; // Активен ли токен + bool isNative; // Является ли нативной монетой + uint256 addedTimestamp; // Время добавления + uint256 balance; // Кэшированный баланс (обновляется при операциях) + } + + // Структура для batch операции + struct BatchTransfer { + address tokenAddress; // Адрес токена (0x0 для нативной монеты) + address recipient; // Получатель + uint256 amount; // Количество + } + + // Основные переменные + address public immutable dleContract; // Адрес основного DLE контракта + uint256 public immutable chainId; // ID текущей сети + + // Хранение токенов + mapping(address => TokenInfo) public supportedTokens; // tokenAddress => TokenInfo + address[] public tokenList; // Список всех добавленных токенов + mapping(address => uint256) public tokenIndex; // tokenAddress => index в tokenList + + // Статистика + uint256 public totalTokensSupported; + uint256 public totalTransactions; + mapping(address => uint256) public tokenTransactionCount; // tokenAddress => count + + // Система экстренного останова + bool public emergencyPaused; + address public emergencyAdmin; + + // События + event TokenAdded( + address indexed tokenAddress, + string symbol, + uint8 decimals, + bool isNative, + uint256 timestamp + ); + event TokenRemoved(address indexed tokenAddress, string symbol, uint256 timestamp); + event TokenStatusUpdated(address indexed tokenAddress, bool newStatus); + event FundsDeposited( + address indexed tokenAddress, + address indexed from, + uint256 amount, + uint256 newBalance + ); + event FundsTransferred( + address indexed tokenAddress, + address indexed to, + uint256 amount, + uint256 remainingBalance, + bytes32 indexed proposalId + ); + event BatchTransferExecuted( + uint256 transferCount, + uint256 totalAmount, + bytes32 indexed proposalId + ); + event EmergencyPauseToggled(bool isPaused, address admin); + event BalanceUpdated(address indexed tokenAddress, uint256 oldBalance, uint256 newBalance); + + // Модификаторы + modifier onlyDLE() { + require(msg.sender == dleContract, "Only DLE contract can call this"); + _; + } + + modifier whenNotPaused() { + require(!emergencyPaused, "Treasury is paused"); + _; + } + + modifier onlyEmergencyAdmin() { + require(msg.sender == emergencyAdmin, "Only emergency admin"); + _; + } + + modifier validToken(address tokenAddress) { + require(supportedTokens[tokenAddress].isActive, "Token not supported or inactive"); + _; + } + + constructor(address _dleContract, uint256 _chainId, address _emergencyAdmin) { + require(_dleContract != address(0), "DLE contract cannot be zero"); + require(_emergencyAdmin != address(0), "Emergency admin cannot be zero"); + require(_chainId > 0, "Chain ID must be positive"); + + dleContract = _dleContract; + chainId = _chainId; + emergencyAdmin = _emergencyAdmin; + + // Автоматически добавляем нативную монету сети + _addNativeToken(); + } + + /** + * @dev Получить средства (может вызывать кто угодно для пополнения казны) + */ + receive() external payable { + if (msg.value > 0) { + _updateTokenBalance(address(0), supportedTokens[address(0)].balance + msg.value); + emit FundsDeposited(address(0), msg.sender, msg.value, supportedTokens[address(0)].balance); + } + } + + /** + * @dev Добавить новый токен в казну (только через DLE governance) + * @param tokenAddress Адрес токена (0x0 для нативной монеты) + * @param symbol Символ токена + * @param decimals Количество знаков после запятой + */ + function addToken( + address tokenAddress, + string memory symbol, + uint8 decimals + ) external onlyDLE whenNotPaused { + require(!supportedTokens[tokenAddress].isActive, "Token already supported"); + require(bytes(symbol).length > 0, "Symbol cannot be empty"); + require(bytes(symbol).length <= 20, "Symbol too long"); + + // Для ERC20 токенов проверяем, что контракт существует + if (tokenAddress != address(0)) { + require(tokenAddress.code.length > 0, "Token contract does not exist"); + + // Проверяем базовые ERC20 функции + try IERC20(tokenAddress).totalSupply() returns (uint256) { + // Token contract is valid + } catch { + revert("Invalid ERC20 token"); + } + } + + // Добавляем токен + supportedTokens[tokenAddress] = TokenInfo({ + tokenAddress: tokenAddress, + symbol: symbol, + decimals: decimals, + isActive: true, + isNative: tokenAddress == address(0), + addedTimestamp: block.timestamp, + balance: 0 + }); + + tokenList.push(tokenAddress); + tokenIndex[tokenAddress] = tokenList.length - 1; + totalTokensSupported++; + + // Обновляем баланс + _refreshTokenBalance(tokenAddress); + + emit TokenAdded(tokenAddress, symbol, decimals, tokenAddress == address(0), block.timestamp); + } + + /** + * @dev Удалить токен из казны (только через DLE governance) + * @param tokenAddress Адрес токена для удаления + */ + function removeToken(address tokenAddress) external onlyDLE whenNotPaused validToken(tokenAddress) { + require(tokenAddress != address(0), "Cannot remove native token"); + + TokenInfo memory tokenInfo = supportedTokens[tokenAddress]; + require(tokenInfo.balance == 0, "Token balance must be zero before removal"); + + // Удаляем из массива + uint256 index = tokenIndex[tokenAddress]; + uint256 lastIndex = tokenList.length - 1; + + if (index != lastIndex) { + address lastToken = tokenList[lastIndex]; + tokenList[index] = lastToken; + tokenIndex[lastToken] = index; + } + + tokenList.pop(); + delete tokenIndex[tokenAddress]; + delete supportedTokens[tokenAddress]; + totalTokensSupported--; + + emit TokenRemoved(tokenAddress, tokenInfo.symbol, block.timestamp); + } + + /** + * @dev Изменить статус токена (активен/неактивен) + * @param tokenAddress Адрес токена + * @param isActive Новый статус + */ + function setTokenStatus(address tokenAddress, bool isActive) external onlyDLE { + require(supportedTokens[tokenAddress].tokenAddress == tokenAddress, "Token not found"); + require(tokenAddress != address(0), "Cannot deactivate native token"); + + supportedTokens[tokenAddress].isActive = isActive; + emit TokenStatusUpdated(tokenAddress, isActive); + } + + /** + * @dev Перевести токены (только через DLE governance) + * @param tokenAddress Адрес токена (0x0 для нативной монеты) + * @param recipient Получатель + * @param amount Количество для перевода + * @param proposalId ID предложения DLE (для логирования) + */ + function transferFunds( + address tokenAddress, + address recipient, + uint256 amount, + bytes32 proposalId + ) external onlyDLE whenNotPaused validToken(tokenAddress) nonReentrant { + require(recipient != address(0), "Recipient cannot be zero"); + require(amount > 0, "Amount must be positive"); + + TokenInfo storage tokenInfo = supportedTokens[tokenAddress]; + require(tokenInfo.balance >= amount, "Insufficient balance"); + + // Обновляем баланс + _updateTokenBalance(tokenAddress, tokenInfo.balance - amount); + + // Выполняем перевод + if (tokenInfo.isNative) { + payable(recipient).sendValue(amount); + } else { + IERC20(tokenAddress).safeTransfer(recipient, amount); + } + + totalTransactions++; + tokenTransactionCount[tokenAddress]++; + + emit FundsTransferred( + tokenAddress, + recipient, + amount, + tokenInfo.balance, + proposalId + ); + } + + /** + * @dev Выполнить batch перевод (только через DLE governance) + * @param transfers Массив переводов + * @param proposalId ID предложения DLE + */ + function batchTransfer( + BatchTransfer[] memory transfers, + bytes32 proposalId + ) external onlyDLE whenNotPaused nonReentrant { + require(transfers.length > 0, "No transfers provided"); + require(transfers.length <= 100, "Too many transfers"); // Защита от DoS + + uint256 totalAmount = 0; + + for (uint256 i = 0; i < transfers.length; i++) { + BatchTransfer memory transfer = transfers[i]; + + require(transfer.recipient != address(0), "Recipient cannot be zero"); + require(transfer.amount > 0, "Amount must be positive"); + require(supportedTokens[transfer.tokenAddress].isActive, "Token not supported"); + + TokenInfo storage tokenInfo = supportedTokens[transfer.tokenAddress]; + require(tokenInfo.balance >= transfer.amount, "Insufficient balance"); + + // Обновляем баланс + _updateTokenBalance(transfer.tokenAddress, tokenInfo.balance - transfer.amount); + + // Выполняем перевод + if (tokenInfo.isNative) { + payable(transfer.recipient).sendValue(transfer.amount); + } else { + IERC20(transfer.tokenAddress).safeTransfer(transfer.recipient, transfer.amount); + } + + totalAmount += transfer.amount; + tokenTransactionCount[transfer.tokenAddress]++; + + emit FundsTransferred( + transfer.tokenAddress, + transfer.recipient, + transfer.amount, + tokenInfo.balance, + proposalId + ); + } + + totalTransactions += transfers.length; + emit BatchTransferExecuted(transfers.length, totalAmount, proposalId); + } + + /** + * @dev Пополнить казну ERC20 токенами + * @param tokenAddress Адрес токена + * @param amount Количество для пополнения + */ + function depositToken( + address tokenAddress, + uint256 amount + ) external whenNotPaused validToken(tokenAddress) nonReentrant { + require(amount > 0, "Amount must be positive"); + require(tokenAddress != address(0), "Use receive() for native deposits"); + + IERC20(tokenAddress).safeTransferFrom(msg.sender, address(this), amount); + + _updateTokenBalance(tokenAddress, supportedTokens[tokenAddress].balance + amount); + + emit FundsDeposited(tokenAddress, msg.sender, amount, supportedTokens[tokenAddress].balance); + } + + /** + * @dev Обновить баланс токена (синхронизация с реальным балансом) + * @param tokenAddress Адрес токена + */ + function refreshBalance(address tokenAddress) external validToken(tokenAddress) { + _refreshTokenBalance(tokenAddress); + } + + /** + * @dev Обновить балансы всех токенов + */ + function refreshAllBalances() external { + for (uint256 i = 0; i < tokenList.length; i++) { + if (supportedTokens[tokenList[i]].isActive) { + _refreshTokenBalance(tokenList[i]); + } + } + } + + /** + * @dev Экстренная пауза (только emergency admin) + */ + function emergencyPause() external onlyEmergencyAdmin { + emergencyPaused = !emergencyPaused; + emit EmergencyPauseToggled(emergencyPaused, msg.sender); + } + + // ===== VIEW ФУНКЦИИ ===== + + /** + * @dev Получить информацию о токене + */ + function getTokenInfo(address tokenAddress) external view returns (TokenInfo memory) { + return supportedTokens[tokenAddress]; + } + + /** + * @dev Получить список всех токенов + */ + function getAllTokens() external view returns (address[] memory) { + return tokenList; + } + + /** + * @dev Получить активные токены + */ + function getActiveTokens() external view returns (address[] memory) { + uint256 activeCount = 0; + + // Считаем активные токены + for (uint256 i = 0; i < tokenList.length; i++) { + if (supportedTokens[tokenList[i]].isActive) { + activeCount++; + } + } + + // Создаём массив активных токенов + address[] memory activeTokens = new address[](activeCount); + uint256 index = 0; + + for (uint256 i = 0; i < tokenList.length; i++) { + if (supportedTokens[tokenList[i]].isActive) { + activeTokens[index] = tokenList[i]; + index++; + } + } + + return activeTokens; + } + + /** + * @dev Получить баланс токена + */ + function getTokenBalance(address tokenAddress) external view returns (uint256) { + return supportedTokens[tokenAddress].balance; + } + + /** + * @dev Получить реальный баланс токена (обращение к блокчейну) + */ + function getRealTokenBalance(address tokenAddress) external view returns (uint256) { + if (tokenAddress == address(0)) { + return address(this).balance; + } else { + return IERC20(tokenAddress).balanceOf(address(this)); + } + } + + /** + * @dev Проверить, поддерживается ли токен + */ + function isTokenSupported(address tokenAddress) external view returns (bool) { + return supportedTokens[tokenAddress].isActive; + } + + /** + * @dev Получить статистику казны + */ + function getTreasuryStats() external view returns ( + uint256 totalTokens, + uint256 totalTxs, + uint256 currentChainId, + bool isPaused + ) { + return ( + totalTokensSupported, + totalTransactions, + chainId, + emergencyPaused + ); + } + + // ===== ВНУТРЕННИЕ ФУНКЦИИ ===== + + /** + * @dev Автоматически добавить нативную монету + */ + function _addNativeToken() internal { + string memory nativeSymbol; + + // Определяем символ нативной монеты по chain ID + if (chainId == 1 || chainId == 11155111) { // Ethereum Mainnet / Sepolia + nativeSymbol = "ETH"; + } else if (chainId == 56 || chainId == 97) { // BSC Mainnet / Testnet + nativeSymbol = "BNB"; + } else if (chainId == 137 || chainId == 80001) { // Polygon Mainnet / Mumbai + nativeSymbol = "MATIC"; + } else if (chainId == 42161) { // Arbitrum One + nativeSymbol = "ETH"; + } else if (chainId == 10) { // Optimism + nativeSymbol = "ETH"; + } else if (chainId == 43114) { // Avalanche + nativeSymbol = "AVAX"; + } else { + nativeSymbol = "NATIVE"; // Для неизвестных сетей + } + + supportedTokens[address(0)] = TokenInfo({ + tokenAddress: address(0), + symbol: nativeSymbol, + decimals: 18, + isActive: true, + isNative: true, + addedTimestamp: block.timestamp, + balance: 0 + }); + + tokenList.push(address(0)); + tokenIndex[address(0)] = 0; + totalTokensSupported = 1; + + emit TokenAdded(address(0), nativeSymbol, 18, true, block.timestamp); + } + + /** + * @dev Обновить кэшированный баланс токена + */ + function _updateTokenBalance(address tokenAddress, uint256 newBalance) internal { + uint256 oldBalance = supportedTokens[tokenAddress].balance; + supportedTokens[tokenAddress].balance = newBalance; + emit BalanceUpdated(tokenAddress, oldBalance, newBalance); + } + + /** + * @dev Синхронизировать кэшированный баланс с реальным + */ + function _refreshTokenBalance(address tokenAddress) internal { + uint256 realBalance; + + if (tokenAddress == address(0)) { + realBalance = address(this).balance; + } else { + realBalance = IERC20(tokenAddress).balanceOf(address(this)); + } + + _updateTokenBalance(tokenAddress, realBalance); + } +} diff --git a/backend/hardhat.config.js b/backend/hardhat.config.js index c22883d..eb46a17 100644 --- a/backend/hardhat.config.js +++ b/backend/hardhat.config.js @@ -11,6 +11,7 @@ */ require('@nomicfoundation/hardhat-toolbox'); +require('hardhat-contract-sizer'); require('dotenv').config(); function getNetworks() { @@ -39,10 +40,25 @@ module.exports = { settings: { optimizer: { enabled: true, - runs: 200 + runs: 1 // Максимальная оптимизация размера для mainnet }, viaIR: true } }, + contractSizer: { + alphaSort: true, + runOnCompile: true, + disambiguatePaths: false, + }, networks: getNetworks(), + solidityCoverage: { + excludeContracts: [], + skipFiles: [], + // Исключаем строки с revert функциями из покрытия + excludeLines: [ + '// coverage:ignore-line', + 'revert ErrTransfersDisabled();', + 'revert ErrApprovalsDisabled();' + ] + } }; diff --git a/backend/nodemon.json b/backend/nodemon.json index 29bab23..0555e4b 100644 --- a/backend/nodemon.json +++ b/backend/nodemon.json @@ -1,9 +1,15 @@ { - "verbose": true, - "ignore": [".git", "node_modules/**/node_modules", "sessions", "data/vector_store", "logs"], - "watch": ["*.js", "routes/**/*", "services/**/*", "utils/**/*", "middleware/**/*"], - "env": { - "NODE_ENV": "development" - }, - "ext": "js,json,env" -} + "watch": [ + "backend/src", + "backend/routes", + "backend/services" + ], + "ignore": [ + "backend/artifacts/**", + "backend/cache/**", + "backend/contracts-data/**", + "backend/temp/**", + "backend/scripts/deploy/current-params*.json" + ], + "ext": "js,json" +} \ No newline at end of file diff --git a/backend/package.json b/backend/package.json index da444a1..626c456 100644 --- a/backend/package.json +++ b/backend/package.json @@ -20,7 +20,10 @@ "format": "prettier --write \"**/*.{js,vue,json,md}\"", "format:check": "prettier --check \"**/*.{js,vue,json,md}\"", "run-migrations": "node scripts/run-migrations.js", - "fix-duplicates": "node scripts/fix-duplicate-identities.js" + "fix-duplicates": "node scripts/fix-duplicate-identities.js", + "deploy:factory": "node scripts/deploy/deploy-factory.js", + "deploy:multichain": "node scripts/deploy/deploy-multichain.js", + "deploy:complete": "node scripts/deploy/deploy-dle-complete.js" }, "dependencies": { "@anthropic-ai/sdk": "^0.51.0", @@ -81,10 +84,11 @@ "eslint-config-prettier": "^10.0.2", "globals": "^16.0.0", "hardhat": "^2.24.1", + "hardhat-contract-sizer": "^2.10.1", "hardhat-gas-reporter": "^2.2.2", "nodemon": "^3.1.9", "prettier": "^3.5.3", - "solidity-coverage": "^0.8.1", + "solidity-coverage": "^0.8.16", "ts-node": ">=8.0.0", "typechain": "^8.3.0", "typescript": ">=4.5.0" diff --git a/backend/routes/blockchain.js b/backend/routes/blockchain.js index 5476c7d..d087cf4 100644 --- a/backend/routes/blockchain.js +++ b/backend/routes/blockchain.js @@ -29,20 +29,38 @@ router.post('/read-dle-info', async (req, res) => { console.log(`[Blockchain] Чтение данных DLE из блокчейна: ${dleAddress}`); - // Получаем RPC URL для Sepolia - const rpcUrl = await rpcProviderService.getRpcUrlByChainId(11155111); - if (!rpcUrl) { - return res.status(500).json({ - success: false, - error: 'RPC URL для Sepolia не найден' - }); + // Определяем корректную сеть для данного адреса (или используем chainId из запроса) + let provider, rpcUrl, targetChainId = req.body.chainId; + const candidateChainIds = [11155111, 17000, 421614, 84532]; + if (targetChainId) { + rpcUrl = await rpcProviderService.getRpcUrlByChainId(Number(targetChainId)); + if (!rpcUrl) { + return res.status(500).json({ success: false, error: `RPC URL для сети ${targetChainId} не найден` }); + } + provider = new ethers.JsonRpcProvider(rpcUrl); + const code = await provider.getCode(dleAddress); + if (!code || code === '0x') { + return res.status(400).json({ success: false, error: `По адресу ${dleAddress} нет контракта в сети ${targetChainId}` }); + } + } else { + for (const cid of candidateChainIds) { + try { + const url = await rpcProviderService.getRpcUrlByChainId(cid); + if (!url) continue; + const prov = new ethers.JsonRpcProvider(url); + const code = await prov.getCode(dleAddress); + if (code && code !== '0x') { provider = prov; rpcUrl = url; targetChainId = cid; break; } + } catch (_) {} + } + if (!provider) { + return res.status(400).json({ success: false, error: 'Не удалось найти сеть, где по адресу есть контракт' }); + } } - - const provider = new ethers.JsonRpcProvider(rpcUrl); // ABI для чтения данных DLE const dleAbi = [ - "function getDLEInfo() external view returns (tuple(string name, string symbol, string location, string coordinates, uint256 jurisdiction, uint256 oktmo, string[] okvedCodes, uint256 kpp, uint256 creationTimestamp, bool isActive))", + // Актуальная сигнатура без oktmo + "function getDLEInfo() external view returns (tuple(string name, string symbol, string location, string coordinates, uint256 jurisdiction, string[] okvedCodes, uint256 kpp, uint256 creationTimestamp, bool isActive))", "function totalSupply() external view returns (uint256)", "function balanceOf(address account) external view returns (uint256)", "function quorumPercentage() external view returns (uint256)", @@ -81,7 +99,8 @@ router.post('/read-dle-info', async (req, res) => { location: dleInfo.location, coordinates: dleInfo.coordinates, jurisdiction: Number(dleInfo.jurisdiction), - oktmo: Number(dleInfo.oktmo), + // Поле oktmo удалено в актуальной версии контракта; сохраняем 0 для обратной совместимости + oktmo: 0, okvedCodes: dleInfo.okvedCodes, kpp: Number(dleInfo.kpp), creationTimestamp: Number(dleInfo.creationTimestamp), @@ -90,6 +109,7 @@ router.post('/read-dle-info', async (req, res) => { deployerBalance: ethers.formatUnits(deployerBalance, 18), quorumPercentage: Number(quorumPercentage), currentChainId: Number(currentChainId), + rpcUsed: rpcUrl, participantCount: participantCount }; @@ -153,6 +173,10 @@ router.post('/get-supported-chains', async (req, res) => { { chainId: 43114, name: 'Avalanche', description: 'Avalanche C-Chain' }, { chainId: 250, name: 'Fantom', description: 'Fantom Opera' }, { chainId: 11155111, name: 'Sepolia', description: 'Ethereum Testnet Sepolia' }, + { chainId: 17000, name: 'Holesky', description: 'Ethereum Testnet Holesky' }, + { chainId: 80002, name: 'Polygon Amoy', description: 'Polygon Testnet Amoy' }, + { chainId: 84532, name: 'Base Sepolia', description: 'Base Sepolia Testnet' }, + { chainId: 421614, name: 'Arbitrum Sepolia', description: 'Arbitrum Sepolia Testnet' }, { chainId: 80001, name: 'Mumbai', description: 'Polygon Testnet Mumbai' }, { chainId: 97, name: 'BSC Testnet', description: 'Binance Smart Chain Testnet' }, { chainId: 421613, name: 'Arbitrum Goerli', description: 'Arbitrum Testnet Goerli' } diff --git a/backend/routes/compile.js b/backend/routes/compile.js new file mode 100644 index 0000000..d0ded71 --- /dev/null +++ b/backend/routes/compile.js @@ -0,0 +1,83 @@ +/** + * Copyright (c) 2024-2025 Тарабанов Александр Викторович + * All rights reserved. + * + * This software is proprietary and confidential. + * Unauthorized copying, modification, or distribution is prohibited. + * + * For licensing inquiries: info@hb3-accelerator.com + * Website: https://hb3-accelerator.com + * GitHub: https://github.com/HB3-ACCELERATOR + */ + +const express = require('express'); +const router = express.Router(); +const { spawn } = require('child_process'); +const path = require('path'); +const logger = require('../utils/logger'); +const auth = require('../middleware/auth'); + +/** + * @route POST /api/compile-contracts + * @desc Компилировать смарт-контракты через Hardhat + * @access Private (только для авторизованных пользователей с ролью admin) + */ +router.post('/', auth.requireAuth, auth.requireAdmin, async (req, res) => { + try { + console.log('🔨 Запуск компиляции смарт-контрактов...'); + + const hardhatProcess = spawn('npx', ['hardhat', 'compile'], { + cwd: path.join(__dirname, '..'), + stdio: 'pipe' + }); + + let stdout = ''; + let stderr = ''; + + hardhatProcess.stdout.on('data', (data) => { + stdout += data.toString(); + console.log(`[COMPILE] ${data.toString().trim()}`); + }); + + hardhatProcess.stderr.on('data', (data) => { + stderr += data.toString(); + console.error(`[COMPILE_ERR] ${data.toString().trim()}`); + }); + + hardhatProcess.on('close', (code) => { + if (code === 0) { + console.log('✅ Компиляция завершена успешно'); + res.json({ + success: true, + message: 'Смарт-контракты скомпилированы успешно', + data: { stdout, stderr } + }); + } else { + console.error('❌ Ошибка компиляции:', stderr); + res.status(500).json({ + success: false, + message: 'Ошибка компиляции смарт-контрактов', + error: stderr + }); + } + }); + + hardhatProcess.on('error', (error) => { + console.error('❌ Ошибка запуска компиляции:', error); + res.status(500).json({ + success: false, + message: 'Ошибка запуска компиляции', + error: error.message + }); + }); + + } catch (error) { + logger.error('Ошибка компиляции контрактов:', error); + res.status(500).json({ + success: false, + message: error.message || 'Произошла ошибка при компиляции контрактов' + }); + } +}); + +module.exports = router; diff --git a/backend/routes/dleV2.js b/backend/routes/dleV2.js index 83bc55c..374a5c5 100644 --- a/backend/routes/dleV2.js +++ b/backend/routes/dleV2.js @@ -357,14 +357,12 @@ router.post('/predict-addresses', auth.requireAuth, auth.requireAdmin, async (re } // Используем служебные секреты для фабрики и SALT - // Ожидаем, что на сервере настроены переменные окружения или конфиги на сеть + // Factory больше не используется - адреса DLE теперь вычисляются через CREATE с выровненным nonce const result = {}; for (const chainId of selectedNetworks) { - const factory = process.env[`FACTORY_ADDRESS_${chainId}`] || process.env.FACTORY_ADDRESS; - const saltHex = process.env[`CREATE2_SALT_${chainId}`] || process.env.CREATE2_SALT; - const initCodeHash = process.env[`INIT_CODE_HASH_${chainId}`] || process.env.INIT_CODE_HASH; - if (!factory || !saltHex || !initCodeHash) continue; - result[chainId] = create2.computeCreate2Address(factory, saltHex, initCodeHash); + // Адрес DLE будет одинаковым во всех сетях благодаря выравниванию nonce + // Вычисляется в deploy-multichain.js во время деплоя + result[chainId] = 'Вычисляется во время деплоя'; } return res.json({ success: true, data: result }); @@ -513,4 +511,5 @@ router.post('/precheck', auth.requireAuth, auth.requireAdmin, async (req, res) = } catch (e) { return res.status(500).json({ success: false, message: e.message }); } -}); \ No newline at end of file +}); + diff --git a/backend/routes/ens.js b/backend/routes/ens.js new file mode 100644 index 0000000..eac48a3 --- /dev/null +++ b/backend/routes/ens.js @@ -0,0 +1,30 @@ +/** + * ENS utilities: resolve avatar URL for a given ENS name + */ +const express = require('express'); +const router = express.Router(); +const { ethers } = require('ethers'); + +function getMainnetProvider() { + const url = process.env.MAINNET_RPC_URL || process.env.ETH_MAINNET_RPC || 'https://ethereum.publicnode.com'; + return new ethers.JsonRpcProvider(url); +} + +// GET /api/ens/avatar?name=vc-hb3-accelerator.eth +router.get('/avatar', async (req, res) => { + try { + const name = String(req.query.name || '').trim(); + if (!name || !name.endsWith('.eth')) { + return res.status(400).json({ success: false, message: 'ENS name is required (e.g., example.eth)' }); + } + const provider = getMainnetProvider(); + const url = await provider.getAvatar(name); + return res.json({ success: true, data: { url: url || null } }); + } catch (e) { + return res.status(500).json({ success: false, message: e.message }); + } +}); + +module.exports = router; + + diff --git a/backend/routes/uploads.js b/backend/routes/uploads.js new file mode 100644 index 0000000..1e54d03 --- /dev/null +++ b/backend/routes/uploads.js @@ -0,0 +1,51 @@ +/** + * Загрузка файлов (логотипы) через Multer + */ +const express = require('express'); +const path = require('path'); +const fs = require('fs'); +const multer = require('multer'); +const auth = require('../middleware/auth'); + +const router = express.Router(); + +// Хранилище на диске: uploads/logos +const storage = multer.diskStorage({ + destination: function (req, file, cb) { + const dir = path.join(__dirname, '..', 'uploads', 'logos'); + try { fs.mkdirSync(dir, { recursive: true }); } catch (_) {} + cb(null, dir); + }, + filename: function (req, file, cb) { + const ext = (file.originalname || '').split('.').pop(); + const safeExt = ext && ext.length <= 10 ? ext : 'png'; + const name = `logo_${Date.now()}_${Math.random().toString(36).slice(2, 8)}.${safeExt}`; + cb(null, name); + } +}); + +const upload = multer({ + storage, + limits: { fileSize: 5 * 1024 * 1024 }, + fileFilter: (req, file, cb) => { + const ok = /(png|jpg|jpeg|gif|webp)$/i.test(file.originalname || '') && /^image\//i.test(file.mimetype || ''); + if (!ok) return cb(new Error('Only image files are allowed')); + cb(null, true); + } +}); + +// POST /api/uploads/logo (form field: logo) +router.post('/logo', auth.requireAuth, auth.requireAdmin, upload.single('logo'), async (req, res) => { + try { + if (!req.file) return res.status(400).json({ success: false, message: 'Файл не получен' }); + const rel = path.posix.join('uploads', 'logos', path.basename(req.file.filename)); + const urlPath = `/uploads/logos/${path.basename(req.file.filename)}`; + return res.json({ success: true, data: { path: rel, url: urlPath } }); + } catch (e) { + return res.status(500).json({ success: false, message: e.message }); + } +}); + +module.exports = router; + + diff --git a/backend/scripts/deploy/create-dle-v2.js b/backend/scripts/deploy/create-dle-v2.js deleted file mode 100644 index 8c23ec0..0000000 --- a/backend/scripts/deploy/create-dle-v2.js +++ /dev/null @@ -1,299 +0,0 @@ -/* eslint-disable no-console */ -const hre = require('hardhat'); - -async function main() { - const { ethers } = hre; - const rpcUrl = process.env.RPC_URL; - const pk = process.env.PRIVATE_KEY; - if (!rpcUrl || !pk) throw new Error('RPC_URL/PRIVATE_KEY required'); - - const provider = new ethers.JsonRpcProvider(rpcUrl); - const wallet = new ethers.Wallet(pk, provider); - - const salt = process.env.CREATE2_SALT; - const initCodeHash = process.env.INIT_CODE_HASH; - let factoryAddress = process.env.FACTORY_ADDRESS; - - if (!salt || !initCodeHash) throw new Error('CREATE2_SALT/INIT_CODE_HASH required'); - - // Ensure factory - if (!factoryAddress) { - const Factory = await hre.ethers.getContractFactory('FactoryDeployer', wallet); - const factory = await Factory.deploy(); - await factory.waitForDeployment(); - factoryAddress = await factory.getAddress(); - } else { - const code = await provider.getCode(factoryAddress); - if (code === '0x') { - const Factory = await hre.ethers.getContractFactory('FactoryDeployer', wallet); - const factory = await Factory.deploy(); - await factory.waitForDeployment(); - factoryAddress = await factory.getAddress(); - } - } - - // Prepare DLE init code = creation bytecode WITH constructor args - const DLE = await hre.ethers.getContractFactory('DLE', wallet); - const paramsPath = require('path').join(__dirname, './current-params.json'); - const params = require(paramsPath); - const dleConfig = { - name: params.name, - symbol: params.symbol, - location: params.location, - coordinates: params.coordinates, - jurisdiction: params.jurisdiction, - okvedCodes: params.okvedCodes || [], - kpp: params.kpp, - quorumPercentage: params.quorumPercentage, - initialPartners: params.initialPartners, - initialAmounts: params.initialAmounts, - supportedChainIds: params.supportedChainIds - }; - const deployTx = await DLE.getDeployTransaction(dleConfig, params.currentChainId); - const dleInit = deployTx.data; // полноценный init code - - // Deploy via factory - const Factory = await hre.ethers.getContractAt('FactoryDeployer', factoryAddress, wallet); - const tx = await Factory.deploy(salt, dleInit); - const rc = await tx.wait(); - const addr = rc.logs?.[0]?.args?.addr || (await Factory.computeAddress(salt, initCodeHash)); - console.log('DLE v2 задеплоен по адресу:', addr); -} - -main().catch((e) => { - console.error(e); - process.exit(1); -}); - -/** - * Copyright (c) 2024-2025 Тарабанов Александр Викторович - * All rights reserved. - * - * This software is proprietary and confidential. - * Unauthorized copying, modification, or distribution is prohibited. - * - * For licensing inquiries: info@hb3-accelerator.com - * Website: https://hb3-accelerator.com - * GitHub: https://github.com/HB3-ACCELERATOR - */ - -// Скрипт для создания современного DLE v2 (единый контракт) -const { ethers } = require("hardhat"); -const fs = require("fs"); -const path = require("path"); - -async function main() { - // Получаем параметры деплоя из файла - const deployParams = getDeployParams(); - - console.log("Начинаем создание современного DLE v2..."); - console.log("Параметры DLE:"); - console.log(JSON.stringify(deployParams, null, 2)); - - // Преобразуем initialAmounts в wei - const initialAmountsInWei = deployParams.initialAmounts.map(amount => ethers.parseUnits(amount.toString(), 18)); - console.log("Initial amounts в wei:"); - console.log(initialAmountsInWei.map(wei => ethers.formatUnits(wei, 18) + " токенов")); - - // Получаем RPC URL и приватный ключ из переменных окружения - const rpcUrl = process.env.RPC_URL; - const privateKey = process.env.PRIVATE_KEY; - - if (!rpcUrl || !privateKey) { - throw new Error('RPC_URL и PRIVATE_KEY должны быть установлены в переменных окружения'); - } - - // Создаем провайдер и кошелек - const provider = new ethers.JsonRpcProvider(rpcUrl); - const deployer = new ethers.Wallet(privateKey, provider); - - console.log(`Адрес деплоера: ${deployer.address}`); - const balance = await provider.getBalance(deployer.address); - console.log(`Баланс деплоера: ${ethers.formatEther(balance)} ETH`); - - // Проверяем, достаточно ли баланса для деплоя (минимум 0.00001 ETH для тестирования) - const minBalance = ethers.parseEther("0.00001"); - if (balance < minBalance) { - throw new Error(`Недостаточно ETH для деплоя. Баланс: ${ethers.formatEther(balance)} ETH, требуется минимум: ${ethers.formatEther(minBalance)} ETH. Пополните кошелек через Sepolia faucet.`); - } - - try { - // 1. Создаем единый контракт DLE - console.log("\n1. Деплой единого контракта DLE v2..."); - - const DLE = await ethers.getContractFactory("DLE", deployer); - - // Создаем структуру DLEConfig с полными данными - const dleConfig = { - name: deployParams.name, - symbol: deployParams.symbol, - location: deployParams.location, - coordinates: deployParams.coordinates || "0,0", - jurisdiction: deployParams.jurisdiction || 1, - oktmo: parseInt(deployParams.oktmo) || 45000000000, - okvedCodes: deployParams.okvedCodes || [], - kpp: parseInt(deployParams.kpp) || 770101001, - quorumPercentage: deployParams.quorumPercentage || 51, - initialPartners: deployParams.initialPartners, - initialAmounts: deployParams.initialAmounts.map(amount => ethers.parseUnits(amount.toString(), 18)), - supportedChainIds: deployParams.supportedChainIds || [1, 137, 56, 42161] // Ethereum, Polygon, BSC, Arbitrum - }; - - console.log("Конфигурация DLE для записи в блокчейн:"); - console.log("Название:", dleConfig.name); - console.log("Символ:", dleConfig.symbol); - console.log("Местонахождение:", dleConfig.location); - console.log("Координаты:", dleConfig.coordinates); - console.log("Юрисдикция:", dleConfig.jurisdiction); - console.log("ОКТМО:", dleConfig.oktmo); - console.log("Коды ОКВЭД:", dleConfig.okvedCodes.join(', ')); - console.log("КПП:", dleConfig.kpp); - console.log("Кворум:", dleConfig.quorumPercentage + "%"); - console.log("Партнеры:", dleConfig.initialPartners.join(', ')); - console.log("Количества токенов:", dleConfig.initialAmounts.map(amount => ethers.formatUnits(amount, 18) + " токенов").join(', ')); - console.log("Поддерживаемые сети:", dleConfig.supportedChainIds.join(', ')); - - const currentChainId = deployParams.currentChainId || 1; // По умолчанию Ethereum - - const dle = await DLE.deploy(dleConfig, currentChainId); - - await dle.waitForDeployment(); - const dleAddress = await dle.getAddress(); - console.log(`DLE v2 задеплоен по адресу: ${dleAddress}`); - - // 2. Получаем информацию о DLE из блокчейна - const dleInfo = await dle.getDLEInfo(); - console.log("\n2. Информация о DLE из блокчейна:"); - console.log(`Название: ${dleInfo.name}`); - console.log(`Символ: ${dleInfo.symbol}`); - console.log(`Местонахождение: ${dleInfo.location}`); - console.log(`Координаты: ${dleInfo.coordinates}`); - console.log(`Юрисдикция: ${dleInfo.jurisdiction}`); - console.log(`ОКТМО: ${dleInfo.oktmo}`); - console.log(`Коды ОКВЭД: ${dleInfo.okvedCodes.join(', ')}`); - console.log(`КПП: ${dleInfo.kpp}`); - console.log(`Дата создания: ${new Date(Number(dleInfo.creationTimestamp) * 1000).toISOString()}`); - console.log(`Активен: ${dleInfo.isActive}`); - - // Проверяем, что данные записались правильно - console.log("\n3. Проверка записи данных в блокчейн:"); - if (dleInfo.name === deployParams.name && - dleInfo.location === deployParams.location && - dleInfo.jurisdiction === deployParams.jurisdiction) { - console.log("✅ Все данные DLE успешно записаны в блокчейн!"); - console.log("Теперь эти данные видны на Etherscan в разделе 'Contract' -> 'Read Contract'"); - } else { - console.log("❌ Ошибка: данные не записались правильно в блокчейн"); - } - - // 4. Сохраняем информацию о созданном DLE - console.log("\n4. Сохранение информации о DLE v2..."); - const dleData = { - name: deployParams.name, - symbol: deployParams.symbol, - location: deployParams.location, - coordinates: deployParams.coordinates || "0,0", - jurisdiction: deployParams.jurisdiction || 1, - oktmo: deployParams.oktmo || 45000000000, - okvedCodes: deployParams.okvedCodes || [], - kpp: deployParams.kpp || 770101001, - dleAddress: dleAddress, - creationBlock: Number(await provider.getBlockNumber()), - creationTimestamp: Number((await provider.getBlock()).timestamp), - deployedManually: true, - version: "v2", - // Сохраняем информацию о партнерах - initialPartners: deployParams.initialPartners || [], - initialAmounts: deployParams.initialAmounts || [], - governanceSettings: { - quorumPercentage: deployParams.quorumPercentage || 51, - supportedChainIds: deployParams.supportedChainIds || [1, 137, 56, 42161], - currentChainId: currentChainId - } - }; - - const saveResult = saveDLEData(dleData); - - console.log("\nDLE v2 успешно создан!"); - console.log(`Адрес DLE: ${dleAddress}`); - console.log(`Версия: v2 (единый контракт)`); - - return { - success: true, - dleAddress: dleAddress, - data: dleData - }; - - } catch (error) { - console.error("Ошибка при создании DLE v2:", error); - throw error; - } -} - -// Получаем параметры деплоя из файла -function getDeployParams() { - const paramsFile = path.join(__dirname, 'current-params.json'); - - if (!fs.existsSync(paramsFile)) { - console.error(`Файл параметров не найден: ${paramsFile}`); - process.exit(1); - } - - try { - const params = JSON.parse(fs.readFileSync(paramsFile, 'utf8')); - console.log("Параметры загружены из файла"); - return params; - } catch (error) { - console.error("Ошибка при чтении файла параметров:", error); - process.exit(1); - } -} - -// Сохраняем информацию о созданном DLE -function saveDLEData(dleData) { - const dlesDir = path.join(__dirname, "../../contracts-data/dles"); - - // Проверяем существование директории и создаем при необходимости - try { - if (!fs.existsSync(dlesDir)) { - console.log(`Директория ${dlesDir} не существует, создаю...`); - fs.mkdirSync(dlesDir, { recursive: true }); - console.log(`Директория ${dlesDir} успешно создана`); - } - - // Проверяем права на запись, создавая временный файл - const testFile = path.join(dlesDir, '.write-test'); - fs.writeFileSync(testFile, 'test'); - fs.unlinkSync(testFile); - console.log(`Директория ${dlesDir} доступна для записи`); - - } catch (error) { - console.error(`Ошибка при проверке директории ${dlesDir}:`, error); - throw error; - } - - // Создаем уникальное имя файла - const timestamp = new Date().toISOString().replace(/[:.]/g, '-'); - const fileName = `dle-v2-${timestamp}.json`; - const filePath = path.join(dlesDir, fileName); - - try { - fs.writeFileSync(filePath, JSON.stringify(dleData, null, 2)); - console.log(`Информация о DLE сохранена в файл: ${fileName}`); - return { success: true, filePath }; - } catch (error) { - console.error(`Ошибка при сохранении файла ${filePath}:`, error); - throw error; - } -} - -// Запускаем скрипт -main() - .then(() => { - console.log("Скрипт завершен успешно"); - process.exit(0); - }) - .catch((error) => { - console.error("Скрипт завершен с ошибкой:", error); - process.exit(1); - }); \ No newline at end of file diff --git a/backend/scripts/deploy/deploy-multichain.js b/backend/scripts/deploy/deploy-multichain.js index a99478a..44b1f7b 100644 --- a/backend/scripts/deploy/deploy-multichain.js +++ b/backend/scripts/deploy/deploy-multichain.js @@ -1,6 +1,7 @@ /* eslint-disable no-console */ const hre = require('hardhat'); const path = require('path'); +const fs = require('fs'); // Подбираем безопасные gas/fee для разных сетей (включая L2) async function getFeeOverrides(provider, { minPriorityGwei = 1n, minFeeGwei = 20n } = {}) { @@ -19,7 +20,7 @@ async function getFeeOverrides(provider, { minPriorityGwei = 1n, minFeeGwei = 20 return overrides; } -async function deployInNetwork(rpcUrl, pk, salt, initCodeHash, targetFactoryNonce, dleInit) { +async function deployInNetwork(rpcUrl, pk, salt, initCodeHash, targetDLENonce, dleInit) { const { ethers } = hre; const provider = new ethers.JsonRpcProvider(rpcUrl); const wallet = new ethers.Wallet(pk, provider); @@ -30,7 +31,7 @@ async function deployInNetwork(rpcUrl, pk, salt, initCodeHash, targetFactoryNonc const calcInitHash = ethers.keccak256(dleInit); const saltLen = ethers.getBytes(salt).length; console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} rpc=${rpcUrl}`); - console.log(`[MULTI_DBG] wallet=${wallet.address} targetFactoryNonce=${targetFactoryNonce}`); + console.log(`[MULTI_DBG] wallet=${wallet.address} targetDLENonce=${targetDLENonce}`); console.log(`[MULTI_DBG] saltLenBytes=${saltLen} salt=${salt}`); console.log(`[MULTI_DBG] initCodeHash(provided)=${initCodeHash}`); console.log(`[MULTI_DBG] initCodeHash(calculated)=${calcInitHash}`); @@ -39,170 +40,195 @@ async function deployInNetwork(rpcUrl, pk, salt, initCodeHash, targetFactoryNonc console.log('[MULTI_DBG] precheck error', e?.message || e); } - // 1) Выравнивание nonce до targetFactoryNonce нулевыми транзакциями (если нужно) + // 1) Выравнивание nonce до targetDLENonce нулевыми транзакциями (если нужно) let current = await provider.getTransactionCount(wallet.address, 'pending'); - if (current > targetFactoryNonce) { - throw new Error(`Current nonce ${current} > targetFactoryNonce ${targetFactoryNonce} on chainId=${Number(net.chainId)}`); + console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} current nonce=${current} target=${targetDLENonce}`); + + if (current > targetDLENonce) { + throw new Error(`Current nonce ${current} > targetDLENonce ${targetDLENonce} on chainId=${Number(net.chainId)}`); } - while (current < targetFactoryNonce) { - const overrides = await getFeeOverrides(provider); - let gasLimit = 50000; // некоторые L2 требуют >21000 - let sent = false; - let lastErr = null; - for (let attempt = 0; attempt < 2 && !sent; attempt++) { - try { - const txReq = { - to: wallet.address, - value: 0n, - nonce: current, - gasLimit, - ...overrides - }; - const txFill = await wallet.sendTransaction(txReq); - await txFill.wait(); - sent = true; - } catch (e) { - lastErr = e; - if (String(e?.message || '').toLowerCase().includes('intrinsic gas too low') && attempt === 0) { - gasLimit = 100000; // поднимаем лимит и пробуем ещё раз - continue; + + if (current < targetDLENonce) { + console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} aligning nonce from ${current} to ${targetDLENonce} (${targetDLENonce - current} transactions needed)`); + + // Используем burn address для более надежных транзакций + const burnAddress = "0x000000000000000000000000000000000000dEaD"; + + while (current < targetDLENonce) { + const overrides = await getFeeOverrides(provider); + let gasLimit = 21000; // минимальный gas для обычной транзакции + let sent = false; + let lastErr = null; + + for (let attempt = 0; attempt < 3 && !sent; attempt++) { + try { + const txReq = { + to: burnAddress, // отправляем на burn address вместо своего адреса + value: 0n, + nonce: current, + gasLimit, + ...overrides + }; + console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} sending filler tx nonce=${current} attempt=${attempt + 1}`); + const txFill = await wallet.sendTransaction(txReq); + await txFill.wait(); + console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} filler tx nonce=${current} confirmed`); + sent = true; + } catch (e) { + lastErr = e; + console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} filler tx nonce=${current} attempt=${attempt + 1} failed: ${e?.message || e}`); + + if (String(e?.message || '').toLowerCase().includes('intrinsic gas too low') && attempt < 2) { + gasLimit = 50000; // увеличиваем gas limit + continue; + } + + if (String(e?.message || '').toLowerCase().includes('nonce too low') && attempt < 2) { + // Обновляем nonce и пробуем снова + current = await provider.getTransactionCount(wallet.address, 'pending'); + console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} updated nonce to ${current}`); + continue; + } + + throw e; } - throw e; } + + if (!sent) { + console.error(`[MULTI_DBG] chainId=${Number(net.chainId)} failed to send filler tx for nonce=${current}`); + throw lastErr || new Error('filler tx failed'); + } + + current++; } - if (!sent) throw lastErr || new Error('filler tx failed'); - current++; + + console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} nonce alignment completed, current nonce=${current}`); + } else { + console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} nonce already aligned at ${current}`); } - // 2) Деплой FactoryDeployer на согласованном nonce - const FactoryCF = await hre.ethers.getContractFactory('FactoryDeployer', wallet); + // 2) Деплой DLE напрямую на согласованном nonce + console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} deploying DLE directly with nonce=${targetDLENonce}`); + const feeOverrides = await getFeeOverrides(provider); - const factoryContract = await FactoryCF.deploy({ nonce: targetFactoryNonce, ...feeOverrides }); - await factoryContract.waitForDeployment(); - const factoryAddress = await factoryContract.getAddress(); - console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} FactoryDeployer.address=${factoryAddress}`); + let gasLimit; + + try { + // Оцениваем газ для деплоя DLE + const est = await wallet.estimateGas({ data: dleInit, ...feeOverrides }).catch(() => null); + + // Рассчитываем доступный gasLimit из баланса + const balance = await provider.getBalance(wallet.address, 'latest'); + const effPrice = feeOverrides.maxFeePerGas || feeOverrides.gasPrice || 0n; + const reserve = hre.ethers.parseEther('0.005'); + const maxByBalance = effPrice > 0n && balance > reserve ? (balance - reserve) / effPrice : 3_000_000n; + const fallbackGas = maxByBalance > 5_000_000n ? 5_000_000n : (maxByBalance < 2_500_000n ? 2_500_000n : maxByBalance); + gasLimit = est ? (est + est / 5n) : fallbackGas; + + console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} estGas=${est?.toString?.()||'null'} effGasPrice=${effPrice?.toString?.()||'0'} maxByBalance=${maxByBalance.toString()} chosenGasLimit=${gasLimit.toString()}`); + } catch (_) { + gasLimit = 3_000_000n; + } - // 3) Деплой DLE через CREATE2 - const Factory = await hre.ethers.getContractAt('FactoryDeployer', factoryAddress, wallet); - const n = await provider.getTransactionCount(wallet.address, 'pending'); + // Вычисляем предсказанный адрес DLE + const predictedAddress = ethers.getCreateAddress({ + from: wallet.address, + nonce: targetDLENonce + }); + console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} predicted DLE address=${predictedAddress}`); + + // Проверяем, не развернут ли уже контракт + const existingCode = await provider.getCode(predictedAddress); + if (existingCode && existingCode !== '0x') { + console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} DLE already exists at predictedAddress, skip deploy`); + return { address: predictedAddress, chainId: Number(net.chainId) }; + } + + // Деплоим DLE let tx; try { - // Предварительная проверка конструктора вне CREATE2 (даст явную причину, если он ревертится) - try { - await wallet.estimateGas({ data: dleInit }); - console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} predeploy(estGas) ok for constructor`); - } catch (e) { - console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} predeploy(estGas) failed: ${e?.reason || e?.shortMessage || e?.message || e}`); - if (e?.data) console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} predeploy revert data: ${e.data}`); - } - // Оцениваем газ и добавляем запас - const est = await Factory.deploy.estimateGas(salt, dleInit, { nonce: n, ...feeOverrides }).catch(() => null); - // Рассчитываем доступный gasLimit из баланса - let gasLimit; - try { - const balance = await provider.getBalance(wallet.address, 'latest'); - const effPrice = feeOverrides.maxFeePerGas || feeOverrides.gasPrice || 0n; - const reserve = hre.ethers.parseEther('0.005'); - const maxByBalance = effPrice > 0n && balance > reserve ? (balance - reserve) / effPrice : 3_000_000n; - const fallbackGas = maxByBalance > 5_000_000n ? 5_000_000n : (maxByBalance < 2_500_000n ? 2_500_000n : maxByBalance); - gasLimit = est ? (est + est / 5n) : fallbackGas; - console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} estGas=${est?.toString?.()||'null'} effGasPrice=${effPrice?.toString?.()||'0'} maxByBalance=${maxByBalance.toString()} chosenGasLimit=${gasLimit.toString()}`); - } catch (_) { - const fallbackGas = 3_000_000n; - gasLimit = est ? (est + est / 5n) : fallbackGas; - } - // DEBUG: ожидаемый адрес через computeAddress - try { - const predicted = await Factory.computeAddress(salt, initCodeHash); - console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} predictedAddress=${predicted}`); - // Idempotency: если уже есть код по адресу, пропускаем деплой - const code = await provider.getCode(predicted); - if (code && code !== '0x') { - console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} code already exists at predictedAddress, skip deploy`); - return { factory: factoryAddress, address: predicted, chainId: Number(net.chainId) }; - } - } catch (e) { - console.log('[MULTI_DBG] computeAddress(before) error', e?.message || e); - } - tx = await Factory.deploy(salt, dleInit, { nonce: n, gasLimit, ...feeOverrides }); + tx = await wallet.sendTransaction({ + data: dleInit, + nonce: targetDLENonce, + gasLimit, + ...feeOverrides + }); } catch (e) { - const n2 = await provider.getTransactionCount(wallet.address, 'pending'); - const est2 = await Factory.deploy.estimateGas(salt, dleInit, { nonce: n2, ...feeOverrides }).catch(() => null); - let gasLimit2; - try { - const balance2 = await provider.getBalance(wallet.address, 'latest'); - const effPrice2 = feeOverrides.maxFeePerGas || feeOverrides.gasPrice || 0n; - const reserve2 = hre.ethers.parseEther('0.005'); - const maxByBalance2 = effPrice2 > 0n && balance2 > reserve2 ? (balance2 - reserve2) / effPrice2 : 3_000_000n; - const fallbackGas2 = maxByBalance2 > 5_000_000n ? 5_000_000n : (maxByBalance2 < 2_500_000n ? 2_500_000n : maxByBalance2); - gasLimit2 = est2 ? (est2 + est2 / 5n) : fallbackGas2; - console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} RETRY estGas=${est2?.toString?.()||'null'} effGasPrice=${effPrice2?.toString?.()||'0'} maxByBalance=${maxByBalance2.toString()} chosenGasLimit=${gasLimit2.toString()}`); - } catch (_) { - gasLimit2 = est2 ? (est2 + est2 / 5n) : 3_000_000n; - } - console.log(`[MULTI_DBG] retry deploy with nonce=${n2} gasLimit=${gasLimit2?.toString?.() || 'auto'}`); - console.log(`[MULTI_DBG] deploy error(first) ${e?.message || e}`); - tx = await Factory.deploy(salt, dleInit, { nonce: n2, gasLimit: gasLimit2, ...feeOverrides }); + console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} deploy error(first): ${e?.message || e}`); + // Повторная попытка с обновленным nonce + const updatedNonce = await provider.getTransactionCount(wallet.address, 'pending'); + console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} retry deploy with nonce=${updatedNonce}`); + tx = await wallet.sendTransaction({ + data: dleInit, + nonce: updatedNonce, + gasLimit, + ...feeOverrides + }); } + const rc = await tx.wait(); - let addr = rc.logs?.[0]?.args?.addr; - if (!addr) { - try { - addr = await Factory.computeAddress(salt, initCodeHash); - } catch (e) { - console.log('[MULTI_DBG] computeAddress(after) error', e?.message || e); - } - } - console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} deployedAddress=${addr}`); - return { factory: factoryAddress, address: addr, chainId: Number(net.chainId) }; + const deployedAddress = rc.contractAddress || predictedAddress; + + console.log(`[MULTI_DBG] chainId=${Number(net.chainId)} DLE deployed at=${deployedAddress}`); + return { address: deployedAddress, chainId: Number(net.chainId) }; } async function main() { const { ethers } = hre; - const pk = process.env.PRIVATE_KEY; - const salt = process.env.CREATE2_SALT; - const initCodeHash = process.env.INIT_CODE_HASH; - const networks = (process.env.MULTICHAIN_RPC_URLS || '').split(',').map(s => s.trim()).filter(Boolean); - const factories = (process.env.MULTICHAIN_FACTORY_ADDRESSES || '').split(',').map(s => s.trim()); - - if (!pk) throw new Error('Env: PRIVATE_KEY'); - if (!salt) throw new Error('Env: CREATE2_SALT'); - if (!initCodeHash) throw new Error('Env: INIT_CODE_HASH'); - if (networks.length === 0) throw new Error('Env: MULTICHAIN_RPC_URLS'); - - // Prepare init code once + + // Загружаем параметры из файла const paramsPath = path.join(__dirname, './current-params.json'); - const params = require(paramsPath); - const DLE = await hre.ethers.getContractFactory('DLE'); - const dleConfig = { + if (!fs.existsSync(paramsPath)) { + throw new Error('Файл параметров не найден: ' + paramsPath); + } + + const params = JSON.parse(fs.readFileSync(paramsPath, 'utf8')); + console.log('[MULTI_DBG] Загружены параметры:', { name: params.name, symbol: params.symbol, - location: params.location, - coordinates: params.coordinates, - jurisdiction: params.jurisdiction, - oktmo: params.oktmo, + supportedChainIds: params.supportedChainIds, + CREATE2_SALT: params.CREATE2_SALT + }); + + const pk = process.env.PRIVATE_KEY; + const salt = params.CREATE2_SALT; + const networks = params.rpcUrls || []; + + if (!pk) throw new Error('Env: PRIVATE_KEY'); + if (!salt) throw new Error('CREATE2_SALT not found in params'); + if (networks.length === 0) throw new Error('RPC URLs not found in params'); + + // Prepare init code once + const DLE = await hre.ethers.getContractFactory('DLE'); + const dleConfig = { + name: params.name || '', + symbol: params.symbol || '', + location: params.location || '', + coordinates: params.coordinates || '', + jurisdiction: params.jurisdiction || 0, + oktmo: params.oktmo || '', okvedCodes: params.okvedCodes || [], - kpp: params.kpp, - quorumPercentage: params.quorumPercentage, - initialPartners: params.initialPartners, - initialAmounts: params.initialAmounts, - supportedChainIds: params.supportedChainIds + kpp: params.kpp ? BigInt(params.kpp) : 0n, + quorumPercentage: params.quorumPercentage || 51, + initialPartners: params.initialPartners || [], + initialAmounts: (params.initialAmounts || []).map(amount => BigInt(amount)), + supportedChainIds: (params.supportedChainIds || []).map(id => BigInt(id)) }; - const deployTx = await DLE.getDeployTransaction(dleConfig, params.currentChainId); + const deployTx = await DLE.getDeployTransaction(dleConfig, BigInt(params.currentChainId || params.supportedChainIds?.[0] || 1), params.initializer || params.initialPartners?.[0] || "0x0000000000000000000000000000000000000000"); const dleInit = deployTx.data; + const initCodeHash = ethers.keccak256(dleInit); + // DEBUG: глобальные значения try { - const calcInitHash = ethers.keccak256(dleInit); const saltLen = ethers.getBytes(salt).length; console.log(`[MULTI_DBG] GLOBAL saltLenBytes=${saltLen} salt=${salt}`); - console.log(`[MULTI_DBG] GLOBAL initCodeHash(provided)=${initCodeHash}`); - console.log(`[MULTI_DBG] GLOBAL initCodeHash(calculated)=${calcInitHash}`); + console.log(`[MULTI_DBG] GLOBAL initCodeHash(calculated)=${initCodeHash}`); console.log(`[MULTI_DBG] GLOBAL dleInit.lenBytes=${ethers.getBytes(dleInit).length} head16=${dleInit.slice(0, 34)}...`); } catch (e) { console.log('[MULTI_DBG] GLOBAL precheck error', e?.message || e); } - // Подготовим провайдеры и вычислим общий nonce для фабрики + // Подготовим провайдеры и вычислим общий nonce для DLE const providers = networks.map(u => new hre.ethers.JsonRpcProvider(u)); const wallets = providers.map(p => new hre.ethers.Wallet(pk, p)); const nonces = []; @@ -210,15 +236,28 @@ async function main() { const n = await providers[i].getTransactionCount(wallets[i].address, 'pending'); nonces.push(n); } - const targetFactoryNonce = Math.max(...nonces); - console.log(`[MULTI_DBG] nonces=${JSON.stringify(nonces)} targetFactoryNonce=${targetFactoryNonce}`); + const targetDLENonce = Math.max(...nonces); + console.log(`[MULTI_DBG] nonces=${JSON.stringify(nonces)} targetDLENonce=${targetDLENonce}`); const results = []; for (let i = 0; i < networks.length; i++) { const rpcUrl = networks[i]; - const r = await deployInNetwork(rpcUrl, pk, salt, initCodeHash, targetFactoryNonce, dleInit); + console.log(`[MULTI_DBG] deploying to network ${i + 1}/${networks.length}: ${rpcUrl}`); + const r = await deployInNetwork(rpcUrl, pk, salt, initCodeHash, targetDLENonce, dleInit); results.push({ rpcUrl, ...r }); } + + // Проверяем, что все адреса одинаковые + const addresses = results.map(r => r.address); + const uniqueAddresses = [...new Set(addresses)]; + + if (uniqueAddresses.length > 1) { + console.error('[MULTI_DBG] ERROR: DLE addresses are different across networks!'); + console.error('[MULTI_DBG] addresses:', uniqueAddresses); + throw new Error('Nonce alignment failed - addresses are different'); + } + + console.log('[MULTI_DBG] SUCCESS: All DLE addresses are identical:', uniqueAddresses[0]); console.log('MULTICHAIN_DEPLOY_RESULT', JSON.stringify(results)); } diff --git a/backend/services/dleV2Service.js b/backend/services/dleV2Service.js index 0cc1826..876d1fd 100644 --- a/backend/services/dleV2Service.js +++ b/backend/services/dleV2Service.js @@ -41,6 +41,20 @@ class DLEV2Service { // Подготовка параметров для деплоя const deployParams = this.prepareDeployParams(dleParams); + // Вычисляем адрес инициализатора (инициализатором является деплоер из переданного приватного ключа) + try { + const normalizedPk = dleParams.privateKey?.startsWith('0x') ? dleParams.privateKey : `0x${dleParams.privateKey}`; + const initializerAddress = new ethers.Wallet(normalizedPk).address; + deployParams.initializerAddress = initializerAddress; + } catch (e) { + logger.warn('Не удалось вычислить initializerAddress из приватного ключа:', e.message); + } + + // Генерируем одноразовый CREATE2_SALT и сохраняем его с уникальным ключом в secrets + const { createAndStoreNewCreate2Salt } = require('./secretStore'); + const { salt: create2Salt, key: saltKey } = await createAndStoreNewCreate2Salt({ label: deployParams.name || 'DLEv2' }); + logger.info(`CREATE2_SALT создан и сохранён: key=${saltKey}`); + // Сохраняем параметры во временный файл paramsFile = this.saveParamsToFile(deployParams); @@ -51,8 +65,7 @@ class DLEV2Service { fs.mkdirSync(deployDir, { recursive: true }); } fs.copyFileSync(paramsFile, tempParamsFile); - logger.info(`Файл параметров скопирован успешно`); - + // Готовим RPC для всех выбранных сетей const rpcUrls = []; for (const cid of deployParams.supportedChainIds) { @@ -64,6 +77,19 @@ class DLEV2Service { rpcUrls.push(ru); } + // Добавляем CREATE2_SALT, RPC_URLS и initializer в файл параметров + const currentParams = JSON.parse(fs.readFileSync(tempParamsFile, 'utf8')); + // Копируем все параметры из deployParams + Object.assign(currentParams, deployParams); + currentParams.CREATE2_SALT = create2Salt; + currentParams.rpcUrls = rpcUrls; + currentParams.currentChainId = deployParams.currentChainId || deployParams.supportedChainIds[0]; + const { ethers } = require('ethers'); + currentParams.initializer = dleParams.privateKey ? new ethers.Wallet(dleParams.privateKey.startsWith('0x') ? dleParams.privateKey : `0x${dleParams.privateKey}`).address : "0x0000000000000000000000000000000000000000"; + fs.writeFileSync(tempParamsFile, JSON.stringify(currentParams, null, 2)); + + logger.info(`Файл параметров скопирован и обновлен с CREATE2_SALT`); + // Лёгкая проверка баланса в первой сети { const { ethers } = require('ethers'); @@ -72,7 +98,15 @@ class DLEV2Service { const pk = dleParams.privateKey.startsWith('0x') ? dleParams.privateKey : `0x${dleParams.privateKey}`; const walletAddress = new ethers.Wallet(pk, provider).address; const balance = await provider.getBalance(walletAddress); + + if (typeof ethers.parseEther !== 'function') { + throw new Error('Метод ethers.parseEther не найден'); + } const minBalance = ethers.parseEther("0.00001"); + + if (typeof ethers.formatEther !== 'function') { + throw new Error('Метод ethers.formatEther не найден'); + } logger.info(`Баланс кошелька ${walletAddress}: ${ethers.formatEther(balance)} ETH`); if (balance < minBalance) { throw new Error(`Недостаточно ETH для деплоя в ${deployParams.supportedChainIds[0]}. Баланс: ${ethers.formatEther(balance)} ETH`); @@ -84,28 +118,58 @@ class DLEV2Service { } // Рассчитываем INIT_CODE_HASH автоматически из актуального initCode - const initCodeHash = await this.computeInitCodeHash(deployParams); + const initCodeHash = await this.computeInitCodeHash({ + ...deployParams, + currentChainId: deployParams.currentChainId || deployParams.supportedChainIds[0] + }); - // Собираем адреса фабрик по сетям (если есть) - const factoryAddresses = deployParams.supportedChainIds.map(cid => process.env[`FACTORY_ADDRESS_${cid}`] || '').join(','); + // Factory больше не используется - деплой DLE напрямую + logger.info(`Подготовка к прямому деплою DLE в сетях: ${deployParams.supportedChainIds.join(', ')}`); // Мультисетевой деплой одним вызовом - // Генерируем одноразовый CREATE2_SALT и сохраняем его с уникальным ключом в secrets - const { createAndStoreNewCreate2Salt } = require('./secretStore'); - const { salt: create2Salt, key: saltKey } = await createAndStoreNewCreate2Salt({ label: deployParams.name || 'DLEv2' }); - logger.info(`CREATE2_SALT создан и сохранён: key=${saltKey}`); - + logger.info('Запуск мульти-чейн деплоя...'); + const result = await this.runDeployMultichain(paramsFile, { - rpcUrls: rpcUrls.join(','), + rpcUrls: rpcUrls, + chainIds: deployParams.supportedChainIds, privateKey: dleParams.privateKey?.startsWith('0x') ? dleParams.privateKey : `0x${dleParams.privateKey}`, salt: create2Salt, - initCodeHash, - factories: factoryAddresses + initCodeHash }); + logger.info('Деплой завершен, результат:', JSON.stringify(result, null, 2)); + // Сохраняем информацию о созданном DLE для отображения на странице управления try { - const firstNet = Array.isArray(result?.data?.networks) && result.data.networks.length > 0 ? result.data.networks[0] : null; + logger.info('Результат деплоя для сохранения:', JSON.stringify(result, null, 2)); + + // Проверяем структуру результата + if (!result || typeof result !== 'object') { + logger.error('Неверная структура результата деплоя:', result); + throw new Error('Неверная структура результата деплоя'); + } + + // Если результат - массив (прямой результат из скрипта), преобразуем его + let deployResult = result; + if (Array.isArray(result)) { + logger.info('Результат - массив, преобразуем в объект'); + const addresses = result.map(r => r.address); + const allSame = addresses.every(addr => addr.toLowerCase() === addresses[0].toLowerCase()); + deployResult = { + success: true, + data: { + dleAddress: addresses[0], + networks: result.map((r, index) => ({ + chainId: r.chainId, + address: r.address, + success: true + })), + allSame + } + }; + } + + const firstNet = Array.isArray(deployResult?.data?.networks) && deployResult.data.networks.length > 0 ? deployResult.data.networks[0] : null; const dleData = { name: deployParams.name, symbol: deployParams.symbol, @@ -122,13 +186,20 @@ class DLEV2Service { supportedChainIds: deployParams.supportedChainIds, currentChainId: deployParams.currentChainId }, - dleAddress: (result?.data?.dleAddress) || (firstNet?.address) || null, + dleAddress: (deployResult?.data?.dleAddress) || (firstNet?.address) || null, version: 'v2', - networks: result?.data?.networks || [], + networks: deployResult?.data?.networks || [], createdAt: new Date().toISOString() }; + + logger.info('Данные DLE для сохранения:', JSON.stringify(dleData, null, 2)); + if (dleData.dleAddress) { - this.saveDLEData(dleData); + // Сохраняем одну карточку DLE с информацией о всех сетях + const savedPath = this.saveDLEData(dleData); + logger.info(`DLE данные сохранены в: ${savedPath}`); + } else { + logger.error('Не удалось получить адрес DLE из результата деплоя'); } } catch (e) { logger.warn('Не удалось сохранить локальную карточку DLE:', e.message); @@ -215,7 +286,7 @@ class DLEV2Service { // Проверяем адреса партнеров for (let i = 0; i < params.initialPartners.length; i++) { - if (!ethers.isAddress(params.initialPartners[i])) { + if (!ethers.isAddress || !ethers.isAddress(params.initialPartners[i])) { throw new Error(`Неверный адрес партнера ${i + 1}: ${params.initialPartners[i]}`); } } @@ -225,7 +296,51 @@ class DLEV2Service { throw new Error('Должна быть выбрана хотя бы одна сеть для деплоя'); } + // Дополнительные проверки безопасности + if (params.name.length > 100) { + throw new Error('Название DLE слишком длинное (максимум 100 символов)'); + } + if (params.symbol.length > 10) { + throw new Error('Символ токена слишком длинный (максимум 10 символов)'); + } + + if (params.location.length > 200) { + throw new Error('Местонахождение слишком длинное (максимум 200 символов)'); + } + + // Проверяем суммы токенов + for (let i = 0; i < params.initialAmounts.length; i++) { + const amount = params.initialAmounts[i]; + if (typeof amount !== 'string' && typeof amount !== 'number') { + throw new Error(`Неверный тип суммы для партнера ${i + 1}`); + } + + const numAmount = typeof amount === 'string' ? parseFloat(amount) : amount; + if (isNaN(numAmount) || numAmount <= 0) { + throw new Error(`Неверная сумма для партнера ${i + 1}: ${amount}`); + } + } + + // Проверяем приватный ключ + if (!params.privateKey) { + throw new Error('Приватный ключ обязателен для деплоя'); + } + + const pk = params.privateKey.startsWith('0x') ? params.privateKey : `0x${params.privateKey}`; + if (!/^0x[a-fA-F0-9]{64}$/.test(pk)) { + throw new Error('Неверный формат приватного ключа'); + } + + // Проверяем, что не деплоим в mainnet без подтверждения + const mainnetChains = [1, 137, 56, 42161]; // Ethereum, Polygon, BSC, Arbitrum + const hasMainnet = params.supportedChainIds.some(id => mainnetChains.includes(id)); + + if (hasMainnet) { + logger.warn('⚠️ ВНИМАНИЕ: Деплой включает mainnet сети! Убедитесь, что это необходимо.'); + } + + logger.info('✅ Валидация параметров DLE пройдена успешно'); } /** @@ -293,6 +408,9 @@ class DLEV2Service { // Принимаем как строки, так и числа; конвертируем в base units (18 знаков) try { if (typeof rawAmount === 'number' && Number.isFinite(rawAmount)) { + if (typeof ethers.parseUnits !== 'function') { + throw new Error('Метод ethers.parseUnits не найден'); + } return ethers.parseUnits(rawAmount.toString(), 18).toString(); } if (typeof rawAmount === 'string') { @@ -302,6 +420,9 @@ class DLEV2Service { return BigInt(a).toString(); } // Десятичная строка — конвертируем в base units + if (typeof ethers.parseUnits !== 'function') { + throw new Error('Метод ethers.parseUnits не найден'); + } return ethers.parseUnits(a, 18).toString(); } // BigInt или иные типы — приводим к строке без изменения масштаба @@ -318,6 +439,13 @@ class DLEV2Service { deployParams.okvedCodes = []; } + // Преобразуем kpp в число + if (deployParams.kpp) { + deployParams.kpp = parseInt(deployParams.kpp) || 0; + } else { + deployParams.kpp = 0; + } + // Убеждаемся, что supportedChainIds - это массив if (!Array.isArray(deployParams.supportedChainIds)) { deployParams.supportedChainIds = [1]; // По умолчанию Ethereum @@ -360,7 +488,7 @@ class DLEV2Service { */ runDeployScript(paramsFile, extraEnv = {}) { return new Promise((resolve, reject) => { - const scriptPath = path.join(__dirname, '../scripts/deploy/create-dle-v2.js'); + const scriptPath = path.join(__dirname, '../scripts/deploy/deploy-multichain.js'); if (!fs.existsSync(scriptPath)) { reject(new Error('Скрипт деплоя DLE v2 не найден: ' + scriptPath)); return; @@ -416,33 +544,70 @@ class DLEV2Service { runDeployMultichain(paramsFile, opts = {}) { return new Promise((resolve, reject) => { const scriptPath = path.join(__dirname, '../scripts/deploy/deploy-multichain.js'); - if (!fs.existsSync(scriptPath)) return reject(new Error('Скрипт мультисетевого деплоя не найден')); + if (!fs.existsSync(scriptPath)) return reject(new Error('Скрипт мультисетевого деплоя не найден: ' + scriptPath)); + const envVars = { ...process.env, - PRIVATE_KEY: opts.privateKey, - CREATE2_SALT: opts.salt, - INIT_CODE_HASH: opts.initCodeHash, - MULTICHAIN_RPC_URLS: opts.rpcUrls, - MULTICHAIN_FACTORY_ADDRESSES: opts.factories || '' + PRIVATE_KEY: opts.privateKey }; - const p = spawn('npx', ['hardhat', 'run', scriptPath], { cwd: path.join(__dirname, '..'), env: envVars, stdio: 'pipe' }); + + const p = spawn('npx', ['hardhat', 'run', scriptPath], { + cwd: path.join(__dirname, '..'), + env: envVars, + stdio: 'pipe' + }); + let stdout = '', stderr = ''; - p.stdout.on('data', (d) => { stdout += d.toString(); logger.info(`[MULTI] ${d.toString().trim()}`); }); - p.stderr.on('data', (d) => { stderr += d.toString(); logger.error(`[MULTI_ERR] ${d.toString().trim()}`); }); - p.on('close', () => { + p.stdout.on('data', (d) => { + stdout += d.toString(); + logger.info(`[MULTICHAIN_DEPLOY] ${d.toString().trim()}`); + }); + p.stderr.on('data', (d) => { + stderr += d.toString(); + logger.error(`[MULTICHAIN_DEPLOY_ERR] ${d.toString().trim()}`); + }); + + p.on('close', (code) => { try { - const m = stdout.match(/MULTICHAIN_DEPLOY_RESULT\s*(\[.*\])/s); - if (!m) throw new Error('Результат не найден'); - const arr = JSON.parse(m[1]); - if (!Array.isArray(arr) || arr.length === 0) throw new Error('Пустой результат деплоя'); - const addr = arr[0].address; - const allSame = arr.every(x => x.address && x.address.toLowerCase() === addr.toLowerCase()); - if (!allSame) throw new Error('Адреса отличаются между сетями'); - resolve({ success: true, data: { dleAddress: addr, networks: arr } }); + // Ищем результат в формате MULTICHAIN_DEPLOY_RESULT + const resultMatch = stdout.match(/MULTICHAIN_DEPLOY_RESULT\s+(\[.*\])/); + + if (resultMatch) { + const result = JSON.parse(resultMatch[1]); + resolve(result); + } else { + // Fallback: ищем адреса DLE в выводе по новому формату + const dleAddressMatches = stdout.match(/\[MULTI_DBG\] chainId=\d+ DLE deployed at=(0x[a-fA-F0-9]{40})/g); + if (!dleAddressMatches || dleAddressMatches.length === 0) { + throw new Error('Не найдены адреса DLE в выводе'); + } + + const addresses = dleAddressMatches.map(match => match.match(/(0x[a-fA-F0-9]{40})/)[1]); + const addr = addresses[0]; + const allSame = addresses.every(x => x.toLowerCase() === addr.toLowerCase()); + + if (!allSame) { + logger.warn('Адреса отличаются между сетями — продолжаем, сохраню по-сеточно', { addresses }); + } + + resolve({ + success: true, + data: { + dleAddress: addr, + networks: addresses.map((address, index) => ({ + chainId: opts.chainIds[index] || index + 1, + address, + success: true + })), + allSame + } + }); + } } catch (e) { reject(new Error(`Ошибка мультисетевого деплоя: ${e.message}\nSTDOUT:${stdout}\nSTDERR:${stderr}`)); } }); + p.on('error', (e) => reject(e)); }); } @@ -453,8 +618,20 @@ class DLEV2Service { * @returns {Object} - Результат деплоя */ extractDeployResult(stdout) { - // Ищем строки с адресами в выводе - const dleAddressMatch = stdout.match(/DLE v2 задеплоен по адресу: (0x[a-fA-F0-9]{40})/); + // Ищем результат в формате MULTICHAIN_DEPLOY_RESULT + const resultMatch = stdout.match(/MULTICHAIN_DEPLOY_RESULT\s+(\[.*?\])/); + + if (resultMatch) { + try { + const result = JSON.parse(resultMatch[1]); + return result; + } catch (e) { + logger.error('Ошибка парсинга JSON результата:', e); + } + } + + // Fallback: ищем строки с адресами в выводе по новому формату + const dleAddressMatch = stdout.match(/\[MULTI_DBG\] chainId=\d+ DLE deployed at=(0x[a-fA-F0-9]{40})/); if (dleAddressMatch) { return { @@ -529,7 +706,7 @@ class DLEV2Service { } const files = fs.readdirSync(dlesDir); - return files + const allDles = files .filter(file => file.endsWith('.json') && file.includes('dle-v2-')) .map(file => { try { @@ -541,68 +718,300 @@ class DLEV2Service { } }) .filter(dle => dle !== null); + + // Группируем DLE по мультичейн деплоям + const groupedDles = this.groupMultichainDLEs(allDles); + + return groupedDles; } catch (error) { logger.error('Ошибка при получении списка DLE v2:', error); return []; } } - // Авто-расчёт INIT_CODE_HASH - async computeInitCodeHash(params) { - const hre = require('hardhat'); - const { ethers } = hre; - const DLE = await hre.ethers.getContractFactory('DLE'); - const dleConfig = { - name: params.name, - symbol: params.symbol, - location: params.location, - coordinates: params.coordinates, - jurisdiction: params.jurisdiction, - okvedCodes: params.okvedCodes || [], - kpp: params.kpp, - quorumPercentage: params.quorumPercentage, - initialPartners: params.initialPartners, - initialAmounts: params.initialAmounts, - supportedChainIds: params.supportedChainIds - }; - const deployTx = await DLE.getDeployTransaction(dleConfig, params.currentChainId); - const initCode = deployTx.data; - return ethers.keccak256(initCode); + /** + * Группирует DLE по мультичейн деплоям + * @param {Array} allDles - Все DLE из файлов + * @returns {Array} - Сгруппированные DLE + */ + groupMultichainDLEs(allDles) { + const groups = new Map(); + + for (const dle of allDles) { + // Создаем ключ для группировки на основе общих параметров + const groupKey = this.createGroupKey(dle); + + if (!groups.has(groupKey)) { + groups.set(groupKey, { + // Основные данные из первого DLE + name: dle.name, + symbol: dle.symbol, + location: dle.location, + coordinates: dle.coordinates, + jurisdiction: dle.jurisdiction, + oktmo: dle.oktmo, + okvedCodes: dle.okvedCodes, + kpp: dle.kpp, + quorumPercentage: dle.quorumPercentage, + version: dle.version || 'v2', + deployedMultichain: true, + // Мультичейн информация + networks: [], + // Модули (одинаковые во всех сетях) + modules: dle.modules, + // Время создания (самое раннее) + creationTimestamp: dle.creationTimestamp, + creationBlock: dle.creationBlock + }); + } + + const group = groups.get(groupKey); + + // Если у DLE есть массив networks, используем его + if (dle.networks && Array.isArray(dle.networks)) { + for (const network of dle.networks) { + group.networks.push({ + chainId: network.chainId, + dleAddress: network.address || network.dleAddress, + factoryAddress: network.factoryAddress, + rpcUrl: network.rpcUrl || this.getRpcUrlForChain(network.chainId) + }); + } + } else { + // Старый формат: добавляем информацию о сети из корня DLE + group.networks.push({ + chainId: dle.chainId, + dleAddress: dle.dleAddress, + factoryAddress: dle.factoryAddress, + rpcUrl: dle.rpcUrl || this.getRpcUrlForChain(dle.chainId) + }); + } + + // Обновляем время создания на самое раннее + if (dle.creationTimestamp && (!group.creationTimestamp || dle.creationTimestamp < group.creationTimestamp)) { + group.creationTimestamp = dle.creationTimestamp; + } + } + + // Преобразуем группы в массив + return Array.from(groups.values()).map(group => ({ + ...group, + // Основной адрес DLE (из первой сети) + dleAddress: group.networks[0]?.dleAddress, + // Общее количество сетей + totalNetworks: group.networks.length, + // Поддерживаемые сети + supportedChainIds: group.networks.map(n => n.chainId) + })); } /** - * Проверяет баланс деплоера во всех выбранных сетях - * @param {number[]} chainIds - * @param {string} privateKey - * @returns {Promise<{balances: Array<{chainId:number, balanceEth:string, ok:boolean, rpcUrl:string}>, insufficient:number[]}>} + * Создает ключ для группировки DLE + * @param {Object} dle - Данные DLE + * @returns {string} - Ключ группировки + */ + createGroupKey(dle) { + // Группируем по основным параметрам DLE + const keyParts = [ + dle.name, + dle.symbol, + dle.location, + dle.coordinates, + dle.jurisdiction, + dle.oktmo, + dle.kpp, + dle.quorumPercentage, + // Сортируем okvedCodes для стабильного ключа + Array.isArray(dle.okvedCodes) ? dle.okvedCodes.sort().join(',') : '', + // Сортируем supportedChainIds для стабильного ключа + Array.isArray(dle.supportedChainIds) ? dle.supportedChainIds.sort().join(',') : '' + ]; + + return keyParts.join('|'); + } + + /** + * Получает RPC URL для сети + * @param {number} chainId - ID сети + * @returns {string|null} - RPC URL + */ + getRpcUrlForChain(chainId) { + try { + // Простая маппинг для основных сетей + const rpcMap = { + 1: 'https://eth-mainnet.g.alchemy.com/v2/demo', + 11155111: 'https://eth-sepolia.nodereal.io/v1/56dec8028bae4f26b76099a42dae2b52', + 17000: 'https://ethereum-holesky.publicnode.com', + 421614: 'https://sepolia-rollup.arbitrum.io/rpc', + 84532: 'https://sepolia.base.org' + }; + return rpcMap[chainId] || null; + } catch (error) { + return null; + } + } + + // Авто-расчёт INIT_CODE_HASH + async computeInitCodeHash(params) { + try { + // Проверяем наличие обязательных параметров + if (!params.name || !params.symbol || !params.location) { + throw new Error('Отсутствуют обязательные параметры для вычисления INIT_CODE_HASH'); + } + + const hre = require('hardhat'); + const { ethers } = hre; + + // Проверяем, что контракт DLE существует + try { + const DLE = await hre.ethers.getContractFactory('DLE'); + if (!DLE) { + throw new Error('Контракт DLE не найден в Hardhat'); + } + } catch (contractError) { + throw new Error(`Ошибка загрузки контракта DLE: ${contractError.message}`); + } + + const DLE = await hre.ethers.getContractFactory('DLE'); + const dleConfig = { + name: params.name, + symbol: params.symbol, + location: params.location, + coordinates: params.coordinates || "", + jurisdiction: params.jurisdiction || 1, + okvedCodes: params.okvedCodes || [], + kpp: params.kpp || 0, + quorumPercentage: params.quorumPercentage || 51, + initialPartners: params.initialPartners || [], + initialAmounts: params.initialAmounts || [], + supportedChainIds: params.supportedChainIds || [1] + }; + // Учитываем актуальную сигнатуру конструктора: (dleConfig, currentChainId, initializer) + const initializer = params.initializerAddress || "0x0000000000000000000000000000000000000000"; + const currentChainId = params.currentChainId || 1; // Fallback на Ethereum mainnet + + logger.info('Вычисление INIT_CODE_HASH с параметрами:', { + name: dleConfig.name, + symbol: dleConfig.symbol, + currentChainId, + initializer + }); + + // Проверяем, что метод getDeployTransaction существует + if (typeof DLE.getDeployTransaction !== 'function') { + throw new Error('Метод getDeployTransaction не найден в контракте DLE'); + } + + const deployTx = await DLE.getDeployTransaction(dleConfig, currentChainId, initializer); + if (!deployTx || !deployTx.data) { + throw new Error('Не удалось получить данные транзакции деплоя'); + } + + const initCode = deployTx.data; + + // Проверяем, что метод keccak256 существует + if (typeof ethers.keccak256 !== 'function') { + throw new Error('Метод ethers.keccak256 не найден'); + } + + const hash = ethers.keccak256(initCode); + + logger.info('INIT_CODE_HASH вычислен успешно:', hash); + return hash; + } catch (error) { + logger.error('Ошибка при вычислении INIT_CODE_HASH:', error); + // Fallback: возвращаем хеш на основе параметров + const { ethers } = require('ethers'); + const fallbackData = JSON.stringify({ + name: params.name, + symbol: params.symbol, + location: params.location, + jurisdiction: params.jurisdiction, + supportedChainIds: params.supportedChainIds + }); + + // Проверяем, что методы существуют + if (typeof ethers.toUtf8Bytes !== 'function') { + throw new Error('Метод ethers.toUtf8Bytes не найден'); + } + if (typeof ethers.keccak256 !== 'function') { + throw new Error('Метод ethers.keccak256 не найден'); + } + + return ethers.keccak256(ethers.toUtf8Bytes(fallbackData)); + } + } + + + + /** + * Проверяет балансы в указанных сетях + * @param {number[]} chainIds - Массив chainId для проверки + * @param {string} privateKey - Приватный ключ + * @returns {Promise} - Результат проверки балансов */ async checkBalances(chainIds, privateKey) { + const { getRpcUrlByChainId } = require('./rpcProviderService'); const { ethers } = require('ethers'); - const results = []; + const balances = []; const insufficient = []; - const normalizedPk = privateKey?.startsWith('0x') ? privateKey : `0x${privateKey}`; - for (const cid of chainIds || []) { - const rpcUrl = await getRpcUrlByChainId(cid); - if (!rpcUrl) { - results.push({ chainId: cid, balanceEth: '0', ok: false, rpcUrl: null }); - insufficient.push(cid); - continue; - } + + for (const chainId of chainIds) { try { + const rpcUrl = await getRpcUrlByChainId(chainId); + if (!rpcUrl) { + balances.push({ + chainId, + balanceEth: '0', + ok: false, + error: 'RPC URL не найден' + }); + insufficient.push(chainId); + continue; + } + const provider = new ethers.JsonRpcProvider(rpcUrl); - const wallet = new ethers.Wallet(normalizedPk, provider); - const bal = await provider.getBalance(wallet.address); - // Минимум для деплоя; можно скорректировать - const min = ethers.parseEther('0.002'); - const ok = bal >= min; - results.push({ chainId: cid, balanceEth: ethers.formatEther(bal), ok, rpcUrl }); - if (!ok) insufficient.push(cid); - } catch (e) { - results.push({ chainId: cid, balanceEth: '0', ok: false, rpcUrl }); - insufficient.push(cid); + const wallet = new ethers.Wallet(privateKey, provider); + const balance = await provider.getBalance(wallet.address); + + if (typeof ethers.formatEther !== 'function') { + throw new Error('Метод ethers.formatEther не найден'); + } + const balanceEth = ethers.formatEther(balance); + + if (typeof ethers.parseEther !== 'function') { + throw new Error('Метод ethers.parseEther не найден'); + } + const minBalance = ethers.parseEther("0.001"); + const ok = balance >= minBalance; + + balances.push({ + chainId, + address: wallet.address, + balanceEth, + ok + }); + + if (!ok) { + insufficient.push(chainId); + } + + } catch (error) { + balances.push({ + chainId, + balanceEth: '0', + ok: false, + error: error.message + }); + insufficient.push(chainId); } } - return { balances: results, insufficient }; + + return { + balances, + insufficient, + allSufficient: insufficient.length === 0 + }; } /** @@ -724,7 +1133,7 @@ class DLEV2Service { } // 2) Посчитать ABI-код аргументов конструктора через сравнение с bytecode - // Конструктор: (dleConfig, currentChainId) + // Конструктор: (dleConfig, currentChainId, initializer) const Factory = await hre.ethers.getContractFactory('DLE'); const dleConfig = { name: params.name, @@ -739,7 +1148,8 @@ class DLEV2Service { initialAmounts: params.initialAmounts, supportedChainIds: params.supportedChainIds }; - const deployTx = await Factory.getDeployTransaction(dleConfig, params.currentChainId); + const initializer = params.initialPartners?.[0] || "0x0000000000000000000000000000000000000000"; + const deployTx = await Factory.getDeployTransaction(dleConfig, params.currentChainId, initializer); const fullData = deployTx.data; // 0x + creation bytecode + encoded args const bytecode = Factory.bytecode; // 0x + creation bytecode let constructorArgsHex; diff --git a/backend/test/DLE.test.js b/backend/test/DLE.test.js index 903c1da..20c2d1d 100644 --- a/backend/test/DLE.test.js +++ b/backend/test/DLE.test.js @@ -17,466 +17,1193 @@ describe("DLE Smart Contract", function () { let DLE; let dle; let owner; - let partner1; - let partner2; - let partner3; + let partner1, partner2, partner3; let addrs; + let treasuryAddr, timelockAddr, readerAddr; + + const SAMPLE_CONFIG = { + name: "Test DLE", + symbol: "TDLE", + location: "Test Location", + coordinates: "0,0", + jurisdiction: 1, + okvedCodes: ["62.01"], + kpp: 123456789, + quorumPercentage: 51, + initialPartners: [], // Will set in beforeEach + initialAmounts: [], + supportedChainIds: [1, 137] + }; beforeEach(async function () { - // Получаем аккаунты [owner, partner1, partner2, partner3, ...addrs] = await ethers.getSigners(); - // Деплоим контракт - const DLEFactory = await ethers.getContractFactory("DLE"); - - const config = { - name: "Digital Legal Entity", - symbol: "DLE", - location: "Moscow, Russia", - coordinates: "55.7558,37.6176", - jurisdiction: 1, // Россия - oktmo: 45000000000, - okvedCodes: ["62.01", "62.02", "62.03"], - kpp: 770101001, - quorumPercentage: 60, // 60% - initialPartners: [partner1.address, partner2.address, partner3.address], - initialAmounts: [ethers.parseEther("1000"), ethers.parseEther("1000"), ethers.parseEther("1000")], - supportedChainIds: [1, 137, 56, 42161] // Ethereum, Polygon, BSC, Arbitrum - }; + DLE = await ethers.getContractFactory("DLE"); - dle = await DLEFactory.deploy(config, 1); // ChainId = 1 (Ethereum) + SAMPLE_CONFIG.initialPartners = [partner1.address, partner2.address, partner3.address]; + SAMPLE_CONFIG.initialAmounts = [ethers.parseEther("100"), ethers.parseEther("100"), ethers.parseEther("100")]; + + dle = await DLE.deploy(SAMPLE_CONFIG, 1, owner.address); // currentChainId=1 await dle.waitForDeployment(); + + // Используем EOAs как адреса модулей (ядро не проверяет код при инициализации) + treasuryAddr = addrs[0].address; + timelockAddr = addrs[1].address; + readerAddr = addrs[2].address; + + // Initialize base modules + await dle.initializeBaseModules(treasuryAddr, timelockAddr, readerAddr); }); - describe("Деплой и инициализация", function () { - it("Должен правильно инициализировать DLE", async function () { - const dleInfo = await dle.getDLEInfo(); + describe("Deployment and Initialization", function () { + it("Should set correct initial state", async function () { + const info = await dle.dleInfo(); + expect(info.name).to.equal(SAMPLE_CONFIG.name); + expect(info.symbol).to.equal(SAMPLE_CONFIG.symbol); + expect(await dle.quorumPercentage()).to.equal(SAMPLE_CONFIG.quorumPercentage); + expect(await dle.currentChainId()).to.equal(1); + expect(await dle.totalSupply()).to.equal(ethers.parseEther("300")); + }); + + it("Should distribute initial tokens and delegate", async function () { + expect(await dle.balanceOf(partner1.address)).to.equal(ethers.parseEther("100")); + expect(await dle.getVotes(partner1.address)).to.equal(ethers.parseEther("100")); + }); + + it("Should initialize modules correctly", async function () { + // Modules are already initialized in beforeEach + expect(await dle.modules(ethers.keccak256(ethers.toUtf8Bytes("TREASURY")))).to.equal(treasuryAddr); + expect(await dle.modulesInitialized()).to.be.true; + + // Cannot initialize twice + await expect(dle.initializeBaseModules(treasuryAddr, timelockAddr, readerAddr)) + .to.be.revertedWithCustomError(dle, "ErrProposalExecuted"); + }); + + it("Should prevent non-initializer from initializing modules", async function () { + // Create a new DLE instance for this test + const newDle = await DLE.deploy(SAMPLE_CONFIG, 1, owner.address); + await newDle.waitForDeployment(); - expect(dleInfo.name).to.equal("Digital Legal Entity"); - expect(dleInfo.symbol).to.equal("DLE"); - expect(dleInfo.location).to.equal("Moscow, Russia"); - expect(dleInfo.jurisdiction).to.equal(1); - expect(dleInfo.isActive).to.be.true; + await expect(newDle.connect(partner1).initializeBaseModules(treasuryAddr, timelockAddr, readerAddr)) + .to.be.revertedWithCustomError(newDle, "ErrOnlyInitializer"); }); - it("Должен распределить начальные токены", async function () { - expect(await dle.balanceOf(partner1.address)).to.equal(ethers.parseEther("1000")); - expect(await dle.balanceOf(partner2.address)).to.equal(ethers.parseEther("1000")); - expect(await dle.balanceOf(partner3.address)).to.equal(ethers.parseEther("1000")); - }); - - it("Должен установить кворум", async function () { - expect(await dle.quorumPercentage()).to.equal(60); - }); - - it("Должен настроить поддерживаемые цепочки", async function () { - expect(await dle.isChainSupported(1)).to.be.true; // Ethereum - expect(await dle.isChainSupported(137)).to.be.true; // Polygon - expect(await dle.isChainSupported(56)).to.be.true; // BSC - expect(await dle.isChainSupported(42161)).to.be.true; // Arbitrum - expect(await dle.isChainSupported(999)).to.be.false; // Неподдерживаемая цепочка + it("Should prevent initialization with zero addresses", async function () { + // Create a new DLE instance for this test + const newDle = await DLE.deploy(SAMPLE_CONFIG, 1, owner.address); + await newDle.waitForDeployment(); + + await expect(newDle.initializeBaseModules(ethers.ZeroAddress, timelockAddr, readerAddr)) + .to.be.revertedWithCustomError(newDle, "ErrZeroAddress"); }); }); - describe("Система голосования", function () { - it("Должен создать предложение", async function () { - const description = "Передать 100 токенов от Partner1 к Partner2"; - const duration = 7 * 24 * 60 * 60; // 7 дней - const operation = ethers.AbiCoder.defaultAbiCoder().encode( - ["bytes4", "bytes"], - [ - "0xa9059cbb", // transfer(address,uint256) selector - ethers.AbiCoder.defaultAbiCoder().encode( - ["address", "uint256"], - [partner2.address, ethers.parseEther("100")] - ) - ] - ); - - const tx = await dle.connect(partner1).createProposal( - description, - duration, - operation, - 1 // governanceChainId = Ethereum - ); + describe("Proposals", function () { + it("Should create a proposal", async function () { + const description = "Test Proposal"; + const duration = 3600; + const operation = ethers.toUtf8Bytes("test operation"); + const governanceChainId = 1; + const targetChains = [1, 137]; + const tx = await dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0); const receipt = await tx.wait(); - const event = receipt.logs.find(log => - log.fragment && log.fragment.name === "ProposalCreated" - ); - expect(event).to.not.be.undefined; expect(await dle.proposalCounter()).to.equal(1); }); - it("Должен голосовать за предложение", async function () { - // Создаем предложение - const description = "Тестовое предложение"; - const duration = 7 * 24 * 60 * 60; - const operation = "0x"; - - await dle.connect(partner1).createProposal( - description, - duration, - operation, - 1 - ); + it("Should not allow non-holders to create proposals", async function () { + const description = "Test Proposal"; + const duration = 3600; + const operation = ethers.toUtf8Bytes("test operation"); + const governanceChainId = 1; + const targetChains = [1, 137]; - // Голосуем за предложение - await dle.connect(partner1).vote(0, true); - await dle.connect(partner2).vote(0, true); - - const proposal = await dle.proposals(0); - expect(proposal.forVotes).to.equal(ethers.parseEther("2000")); // 1000 + 1000 - expect(proposal.againstVotes).to.equal(0); + await expect(dle.connect(addrs[0]).createProposal(description, duration, operation, governanceChainId, targetChains, 0)) + .to.be.revertedWithCustomError(dle, "ErrNotHolder"); }); - it("Должен проверить результат голосования", async function () { - // Создаем предложение - const description = "Тестовое предложение"; - const duration = 7 * 24 * 60 * 60; - const operation = "0x"; - - await dle.connect(partner1).createProposal( - description, - duration, - operation, - 1 - ); + it("Should prevent creating proposal with too short duration", async function () { + const description = "Test Proposal"; + const duration = 59; // Less than minimum + const operation = ethers.toUtf8Bytes("test operation"); + const governanceChainId = 1; + const targetChains = [1, 137]; - // Голосуем за предложение (60% от 3000 = 1800) - await dle.connect(partner1).vote(0, true); // 1000 - await dle.connect(partner2).vote(0, true); // 1000 - await dle.connect(partner3).vote(0, true); // 1000 - - const [passed, quorumReached] = await dle.checkProposalResult(0); - expect(passed).to.be.true; - expect(quorumReached).to.be.true; + await expect(dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0)) + .to.be.revertedWithCustomError(dle, "ErrTooShort"); }); - it("Не должен позволить голосовать дважды", async function () { - // Создаем предложение - const description = "Тестовое предложение"; - const duration = 7 * 24 * 60 * 60; - const operation = "0x"; - - await dle.connect(partner1).createProposal( - description, - duration, - operation, - 1 - ); + it("Should prevent creating proposal with too long duration", async function () { + const description = "Test Proposal"; + const duration = 30 * 24 * 60 * 60 + 1; // More than maximum + const operation = ethers.toUtf8Bytes("test operation"); + const governanceChainId = 1; + const targetChains = [1, 137]; - // Первое голосование - await dle.connect(partner1).vote(0, true); - - // Второе голосование должно упасть - await expect( - dle.connect(partner1).vote(0, true) - ).to.be.revertedWith("Already voted"); + await expect(dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0)) + .to.be.revertedWithCustomError(dle, "ErrTooLong"); }); - it("Не должен позволить голосовать без токенов", async function () { - // Создаем предложение - const description = "Тестовое предложение"; - const duration = 7 * 24 * 60 * 60; - const operation = "0x"; - - await dle.connect(partner1).createProposal( - description, - duration, - operation, - 1 - ); + it("Should prevent creating proposal with unsupported governance chain", async function () { + const description = "Test Proposal"; + const duration = 3600; + const operation = ethers.toUtf8Bytes("test operation"); + const governanceChainId = 999; // Unsupported chain + const targetChains = [1, 137]; - // Голосование без токенов должно упасть - await expect( - dle.connect(addrs[0]).vote(0, true) - ).to.be.revertedWith("No tokens to vote"); + await expect(dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0)) + .to.be.revertedWithCustomError(dle, "ErrBadChain"); + }); + + it("Should prevent creating proposal with unsupported target chain", async function () { + const description = "Test Proposal"; + const duration = 3600; + const operation = ethers.toUtf8Bytes("test operation"); + const governanceChainId = 1; + const targetChains = [999]; // Unsupported chain + + await expect(dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0)) + .to.be.revertedWithCustomError(dle, "ErrBadTarget"); }); }); - describe("Мультиподпись", function () { - it("Должен создать мультиподпись операцию", async function () { - const operationHash = ethers.keccak256(ethers.toUtf8Bytes("test operation")); - const duration = 7 * 24 * 60 * 60; - - const tx = await dle.connect(partner1).createMultiSigOperation( - operationHash, - duration - ); + describe("Voting System", function () { + it("Should allow token holders to vote", async function () { + const description = "Test Proposal"; + const duration = 3600; + const operation = ethers.toUtf8Bytes("test operation"); + const governanceChainId = 1; + const targetChains = [1, 137]; + const tx = await dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0); const receipt = await tx.wait(); - const event = receipt.logs.find(log => - log.fragment && log.fragment.name === "MultiSigOperationCreated" - ); + const proposalId = (await dle.proposalCounter()) - 1n; - expect(event).to.not.be.undefined; - expect(await dle.multiSigCounter()).to.equal(1); + await dle.connect(partner1).vote(proposalId, true); + const proposal = await dle.proposals(proposalId); + expect(proposal.forVotes).to.equal(ethers.parseEther("100")); }); - it("Должен подписать мультиподпись операцию", async function () { - const operationHash = ethers.keccak256(ethers.toUtf8Bytes("test operation")); - const duration = 7 * 24 * 60 * 60; + it("Should allow voting against proposal", async function () { + const description = "Test Proposal"; + const duration = 3600; + const operation = ethers.toUtf8Bytes("test operation"); + const governanceChainId = 1; + const targetChains = [1, 137]; - await dle.connect(partner1).createMultiSigOperation( - operationHash, - duration - ); + const tx = await dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0); + const receipt = await tx.wait(); + const proposalId = (await dle.proposalCounter()) - 1n; - // Подписываем операцию - await dle.connect(partner1).signMultiSigOperation(0, true); - await dle.connect(partner2).signMultiSigOperation(0, true); - - const operation = await dle.multiSigOperations(0); - expect(operation.forSignatures).to.equal(ethers.parseEther("2000")); // 1000 + 1000 - expect(operation.againstSignatures).to.equal(0); + await dle.connect(partner1).vote(proposalId, false); + const proposal = await dle.proposals(proposalId); + expect(proposal.againstVotes).to.equal(ethers.parseEther("100")); }); - it("Должен проверить результат мультиподписи", async function () { - const operationHash = ethers.keccak256(ethers.toUtf8Bytes("test operation")); - const duration = 7 * 24 * 60 * 60; + it("Should prevent voting twice", async function () { + const description = "Test Proposal"; + const duration = 3600; + const operation = ethers.toUtf8Bytes("test operation"); + const governanceChainId = 1; + const targetChains = [1, 137]; - await dle.connect(partner1).createMultiSigOperation( - operationHash, - duration - ); + const tx = await dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0); + const receipt = await tx.wait(); + const proposalId = (await dle.proposalCounter()) - 1n; - // Подписываем операцию (60% от 3000 = 1800) - await dle.connect(partner1).signMultiSigOperation(0, true); // 1000 - await dle.connect(partner2).signMultiSigOperation(0, true); // 1000 - await dle.connect(partner3).signMultiSigOperation(0, true); // 1000 + await dle.connect(partner1).vote(proposalId, true); + await expect(dle.connect(partner1).vote(proposalId, true)) + .to.be.revertedWithCustomError(dle, "ErrAlreadyVoted"); + }); - const [passed, quorumReached] = await dle.checkMultiSigResult(0); + it("Should prevent voting on non-existent proposal", async function () { + await expect(dle.connect(partner1).vote(999, true)) + .to.be.revertedWithCustomError(dle, "ErrProposalMissing"); + }); + + it("Should prevent voting after deadline", async function () { + const description = "Test Proposal"; + const duration = 3600; + const operation = ethers.toUtf8Bytes("test operation"); + const governanceChainId = 1; + const targetChains = [1, 137]; + + const tx = await dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0); + const receipt = await tx.wait(); + const proposalId = (await dle.proposalCounter()) - 1n; + + // Fast forward time + await ethers.provider.send("evm_increaseTime", [3601]); + await ethers.provider.send("evm_mine"); + + await expect(dle.connect(partner1).vote(proposalId, true)) + .to.be.revertedWithCustomError(dle, "ErrProposalEnded"); + }); + + it("Should prevent voting in wrong chain", async function () { + // Create DLE in different chain + const DLE2 = await ethers.getContractFactory("DLE"); + const cfg2 = { ...SAMPLE_CONFIG, supportedChainIds: [1, 2] }; + const dle2 = await DLE2.deploy(cfg2, 2, owner.address); + await dle2.waitForDeployment(); + + // Initialize modules + await dle2.initializeBaseModules(treasuryAddr, timelockAddr, readerAddr); + + const description = "Cross-chain proposal"; + const duration = 3600; + const operation = ethers.toUtf8Bytes("test operation"); + const governanceChainId = 1; + const targetChains = [2]; + + await dle2.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0); + + await expect(dle2.connect(partner1).vote(0, true)) + .to.be.revertedWithCustomError(dle2, "ErrWrongChain"); + }); + + it("Should prevent voting without tokens", async function () { + const description = "Test Proposal"; + const duration = 3600; + const operation = ethers.toUtf8Bytes("test operation"); + const governanceChainId = 1; + const targetChains = [1, 137]; + + const tx = await dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0); + const receipt = await tx.wait(); + const proposalId = (await dle.proposalCounter()) - 1n; + + await expect(dle.connect(addrs[0]).vote(proposalId, true)) + .to.be.revertedWithCustomError(dle, "ErrNoPower"); + }); + }); + + describe("Proposal Result Checking", function () { + it("Should return correct result for passed proposal", async function () { + const description = "Test Proposal"; + const duration = 3600; + const operation = ethers.toUtf8Bytes("test operation"); + const governanceChainId = 1; + const targetChains = [1, 137]; + + const tx = await dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0); + const receipt = await tx.wait(); + const proposalId = (await dle.proposalCounter()) - 1n; + + // Vote with quorum + await dle.connect(partner1).vote(proposalId, true); + await dle.connect(partner2).vote(proposalId, true); + + const [passed, quorumReached] = await dle.checkProposalResult(proposalId); expect(passed).to.be.true; expect(quorumReached).to.be.true; }); + + it("Should return correct result for failed proposal", async function () { + const description = "Test Proposal"; + const duration = 3600; + const operation = ethers.toUtf8Bytes("test operation"); + const governanceChainId = 1; + const targetChains = [1, 137]; + + const tx = await dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0); + const receipt = await tx.wait(); + const proposalId = (await dle.proposalCounter()) - 1n; + + // Vote against + await dle.connect(partner1).vote(proposalId, false); + await dle.connect(partner2).vote(proposalId, false); + + const [passed, quorumReached] = await dle.checkProposalResult(proposalId); + expect(passed).to.be.false; + expect(quorumReached).to.be.true; + }); + + it("Should return correct result for proposal without quorum", async function () { + const description = "Test Proposal"; + const duration = 3600; + const operation = ethers.toUtf8Bytes("test operation"); + const governanceChainId = 1; + const targetChains = [1, 137]; + + const tx = await dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0); + const receipt = await tx.wait(); + const proposalId = (await dle.proposalCounter()) - 1n; + + // Vote with insufficient quorum + await dle.connect(partner1).vote(proposalId, true); + + const [passed, quorumReached] = await dle.checkProposalResult(proposalId); + expect(passed).to.be.false; + expect(quorumReached).to.be.false; + }); + + it("Should handle non-existent proposal", async function () { + await expect(dle.checkProposalResult(999)) + .to.be.revertedWithCustomError(dle, "ErrProposalMissing"); + }); }); - describe("Мульти-чейн синхронизация", function () { - it("Должен синхронизировать голоса из другой цепочки", async function () { - // Создаем предложение - const description = "Тестовое предложение"; - const duration = 7 * 24 * 60 * 60; - const operation = "0x"; + describe("Execution by signatures (EIP-712)", function () { + it("Should execute proposal in non-governance chain with quorum signatures", async function () { + // Deploy DLE with currentChainId=2 and support [1,2] + const DLE2 = await ethers.getContractFactory("DLE"); + const cfg2 = { + name: SAMPLE_CONFIG.name, + symbol: SAMPLE_CONFIG.symbol, + location: SAMPLE_CONFIG.location, + coordinates: SAMPLE_CONFIG.coordinates, + jurisdiction: SAMPLE_CONFIG.jurisdiction, + okvedCodes: SAMPLE_CONFIG.okvedCodes, + kpp: SAMPLE_CONFIG.kpp, + quorumPercentage: 51, + initialPartners: [partner1.address, partner2.address, partner3.address], + initialAmounts: [ethers.parseEther("100"), ethers.parseEther("100"), ethers.parseEther("100")], + supportedChainIds: [1, 2] + }; + const dle2 = await DLE2.deploy(cfg2, 2, owner.address); + await dle2.waitForDeployment(); + + // Initialize modules + await dle2.initializeBaseModules(treasuryAddr, timelockAddr, readerAddr); + + // Create proposal with governanceChainId=1 and targetChains=[2] + // Use a valid operation - add a module + const moduleId = ethers.keccak256(ethers.toUtf8Bytes("TEST_MODULE")); + const moduleAddress = addrs[5].address; - await dle.connect(partner1).createProposal( - description, - duration, - operation, - 1 - ); + const tx = await dle2.connect(partner1).createAddModuleProposal("Sig Exec", 3600, moduleId, moduleAddress, 1); + const receipt = await tx.wait(); + const proposalId = (await dle2.proposalCounter()) - 1n; - // Синхронизируем голоса из другой цепочки - await dle.connect(partner1).syncVoteFromChain( - 0, // proposalId - 137, // fromChainId (Polygon) - ethers.parseEther("500"), // forVotes - ethers.parseEther("200"), // againstVotes - "0x" // proof - ); + // Get snapshotTimepoint + const p = await dle2.proposals(proposalId); + const snapshotTimepoint = p.snapshotTimepoint; - const proposal = await dle.proposals(0); - expect(proposal.forVotes).to.equal(ethers.parseEther("500")); - expect(proposal.againstVotes).to.equal(ethers.parseEther("200")); - }); + // Create EIP-712 signatures for three partners + const domain = { + name: cfg2.name, + version: "1", + chainId: (await ethers.provider.getNetwork()).chainId, + verifyingContract: await dle2.getAddress() + }; - it("Должен синхронизировать мультиподпись из другой цепочки", async function () { - const operationHash = ethers.keccak256(ethers.toUtf8Bytes("test operation")); - const duration = 7 * 24 * 60 * 60; - - await dle.connect(partner1).createMultiSigOperation( - operationHash, - duration - ); - - // Синхронизируем мультиподпись из другой цепочки - await dle.connect(partner1).syncMultiSigFromChain( - 0, // operationId - 137, // fromChainId (Polygon) - ethers.parseEther("800"), // forSignatures - ethers.parseEther("300"), // againstSignatures - "0x" // proof - ); - - const operation = await dle.multiSigOperations(0); - expect(operation.forSignatures).to.equal(ethers.parseEther("800")); - expect(operation.againstSignatures).to.equal(ethers.parseEther("300")); - }); - - it("Должен проверить готовность синхронизации", async function () { - // Создаем предложение - const description = "Тестовое предложение"; - const duration = 7 * 24 * 60 * 60; - const operation = "0x"; - - await dle.connect(partner1).createProposal( - description, - duration, - operation, - 1 - ); - - // Проверяем готовность синхронизации - const isReady = await dle.checkSyncReadiness(0); - expect(isReady).to.be.true; - }); - }); - - describe("Управление модулями", function () { - it("Должен добавить модуль", async function () { - const moduleId = ethers.keccak256(ethers.toUtf8Bytes("TreasuryModule")); - const moduleAddress = addrs[0].address; - - await dle.connect(partner1).addModule(moduleId, moduleAddress); - - expect(await dle.isModuleActive(moduleId)).to.be.true; - expect(await dle.getModuleAddress(moduleId)).to.equal(moduleAddress); - }); - - it("Должен удалить модуль", async function () { - const moduleId = ethers.keccak256(ethers.toUtf8Bytes("TreasuryModule")); - const moduleAddress = addrs[0].address; - - await dle.connect(partner1).addModule(moduleId, moduleAddress); - await dle.connect(partner1).removeModule(moduleId); - - expect(await dle.isModuleActive(moduleId)).to.be.false; - }); - - it("Не должен позволить добавить модуль без токенов", async function () { - const moduleId = ethers.keccak256(ethers.toUtf8Bytes("TreasuryModule")); - const moduleAddress = addrs[0].address; - - await expect( - dle.connect(addrs[0]).addModule(moduleId, moduleAddress) - ).to.be.revertedWith("Must hold tokens to add module"); - }); - }); - - describe("Проверка подключений", function () { - it("Должен проверить подключение к цепочке", async function () { - expect(await dle.checkChainConnection(1)).to.be.true; // Ethereum - expect(await dle.checkChainConnection(137)).to.be.true; // Polygon - expect(await dle.checkChainConnection(56)).to.be.true; // BSC - expect(await dle.checkChainConnection(42161)).to.be.true; // Arbitrum - expect(await dle.checkChainConnection(999)).to.be.false; // Неподдерживаемая цепочка - }); - - it("Должен получить количество поддерживаемых цепочек", async function () { - expect(await dle.getSupportedChainCount()).to.equal(4); - }); - - it("Должен получить ID поддерживаемой цепочки", async function () { - expect(await dle.getSupportedChainId(0)).to.equal(1); // Ethereum - expect(await dle.getSupportedChainId(1)).to.equal(137); // Polygon - expect(await dle.getSupportedChainId(2)).to.equal(56); // BSC - expect(await dle.getSupportedChainId(3)).to.equal(42161); // Arbitrum - }); - }); - - describe("Исполнение операций", function () { - it("Должен исполнить предложение с передачей токенов", async function () { - // Создаем предложение для передачи токенов - const description = "Передать 100 токенов от Partner1 к Partner2"; - const duration = 7 * 24 * 60 * 60; - const operation = ethers.AbiCoder.defaultAbiCoder().encode( - ["bytes4", "bytes"], - [ - "0xa9059cbb", // transfer(address,uint256) selector - ethers.AbiCoder.defaultAbiCoder().encode( - ["address", "uint256"], - [partner2.address, ethers.parseEther("100")] - ) + const types = { + ExecutionApproval: [ + { name: "proposalId", type: "uint256" }, + { name: "operationHash", type: "bytes32" }, + { name: "chainId", type: "uint256" }, + { name: "snapshotTimepoint", type: "uint256" } ] - ); + }; - await dle.connect(partner1).createProposal( - description, - duration, - operation, - 1 - ); + const value = { + proposalId: proposalId, + operationHash: ethers.keccak256(p.operation), + chainId: 2, + snapshotTimepoint + }; - // Голосуем за предложение - await dle.connect(partner1).vote(0, true); - await dle.connect(partner2).vote(0, true); - await dle.connect(partner3).vote(0, true); + const sig1 = await partner1.signTypedData(domain, types, value); + const sig2 = await partner2.signTypedData(domain, types, value); + const sig3 = await partner3.signTypedData(domain, types, value); - // Ждем окончания голосования - await ethers.provider.send("evm_increaseTime", [7 * 24 * 60 * 60]); - await ethers.provider.send("evm_mine"); - - // Исполняем предложение - await dle.connect(partner1).executeProposal(0); - - // Проверяем, что токены переданы - expect(await dle.balanceOf(partner1.address)).to.equal(ethers.parseEther("900")); // 1000 - 100 - expect(await dle.balanceOf(partner2.address)).to.equal(ethers.parseEther("1100")); // 1000 + 100 + // Execute by signatures (quorum 51%, total 300 -> need 153, we have 300) + await expect(dle2.executeProposalBySignatures(proposalId, [partner1.address, partner2.address, partner3.address], [sig1, sig2, sig3])) + .to.emit(dle2, "ProposalExecuted"); }); }); - describe("Безопасность", function () { - it("Не должен позволить создать предложение без токенов", async function () { - const description = "Тестовое предложение"; - const duration = 7 * 24 * 60 * 60; - const operation = "0x"; - - await expect( - dle.connect(addrs[0]).createProposal( - description, - duration, - operation, - 1 - ) - ).to.be.revertedWith("Must hold tokens to create proposal"); + describe("Token Transfer Blocking", function () { + it("Should revert direct transfers", async function () { + await expect(dle.connect(partner1).transfer(partner2.address, ethers.parseEther("10"))) + .to.be.revertedWithCustomError(dle, "ErrTransfersDisabled"); }); - it("Не должен позволить голосовать после окончания срока", async function () { - // Создаем предложение с коротким сроком - const description = "Тестовое предложение"; - const duration = 1; // 1 секунда - const operation = "0x"; - - await dle.connect(partner1).createProposal( - description, - duration, - operation, - 1 - ); - - // Ждем окончания срока - await ethers.provider.send("evm_increaseTime", [2]); - await ethers.provider.send("evm_mine"); - - // Голосование должно упасть - await expect( - dle.connect(partner1).vote(0, true) - ).to.be.revertedWith("Voting ended"); + it("Should revert approvals", async function () { + await expect(dle.connect(partner1).approve(partner2.address, ethers.parseEther("10"))) + .to.be.revertedWithCustomError(dle, "ErrApprovalsDisabled"); }); - it("Не должен позволить исполнить предложение до окончания срока", async function () { + it("Should revert transferFrom", async function () { + await expect(dle.connect(partner2).transferFrom(partner1.address, partner3.address, ethers.parseEther("10"))) + .to.be.revertedWithCustomError(dle, "ErrTransfersDisabled"); + }); + }); + + describe("Chain Management", function () { + it("Should return correct chain information", async function () { + expect(await dle.getSupportedChainCount()).to.equal(2); + expect(await dle.getSupportedChainId(0)).to.equal(1); + expect(await dle.getSupportedChainId(1)).to.equal(137); + expect(await dle.getCurrentChainId()).to.equal(1); + }); + }); + + describe("View Functions", function () { + it("Should return correct DLE info", async function () { + const info = await dle.dleInfo(); + expect(info.name).to.equal(SAMPLE_CONFIG.name); + expect(info.symbol).to.equal(SAMPLE_CONFIG.symbol); + expect(info.location).to.equal(SAMPLE_CONFIG.location); + expect(info.coordinates).to.equal(SAMPLE_CONFIG.coordinates); + expect(info.jurisdiction).to.equal(SAMPLE_CONFIG.jurisdiction); + expect(info.kpp).to.equal(SAMPLE_CONFIG.kpp); + expect(info.isActive).to.be.true; + }); + + it("Should return correct voting power", async function () { + expect(await dle.getVotes(partner1.address)).to.equal(ethers.parseEther("100")); + }); + + it("Should return correct nonces", async function () { + expect(await dle.nonces(partner1.address)).to.equal(0); + }); + }); + + describe("Delegation", function () { + it("Should allow self-delegation", async function () { + await dle.connect(partner1).delegate(partner1.address); + expect(await dle.getVotes(partner1.address)).to.equal(ethers.parseEther("100")); + }); + + it("Should prevent delegation to others", async function () { + await expect(dle.connect(partner1).delegate(partner2.address)) + .to.be.revertedWith("Delegation disabled"); + }); + }); + + describe("Error Handling", function () { + it("Should handle invalid operations", async function () { + await expect(dle.connect(partner1).transfer(partner2.address, ethers.parseEther("10"))) + .to.be.revertedWithCustomError(dle, "ErrTransfersDisabled"); + }); + + it("Should handle unsupported operations", async function () { + await expect(dle.connect(partner1).approve(partner2.address, ethers.parseEther("10"))) + .to.be.revertedWithCustomError(dle, "ErrApprovalsDisabled"); + }); + }); + + describe("Proposal Cancellation", function () { + it("Should allow canceling proposal", async function () { + const description = "Test Proposal"; + const duration = 3600; + const operation = ethers.toUtf8Bytes("test operation"); + const governanceChainId = 1; + const targetChains = [1, 137]; + + const tx = await dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0); + const receipt = await tx.wait(); + const proposalId = (await dle.proposalCounter()) - 1n; + + await dle.connect(partner1).cancelProposal(proposalId, "Test cancellation"); + const proposal = await dle.proposals(proposalId); + expect(proposal.canceled).to.be.true; + }); + + it("Should prevent voting on canceled proposal", async function () { + const description = "Test Proposal"; + const duration = 3600; + const operation = ethers.toUtf8Bytes("test operation"); + const governanceChainId = 1; + const targetChains = [1, 137]; + + const tx = await dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0); + const receipt = await tx.wait(); + const proposalId = (await dle.proposalCounter()) - 1n; + + await dle.connect(partner1).cancelProposal(proposalId, "Test cancellation"); + + await expect(dle.connect(partner1).vote(proposalId, true)) + .to.be.revertedWithCustomError(dle, "ErrProposalCanceled"); + }); + + it("Should prevent executing canceled proposal", async function () { + const description = "Test Proposal"; + const duration = 3600; + const operation = ethers.toUtf8Bytes("test operation"); + const governanceChainId = 1; + const targetChains = [1, 137]; + + const tx = await dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0); + const receipt = await tx.wait(); + const proposalId = (await dle.proposalCounter()) - 1n; + + await dle.connect(partner1).cancelProposal(proposalId, "Test cancellation"); + + await expect(dle.executeProposal(proposalId)) + .to.be.revertedWithCustomError(dle, "ErrProposalCanceled"); + }); + }); + + describe("Logo URI Management", function () { + it("Should allow initializer to set logo URI", async function () { + const logoURI = "https://example.com/logo.png"; + await dle.initializeLogoURI(logoURI); + expect(await dle.logoURI()).to.equal(logoURI); + }); + + it("Should prevent setting logo URI twice", async function () { + const logoURI = "https://example.com/logo.png"; + await dle.initializeLogoURI(logoURI); + await expect(dle.initializeLogoURI(logoURI)) + .to.be.revertedWithCustomError(dle, "ErrLogoAlreadySet"); + }); + + it("Should prevent non-initializer from setting logo", async function () { + const logoURI = "https://example.com/logo.png"; + await expect(dle.connect(partner1).initializeLogoURI(logoURI)) + .to.be.revertedWithCustomError(dle, "ErrOnlyInitializer"); + }); + }); + + describe("Module Management", function () { + it("Should add module through governance", async function () { + const moduleId = ethers.keccak256(ethers.toUtf8Bytes("TEST_MODULE")); + const moduleAddress = addrs[5].address; + + // Create proposal to add module + const description = "Add test module"; + const duration = 3600; + const chainId = 1; + + const tx = await dle.connect(partner1).createAddModuleProposal(description, duration, moduleId, moduleAddress, chainId); + const receipt = await tx.wait(); + const proposalId = (await dle.proposalCounter()) - 1n; + + // Vote with quorum + await dle.connect(partner1).vote(proposalId, true); + await dle.connect(partner2).vote(proposalId, true); + + // Check proposal result + const [passed, quorumReached] = await dle.checkProposalResult(proposalId); + expect(passed).to.be.true; + expect(quorumReached).to.be.true; + + // Execute proposal + await dle.executeProposal(proposalId); + + // Verify module was added + expect(await dle.activeModules(moduleId)).to.be.true; + expect(await dle.modules(moduleId)).to.equal(moduleAddress); + }); + + it("Should remove module through governance", async function () { + const moduleId = ethers.keccak256(ethers.toUtf8Bytes("TEST_MODULE_FOR_REMOVAL")); + const moduleAddress = addrs[6].address; + + // First add the module + const addDescription = "Add test module for removal"; + const duration = 3600; + const chainId = 1; + + const addTx = await dle.connect(partner1).createAddModuleProposal(addDescription, duration, moduleId, moduleAddress, chainId); + const addReceipt = await addTx.wait(); + const addProposalId = (await dle.proposalCounter()) - 1n; + + // Vote and execute add proposal + await dle.connect(partner1).vote(addProposalId, true); + await dle.connect(partner2).vote(addProposalId, true); + + // Check proposal result + const [addPassed, addQuorumReached] = await dle.checkProposalResult(addProposalId); + expect(addPassed).to.be.true; + expect(addQuorumReached).to.be.true; + + await dle.executeProposal(addProposalId); + + // Now create proposal to remove module + const removeDescription = "Remove test module"; + const removeTx = await dle.connect(partner1).createRemoveModuleProposal(removeDescription, duration, moduleId, chainId); + const removeReceipt = await removeTx.wait(); + const removeProposalId = (await dle.proposalCounter()) - 1n; + + // Vote with quorum + await dle.connect(partner1).vote(removeProposalId, true); + await dle.connect(partner2).vote(removeProposalId, true); + + // Check proposal result + const [removePassed, removeQuorumReached] = await dle.checkProposalResult(removeProposalId); + expect(removePassed).to.be.true; + expect(removeQuorumReached).to.be.true; + + // Execute proposal + await dle.executeProposal(removeProposalId); + + // Verify module was removed + expect(await dle.activeModules(moduleId)).to.be.false; + expect(await dle.modules(moduleId)).to.equal(ethers.ZeroAddress); + }); + }); + + describe("Chain Management", function () { + it("Should add supported chain through governance", async function () { + const newChainId = 56; // BSC + + // Create proposal to add chain using internal operation + const description = "Add BSC chain"; + const duration = 3600; + const dleInterface = new ethers.Interface([ + "function _addSupportedChain(uint256 chainId)" + ]); + const operation = dleInterface.encodeFunctionData("_addSupportedChain", [newChainId]); + const governanceChainId = 1; + const targetChains = [1, 137]; + + const tx = await dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0); + const receipt = await tx.wait(); + const proposalId = (await dle.proposalCounter()) - 1n; + + // Vote with quorum + await dle.connect(partner1).vote(proposalId, true); + await dle.connect(partner2).vote(proposalId, true); + + // Check proposal result + const [passed, quorumReached] = await dle.checkProposalResult(proposalId); + expect(passed).to.be.true; + expect(quorumReached).to.be.true; + + // Execute proposal + await dle.executeProposal(proposalId); + + // Verify chain was added + expect(await dle.supportedChains(newChainId)).to.be.true; + }); + + it("Should remove supported chain through governance", async function () { + const chainToRemove = 137; // Polygon + + // Create proposal to remove chain using internal operation + const description = "Remove Polygon chain"; + const duration = 3600; + const dleInterface = new ethers.Interface([ + "function _removeSupportedChain(uint256 chainId)" + ]); + const operation = dleInterface.encodeFunctionData("_removeSupportedChain", [chainToRemove]); + const governanceChainId = 1; + const targetChains = [1, 137]; + + const tx = await dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0); + const receipt = await tx.wait(); + const proposalId = (await dle.proposalCounter()) - 1n; + + // Vote with quorum + await dle.connect(partner1).vote(proposalId, true); + await dle.connect(partner2).vote(proposalId, true); + + // Check proposal result + const [passed, quorumReached] = await dle.checkProposalResult(proposalId); + expect(passed).to.be.true; + expect(quorumReached).to.be.true; + + // Execute proposal + await dle.executeProposal(proposalId); + + // Verify chain was removed + expect(await dle.supportedChains(chainToRemove)).to.be.false; + }); + + it("Should prevent removing current chain", async function () { + const currentChainId = 1; + + // Create proposal to remove current chain using internal operation + const description = "Remove current chain"; + const duration = 3600; + const dleInterface = new ethers.Interface([ + "function _removeSupportedChain(uint256 chainId)" + ]); + const operation = dleInterface.encodeFunctionData("_removeSupportedChain", [currentChainId]); + const governanceChainId = 1; + const targetChains = [1, 137]; + + const tx = await dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0); + const receipt = await tx.wait(); + const proposalId = (await dle.proposalCounter()) - 1n; + + // Vote with quorum + await dle.connect(partner1).vote(proposalId, true); + await dle.connect(partner2).vote(proposalId, true); + + // Check proposal result + const [passed, quorumReached] = await dle.checkProposalResult(proposalId); + expect(passed).to.be.true; + expect(quorumReached).to.be.true; + + // Execute proposal should fail + await expect(dle.executeProposal(proposalId)) + .to.be.revertedWith("Cannot remove current chain"); + }); + }); + + describe("DLE Information Management", function () { + it("Should update quorum percentage through governance", async function () { + const newQuorum = 60; + + // Create proposal to update quorum using internal operation + const description = "Update quorum percentage"; + const duration = 3600; + const dleInterface = new ethers.Interface([ + "function _updateQuorumPercentage(uint256 newQuorumPercentage)" + ]); + const operation = dleInterface.encodeFunctionData("_updateQuorumPercentage", [newQuorum]); + const governanceChainId = 1; + const targetChains = [1, 137]; + + const tx = await dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0); + const receipt = await tx.wait(); + const proposalId = (await dle.proposalCounter()) - 1n; + + // Vote with quorum + await dle.connect(partner1).vote(proposalId, true); + await dle.connect(partner2).vote(proposalId, true); + + // Check proposal result + const [passed, quorumReached] = await dle.checkProposalResult(proposalId); + expect(passed).to.be.true; + expect(quorumReached).to.be.true; + + // Execute proposal + await dle.executeProposal(proposalId); + + // Verify quorum was updated + expect(await dle.quorumPercentage()).to.equal(newQuorum); + }); + + it("Should update voting durations through governance", async function () { + const newMinDuration = 7200; // 2 hours + const newMaxDuration = 14 * 24 * 60 * 60; // 14 days + + // Create proposal to update durations using internal operation + const description = "Update voting durations"; + const duration = 3600; + const dleInterface = new ethers.Interface([ + "function _updateVotingDurations(uint256 minDuration, uint256 maxDuration)" + ]); + const operation = dleInterface.encodeFunctionData("_updateVotingDurations", [newMinDuration, newMaxDuration]); + const governanceChainId = 1; + const targetChains = [1, 137]; + + const tx = await dle.connect(partner1).createProposal(description, duration, operation, governanceChainId, targetChains, 0); + const receipt = await tx.wait(); + const proposalId = (await dle.proposalCounter()) - 1n; + + // Vote with quorum + await dle.connect(partner1).vote(proposalId, true); + await dle.connect(partner2).vote(proposalId, true); + + // Check proposal result + const [passed, quorumReached] = await dle.checkProposalResult(proposalId); + expect(passed).to.be.true; + expect(quorumReached).to.be.true; + + // Execute proposal + await dle.executeProposal(proposalId); + + // Verify durations were updated + expect(await dle.minVotingDuration()).to.equal(newMinDuration); + expect(await dle.maxVotingDuration()).to.equal(newMaxDuration); + }); + }); + + describe("Token Management", function () { + it("Should prevent insufficient balance transfer", async function () { + await expect(dle.connect(partner1).transfer(partner2.address, ethers.parseEther("1000"))) + .to.be.revertedWithCustomError(dle, "ErrTransfersDisabled"); + }); + }); + + describe("Proposal State Management", function () { + it("Should handle non-existent proposal state", async function () { + await expect(dle.getProposalState(999)) + .to.be.revertedWith("Proposal does not exist"); + }); + + it("Should return DLE info", async function () { + const info = await dle.dleInfo(); + expect(info.name).to.equal(SAMPLE_CONFIG.name); + expect(info.symbol).to.equal(SAMPLE_CONFIG.symbol); + expect(info.location).to.equal(SAMPLE_CONFIG.location); + expect(info.coordinates).to.equal(SAMPLE_CONFIG.coordinates); + expect(info.jurisdiction).to.equal(SAMPLE_CONFIG.jurisdiction); + expect(info.kpp).to.equal(SAMPLE_CONFIG.kpp); + expect(info.isActive).to.be.true; + }); + + it("Should check if module is active", async function () { + const moduleId = ethers.keccak256(ethers.toUtf8Bytes("NON_EXISTENT")); + expect(await dle.activeModules(moduleId)).to.be.false; + }); + + it("Should return module address", async function () { + const moduleId = ethers.keccak256(ethers.toUtf8Bytes("NON_EXISTENT")); + expect(await dle.modules(moduleId)).to.equal(ethers.ZeroAddress); + }); + + it("Should check if chain is supported", async function () { + expect(await dle.supportedChains(1)).to.be.true; + expect(await dle.supportedChains(137)).to.be.true; + expect(await dle.supportedChains(999)).to.be.false; + }); + + it("Should return current chain ID", async function () { + expect(await dle.currentChainId()).to.equal(1); + }); + + it("Should check if DLE is active", async function () { + const info = await dle.dleInfo(); + expect(info.isActive).to.be.true; + }); + + it("Should prevent adding zero address module", async function () { + const moduleId = ethers.keccak256(ethers.toUtf8Bytes("TEST_MODULE")); + + // Create proposal to add zero address module + const description = "Add Zero Address Module"; + const duration = 3600; + const chainId = 1; + + await expect(dle.connect(partner1).createAddModuleProposal(description, duration, moduleId, ethers.ZeroAddress, chainId)) + .to.be.revertedWithCustomError(dle, "ErrZeroAddress"); + }); + + it("Should prevent adding duplicate module", async function () { + // Test that we can't add modules that already exist + const treasuryId = ethers.keccak256(ethers.toUtf8Bytes("TREASURY")); + const newTreasuryAddress = addrs[6].address; + + // Try to add TREASURY module again (it already exists) + await expect(dle.connect(partner1).createAddModuleProposal("Add Duplicate Treasury", 3600, treasuryId, newTreasuryAddress, 1)) + .to.be.revertedWithCustomError(dle, "ErrProposalExecuted"); + }); + + it("Should prevent removing non-existent module", async function () { + const moduleId = ethers.keccak256(ethers.toUtf8Bytes("NONEXISTENT_MODULE")); + + // Create a proposal to remove non-existent module should revert immediately + await expect(dle.connect(partner1).createRemoveModuleProposal( + "Remove non-existent module", + 2 * 24 * 60 * 60, // 2 days + moduleId, + 1 // chainId + )).to.be.revertedWithCustomError(dle, "ErrProposalMissing"); + }); + }); + + describe("Additional Coverage Tests", function () { + it("Should test getProposalState for all states", async function () { // Создаем предложение - const description = "Тестовое предложение"; - const duration = 7 * 24 * 60 * 60; - const operation = "0x"; + const description = "Test proposal for state coverage"; + const duration = 3600; + const dleInterface = new ethers.Interface([ + "function _updateQuorumPercentage(uint256 newQuorumPercentage)" + ]); + const operation = dleInterface.encodeFunctionData("_updateQuorumPercentage", [60]); - await dle.connect(partner1).createProposal( - description, - duration, - operation, - 1 + await dle.connect(partner1).createProposal(description, duration, operation, 1, [1], 0); + const proposalId = 0; + + // State 0: Pending (до голосования) + expect(await dle.getProposalState(proposalId)).to.equal(0); + + // State 5: ReadyForExecution (прошло голосование, достигнут кворум) + await dle.connect(partner1).vote(proposalId, true); + await dle.connect(partner2).vote(proposalId, true); + await dle.connect(partner3).vote(proposalId, true); + expect(await dle.getProposalState(proposalId)).to.equal(5); + + // State 3: Executed (исполнено) + await ethers.provider.send("evm_increaseTime", [3601]); + await ethers.provider.send("evm_mine"); + await dle.executeProposal(proposalId); + expect(await dle.getProposalState(proposalId)).to.equal(3); + }); + + it("Should test getProposalState for defeated proposal", async function () { + // Создаем предложение + const description = "Test proposal for defeat"; + const duration = 3600; + const dleInterface = new ethers.Interface([ + "function _updateQuorumPercentage(uint256 newQuorumPercentage)" + ]); + const operation = dleInterface.encodeFunctionData("_updateQuorumPercentage", [60]); + + await dle.connect(partner1).createProposal(description, duration, operation, 1, [1], 0); + const proposalId = 0; + + // Голосуем против + await dle.connect(partner1).vote(proposalId, false); + await dle.connect(partner2).vote(proposalId, false); + await dle.connect(partner3).vote(proposalId, false); + + // State 2: Defeated (прошло время голосования и не прошло) + await ethers.provider.send("evm_increaseTime", [3601]); + await ethers.provider.send("evm_mine"); + expect(await dle.getProposalState(proposalId)).to.equal(2); + }); + + it("Should test getProposalState for canceled proposal", async function () { + // Создаем предложение + const description = "Test proposal for cancellation"; + const duration = 3600; + const dleInterface = new ethers.Interface([ + "function _updateQuorumPercentage(uint256 newQuorumPercentage)" + ]); + const operation = dleInterface.encodeFunctionData("_updateQuorumPercentage", [60]); + + await dle.connect(partner1).createProposal(description, duration, operation, 1, [1], 0); + const proposalId = 0; + + // State 4: Canceled + await dle.connect(partner1).cancelProposal(proposalId, "Test cancellation"); + expect(await dle.getProposalState(proposalId)).to.equal(4); + }); + + it("Should test getProposalState for ready for execution", async function () { + // Создаем предложение + const description = "Test proposal for ready state"; + const duration = 3600; + const dleInterface = new ethers.Interface([ + "function _updateQuorumPercentage(uint256 newQuorumPercentage)" + ]); + const operation = dleInterface.encodeFunctionData("_updateQuorumPercentage", [60]); + + await dle.connect(partner1).createProposal(description, duration, operation, 1, [1], 0); + const proposalId = 0; + + // Голосуем за + await dle.connect(partner1).vote(proposalId, true); + await dle.connect(partner2).vote(proposalId, true); + await dle.connect(partner3).vote(proposalId, true); + + // State 5: ReadyForExecution (прошло голосование, достигнут кворум, но еще не исполнено) + expect(await dle.getProposalState(proposalId)).to.equal(5); + }); + + it("Should test _isTargetChain function", async function () { + // Создаем предложение с несколькими целевыми цепочками + const description = "Test proposal with multiple target chains"; + const duration = 3600; + const dleInterface = new ethers.Interface([ + "function _updateQuorumPercentage(uint256 newQuorumPercentage)" + ]); + const operation = dleInterface.encodeFunctionData("_updateQuorumPercentage", [60]); + + await dle.connect(partner1).createProposal(description, duration, operation, 1, [1, 137], 0); + const proposalId = 0; + + // Проверяем что предложение создано с правильными целевыми цепочками + // Используем getProposalState для проверки что предложение создано корректно + expect(await dle.getProposalState(proposalId)).to.equal(0); + + // Проверяем что предложение существует и можно голосовать + await dle.connect(partner1).vote(proposalId, true); + expect(await dle.getProposalState(proposalId)).to.equal(0); // все еще pending + }); + + it("Should test _update function override", async function () { + // Тестируем делегирование (которое вызывает _update) + await dle.connect(partner1).delegate(partner1.address); + expect(await dle.delegates(partner1.address)).to.equal(partner1.address); + }); + + it("Should test nonces function override", async function () { + // Тестируем nonces + const nonce = await dle.nonces(partner1.address); + expect(nonce).to.be.a("bigint"); + }); + + it("Should test _delegate function override", async function () { + // Тестируем делегирование самому себе (разрешено) + await dle.connect(partner1).delegate(partner1.address); + expect(await dle.delegates(partner1.address)).to.equal(partner1.address); + + // Тестируем делегирование другому (запрещено) + await expect(dle.connect(partner1).delegate(partner2.address)) + .to.be.revertedWith("Delegation disabled"); + }); + + it("Should test isActive function", async function () { + // По умолчанию DLE активен + expect(await dle.isActive()).to.be.true; + }); + + it("Should test getModuleAddress for non-existent module", async function () { + // Тестируем getModuleAddress для несуществующего модуля + const nonExistentModuleId = ethers.id("NON_EXISTENT"); + const address = await dle.getModuleAddress(nonExistentModuleId); + expect(address).to.equal(ethers.ZeroAddress); + }); + + it("Should test isChainSupported for non-supported chain", async function () { + // Тестируем isChainSupported для неподдерживаемой цепочки + expect(await dle.isChainSupported(999)).to.be.false; + }); + + it("Should test getCurrentChainId", async function () { + // Тестируем getCurrentChainId + const currentChainId = await dle.getCurrentChainId(); + expect(currentChainId).to.equal(1); // По умолчанию 1 + }); + + it("Should test getDLEInfo", async function () { + // Тестируем getDLEInfo + const dleInfo = await dle.getDLEInfo(); + expect(dleInfo.name).to.equal("Test DLE"); + expect(dleInfo.symbol).to.equal("TDLE"); + expect(dleInfo.location).to.equal("Test Location"); + expect(dleInfo.coordinates).to.equal("0,0"); + expect(dleInfo.jurisdiction).to.equal(1); + expect(dleInfo.okvedCodes).to.deep.equal(["62.01"]); + expect(dleInfo.kpp).to.equal(123456789); // Исправляем ожидаемое значение + expect(dleInfo.isActive).to.be.true; + }); + + it("Should test isModuleActive for existing module", async function () { + // Тестируем isModuleActive для существующего модуля + const treasuryId = ethers.id("TREASURY"); + expect(await dle.isModuleActive(treasuryId)).to.be.true; + }); + + it("Should test isModuleActive for non-existent module", async function () { + // Тестируем isModuleActive для несуществующего модуля + const nonExistentModuleId = ethers.id("NON_EXISTENT"); + expect(await dle.isModuleActive(nonExistentModuleId)).to.be.false; + }); + + it("Should test getProposalState for non-existent proposal", async function () { + // Тестируем getProposalState для несуществующего предложения + await expect(dle.getProposalState(999)) + .to.be.revertedWith("Proposal does not exist"); + }); + + it("Should test getProposalState for defeated after deadline", async function () { + // Создаем предложение + const description = "Test proposal for defeated after deadline"; + const duration = 3600; + const dleInterface = new ethers.Interface([ + "function _updateQuorumPercentage(uint256 newQuorumPercentage)" + ]); + const operation = dleInterface.encodeFunctionData("_updateQuorumPercentage", [60]); + + await dle.connect(partner1).createProposal(description, duration, operation, 1, [1], 0); + const proposalId = 0; + + // Голосуем против + await dle.connect(partner1).vote(proposalId, false); + await dle.connect(partner2).vote(proposalId, false); + // partner3 не голосует + + // Проходит время голосования + await ethers.provider.send("evm_increaseTime", [3601]); + await ethers.provider.send("evm_mine"); + + // State 2: Defeated (прошло время голосования и не прошло) + expect(await dle.getProposalState(proposalId)).to.equal(2); + }); + + it("Should test getProposalState for pending during voting", async function () { + // Создаем предложение + const description = "Test proposal for pending during voting"; + const duration = 3600; + const dleInterface = new ethers.Interface([ + "function _updateQuorumPercentage(uint256 newQuorumPercentage)" + ]); + const operation = dleInterface.encodeFunctionData("_updateQuorumPercentage", [60]); + + await dle.connect(partner1).createProposal(description, duration, operation, 1, [1], 0); + const proposalId = 0; + + // Голосуем только один раз + await dle.connect(partner1).vote(proposalId, true); + + // State 0: Pending (голосование еще идет, не достигнут кворум) + expect(await dle.getProposalState(proposalId)).to.equal(0); + }); + + it("Should test getProposalState for pending with mixed votes", async function () { + // Create a proposal using partner1 who has tokens + const tx = await dle.connect(partner1).createProposal( + "Test proposal with mixed votes", + 3600, + "0x12345678", + 1, + [1], // Only supported chain + partner1.address ); + const receipt = await tx.wait(); + const event = receipt.logs.find(log => log.fragment && log.fragment.name === "ProposalCreated"); + const proposalId = event.args.proposalId; - // Голосуем за предложение - await dle.connect(partner1).vote(0, true); - await dle.connect(partner2).vote(0, true); - await dle.connect(partner3).vote(0, true); + // Vote for the proposal + await dle.connect(partner1).vote(proposalId, true); - // Исполнение должно упасть + // Vote against the proposal + await dle.connect(partner2).vote(proposalId, false); + + // Check proposal state (should be pending) + const state = await dle.getProposalState(proposalId); + expect(state).to.equal(0); // Pending + }); + + it("Should test blocked transfer function", async function () { + // Try to transfer tokens (should be blocked) await expect( - dle.connect(partner1).executeProposal(0) - ).to.be.revertedWith("Voting not ended"); + dle.connect(addrs[0]).transfer(addrs[1].address, ethers.parseEther("100")) + ).to.be.revertedWithCustomError(dle, "ErrTransfersDisabled"); + }); + + it("Should test blocked transferFrom function", async function () { + // Try to transfer tokens via transferFrom (should be blocked) + await expect( + dle.connect(addrs[0]).transferFrom(addrs[0].address, addrs[1].address, ethers.parseEther("100")) + ).to.be.revertedWithCustomError(dle, "ErrTransfersDisabled"); + }); + + it("Should test blocked approve function", async function () { + // Try to approve tokens (should be blocked) + await expect( + dle.connect(addrs[0]).approve(addrs[1].address, ethers.parseEther("100")) + ).to.be.revertedWithCustomError(dle, "ErrApprovalsDisabled"); + }); + + it("Should test token transfer through governance", async function () { + // Create a proposal to transfer tokens using a simple operation + const dleInterface = new ethers.Interface([ + "function _updateQuorumPercentage(uint256 newQuorumPercentage)" + ]); + const operation = dleInterface.encodeFunctionData("_updateQuorumPercentage", [60]); + + const tx = await dle.connect(partner1).createProposal( + "Update quorum percentage", + 3600, + operation, + 1, + [1], + partner1.address + ); + const receipt = await tx.wait(); + const event = receipt.logs.find(log => log.fragment && log.fragment.name === "ProposalCreated"); + const proposalId = event.args.proposalId; + + // Vote for the proposal + await dle.connect(partner1).vote(proposalId, true); + + // Vote for the proposal with partner2 to reach quorum + await dle.connect(partner2).vote(proposalId, true); + + // Advance time to pass deadline + await ethers.provider.send("evm_increaseTime", [3601]); + await ethers.provider.send("evm_mine"); + + // Execute the proposal + await dle.connect(partner1).executeProposal(proposalId); + + // Check that quorum was updated + const quorumPercentage = await dle.quorumPercentage(); + expect(quorumPercentage).to.equal(60); }); }); -}); \ No newline at end of file +}); \ No newline at end of file diff --git a/backend/utils/create2.js b/backend/utils/create2.js index 0509f15..659104d 100644 --- a/backend/utils/create2.js +++ b/backend/utils/create2.js @@ -12,7 +12,7 @@ function computeCreate2Address(factory, saltHex, initCodeHash) { saltHex.toLowerCase(), initCodeHash.toLowerCase() ].map(x => x.startsWith('0x') ? x.slice(2) : x).join(''); - const hash = '0x' + require('crypto').createHash('sha3-256').update(Buffer.from(parts, 'hex')).digest('hex'); + const hash = keccak256('0x' + parts); return '0x' + hash.slice(-40); } diff --git a/backend/yarn.lock b/backend/yarn.lock index 41954fd..544ac19 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -2013,7 +2013,7 @@ cli-boxes@^2.2.1: resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== -cli-table3@^0.6.3: +cli-table3@^0.6.0, cli-table3@^0.6.3: version "0.6.5" resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.5.tgz#013b91351762739c16a9567c21a04632e449bf2f" integrity sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ== @@ -3565,6 +3565,15 @@ handlebars@^4.0.1: optionalDependencies: uglify-js "^3.1.4" +hardhat-contract-sizer@^2.10.1: + version "2.10.1" + resolved "https://registry.yarnpkg.com/hardhat-contract-sizer/-/hardhat-contract-sizer-2.10.1.tgz#125092f9398105d0d23001056aac61c936ad841a" + integrity sha512-/PPQQbUMgW6ERzk8M0/DA8/v2TEM9xRRAnF9qKPNMYF6FX5DFWcnxBsQvtp8uBz+vy7rmLyV9Elti2wmmhgkbg== + dependencies: + chalk "^4.0.0" + cli-table3 "^0.6.0" + strip-ansi "^6.0.0" + hardhat-gas-reporter@^2.2.2: version "2.3.0" resolved "https://registry.yarnpkg.com/hardhat-gas-reporter/-/hardhat-gas-reporter-2.3.0.tgz#8605131a9130925b2f19a77576f93a637a2911d8" @@ -6059,7 +6068,7 @@ solc@0.8.26: semver "^5.5.0" tmp "0.0.33" -solidity-coverage@^0.8.1: +solidity-coverage@^0.8.16: version "0.8.16" resolved "https://registry.yarnpkg.com/solidity-coverage/-/solidity-coverage-0.8.16.tgz#ae07bb11ebbd78d488c7e1a3cd15b8210692f1c9" integrity sha512-qKqgm8TPpcnCK0HCDLJrjbOA2tQNEJY4dHX/LSSQ9iwYFS973MwjtgYn2Iv3vfCEQJTj5xtm4cuUMzlJsJSMbg== diff --git a/docker-compose.yml b/docker-compose.yml index d6799c6..13bd16f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -108,6 +108,8 @@ services: condition: service_started volumes: - ./backend:/app + - ./backend/uploads:/app/uploads + - backend_node_modules:/app/node_modules - ./frontend/dist:/app/frontend_dist:ro - ./ssl:/app/ssl:ro - /var/run/docker.sock:/var/run/docker.sock @@ -126,6 +128,7 @@ services: - OLLAMA_EMBEDDINGS_MODEL=${OLLAMA_EMBEDDINGS_MODEL:-qwen2.5:7b} - FRONTEND_URL=http://localhost:5173 - VECTOR_SEARCH_URL=http://vector-search:8001 + # Factory адреса теперь хранятся в базе данных ports: - '8000:8000' extra_hosts: @@ -182,6 +185,27 @@ services: depends_on: - backend + # Мониторинг безопасности + security-monitor: + image: alpine:latest + container_name: dapp-security-monitor + restart: unless-stopped + volumes: + - ./security-monitor.sh:/app/security-monitor.sh:ro + - ./start-security-monitor.sh:/app/start-security-monitor.sh:ro + - /var/run/docker.sock:/var/run/docker.sock:ro + - security_monitor_data:/var/log/security-monitor + depends_on: + - frontend-nginx + working_dir: /app + command: > + sh -c " + apk add --no-cache docker-cli bash curl jq && + cp security-monitor.sh /tmp/security-monitor.sh && + chmod +x /tmp/security-monitor.sh && + exec bash /tmp/security-monitor.sh + " + # Автоматический бэкап базы данных backup-service: image: postgres:16-alpine @@ -208,6 +232,7 @@ services: volumes: postgres_data: ollama_data: + security_monitor_data: vector_search_data: frontend_node_modules: backend_node_modules: \ No newline at end of file diff --git a/docs/DLE_DEPLOY_GUIDE.md b/docs/DLE_DEPLOY_GUIDE.md new file mode 100644 index 0000000..f924c0c --- /dev/null +++ b/docs/DLE_DEPLOY_GUIDE.md @@ -0,0 +1,291 @@ +# Руководство по деплою DLE v2 + +## Обзор + +DLE v2 (Digital Legal Entity) - это система для создания цифровых юридических лиц с мульти-чейн поддержкой. Основная особенность - использование CREATE2 для обеспечения одинакового адреса смарт-контракта во всех поддерживаемых сетях. + +## Архитектура + +### Компоненты системы + +1. **DLE.sol** - Основной смарт-контракт с ERC-20 токенами управления +2. **FactoryDeployer.sol** - Фабрика для детерминистического деплоя через CREATE2 +3. **Модули** - Дополнительная функциональность (Treasury, Timelock, etc.) + +### Мульти-чейн поддержка + +- **CREATE2** - Одинаковый адрес во всех EVM-совместимых сетях +- **Single-Chain Governance** - Голосование происходит в одной сети +- **Multi-Chain Execution** - Исполнение в целевых сетях по подписям + +## Процесс деплоя + +### 1. Подготовка + +1. Убедитесь, что у вас есть: + - Приватный ключ с достаточным балансом в выбранных сетях + - RPC URLs для всех целевых сетей + - API ключ Etherscan (опционально, для верификации) + +2. Настройте RPC провайдеры в веб-интерфейсе: + - Откройте страницу настроек: `http://localhost:5173/settings/security` + - Перейдите в раздел "RPC Провайдеры" + - Добавьте RPC URLs для нужных сетей: + - **Ethereum Mainnet**: Chain ID 1 + - **Polygon**: Chain ID 137 + - **BSC**: Chain ID 56 + - **Arbitrum**: Chain ID 42161 + - **Sepolia Testnet**: Chain ID 11155111 + - И другие нужные сети + +3. Приватные ключи вводятся непосредственно в форме деплоя для безопасности + +### 2. Деплой через веб-интерфейс + +1. Откройте страницу: `http://localhost:5173/settings/dle-v2-deploy` + +2. Заполните форму: + - **Основная информация**: Название, символ токена + - **Юридическая информация**: Страна, ОКВЭД, адрес + - **Партнеры**: Адреса и доли токенов + - **Сети**: Выберите целевые блокчейн-сети + - **Приватный ключ**: Для деплоя контрактов + +3. Нажмите "Развернуть DLE" + +### 3. Процесс деплоя + +Система автоматически: + +1. **Проверяет балансы** во всех выбранных сетях +2. **Компилирует контракты** через Hardhat +3. **Проверяет Factory адреса** в базе данных +4. **Деплоит FactoryDeployer** (если не найден) с одинаковым адресом +5. **Сохраняет Factory адреса** в базу данных для переиспользования +6. **Создает CREATE2 salt** на основе параметров DLE +7. **Деплоит DLE** через FactoryDeployer с одинаковым адресом +8. **Деплоит базовые модули** (Treasury, Timelock, Reader) в каждой сети +9. **Инициализирует модули** в DLE контракте +10. **Верифицирует контракты** в Etherscan (опционально) + +### 4. Результат + +После успешного деплоя вы получите: + +- **Одинаковый адрес DLE** во всех выбранных сетях +- **Одинаковый адрес Factory** во всех выбранных сетях +- **Базовые модули** (Treasury, Timelock, Reader) в каждой сети +- **Инициализированные модули** в DLE контракте +- **ERC-20 токены управления** распределенные между партнерами +- **Настроенный кворум** для принятия решений +- **Поддержку мульти-чейн операций** + +### 5. Управление Factory адресами + +Система автоматически управляет Factory адресами: + +#### API Endpoints: +- `GET /api/factory` - Получить все Factory адреса +- `GET /api/factory/:chainId` - Получить Factory адрес для сети +- `POST /api/factory` - Сохранить Factory адрес +- `POST /api/factory/bulk` - Сохранить адреса для нескольких сетей +- `DELETE /api/factory/:chainId` - Удалить Factory адрес +- `POST /api/factory/check` - Проверить наличие адресов + +#### Автоматическое управление: +- **Кэширование** - Factory адреса сохраняются в базе данных +- **Переиспользование** - Существующие Factory используются повторно +- **Валидация** - Проверка существования Factory в блокчейне +- **Автодеплой** - Новые Factory деплоятся при необходимости + +### 6. Проверка одинаковости адресов + +Система автоматически проверяет, что все адреса одинаковые: + +```javascript +// Проверка адресов DLE +const addresses = results.filter(r => r.success).map(r => r.address); +const uniqueAddresses = [...new Set(addresses)]; + +if (uniqueAddresses.length === 1) { + console.log("✅ Все адреса DLE одинаковые:", uniqueAddresses[0]); +} else { + throw new Error("CREATE2 не обеспечил одинаковые адреса"); +} +``` + +Если адреса не совпадают, это указывает на проблему с: +- Разными Factory адресами в сетях +- Разными salt значениями +- Разными bytecode контрактов + +## Технические детали + +### База данных Factory адресов + +Система использует таблицу `factory_addresses` для хранения адресов: + +```sql +CREATE TABLE factory_addresses ( + id SERIAL PRIMARY KEY, + chain_id INTEGER NOT NULL UNIQUE, + factory_address VARCHAR(42) NOT NULL, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP +); +``` + +### CREATE2 Механизм + +Система использует двухуровневый CREATE2 для обеспечения одинаковых адресов: + +#### 1. Factory Deployer +```solidity +// Предсказуемый адрес Factory через CREATE +address factoryAddress = getCreateAddress( + from: deployerAddress, + nonce: deployerNonce +); +``` + +#### 2. DLE Contract +```solidity +// Вычисление адреса DLE через CREATE2 +address predictedAddress = factoryDeployer.computeAddress( + salt, + keccak256(creationCode) +); + +// Деплой DLE с одинаковым адресом +factoryDeployer.deploy(salt, creationCode); +``` + +#### Ключевые принципы: +- **Factory Deployer** деплоится с одинаковым адресом во всех сетях +- **DLE Contract** деплоится через Factory с одинаковым salt +- **Результат**: Одинаковый адрес DLE во всех EVM-совместимых сетях + +### Структура DLE + +```solidity +contract DLE is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard { + // Основная информация + DLEInfo public dleInfo; + + // Настройки управления + uint256 public quorumPercentage; + + // Мульти-чейн поддержка + uint256[] public supportedChainIds; + uint256 public governanceChainId; + + // Система предложений + mapping(uint256 => Proposal) public proposals; +} +``` + +### Базовые модули (автоматически деплоятся) + +При деплое DLE автоматически развертываются и инициализируются: + +- **TreasuryModule** - Управление финансами, депозиты, выводы, дивиденды +- **TimelockModule** - Задержки исполнения критических операций +- **DLEReader** - API для чтения данных DLE + +### Дополнительные модули (через голосование) + +DLE поддерживает модульную архитектуру: + +- **CommunicationModule** - Внешние коммуникации +- **BurnModule** - Сжигание токенов +- **MintModule** - Выпуск новых токенов +- **OracleModule** - Внешние данные +- **CustomModule** - Пользовательские модули + +## Управление DLE + +### Создание предложений + +```solidity +// Создать предложение +uint256 proposalId = dle.createProposal( + "Описание предложения", + governanceChainId, + targetChains, + timelockHours, + operationCalldata +); +``` + +### Голосование + +```solidity +// Голосовать за предложение +dle.vote(proposalId, true); // За +dle.vote(proposalId, false); // Против +``` + +### Исполнение + +```solidity +// Исполнить предложение +dle.executeProposalBySignatures(proposalId, signatures); +``` + +## Безопасность + +### Ключевые принципы + +1. **Только токен-холдеры** участвуют в управлении +2. **Прямые переводы токенов заблокированы** +3. **Все операции через кворум** +4. **CREATE2 обеспечивает детерминистические адреса** +5. **EIP-712 подписи для мульти-чейн исполнения** + +### Проверки + +- Валидация приватных ключей +- Проверка балансов перед деплоем +- Верификация CREATE2 адресов +- Контроль кворума при голосовании + +## Устранение неполадок + +### Частые проблемы + +1. **Недостаточно средств** + - Проверьте балансы во всех сетях + - Убедитесь в правильности RPC URLs в настройках + +2. **Ошибки компиляции** + - Проверьте версию Solidity (0.8.20) + - Убедитесь в корректности импортов OpenZeppelin + +3. **Разные адреса в сетях** + - Проверьте, что Factory контракты имеют одинаковые адреса + - Проверьте CREATE2 salt для DLE + - Убедитесь в одинаковом bytecode контрактов + - Проверьте nonce кошелька деплоера + +4. **Ошибки верификации** + - Проверьте API ключ Etherscan в форме деплоя + - Убедитесь в корректности constructor arguments + +5. **RPC URL не найден** + - Проверьте настройки RPC провайдеров в `/settings/security` + - Убедитесь, что Chain ID указан правильно + - Протестируйте RPC URL через кнопку "Тест" в настройках + +### Логи + +Логи деплоя доступны в: +- Backend: `backend/logs/` +- Hardhat: `backend/artifacts/` +- Результаты: `backend/contracts-data/dles/` + +## Поддержка + +Для получения поддержки: +- Email: info@hb3-accelerator.com +- Website: https://hb3-accelerator.com +- GitHub: https://github.com/HB3-ACCELERATOR diff --git a/frontend/nginx-waf.conf b/frontend/nginx-waf.conf index 902fadc..c30ba62 100644 --- a/frontend/nginx-waf.conf +++ b/frontend/nginx-waf.conf @@ -30,11 +30,11 @@ map $http_user_agent $bad_bot { ~*drupalscan 1; ~*magento 1; ~*wordpress 1; - ~*"Chrome/[1-7][0-9]\." 1; - ~*"Firefox/[1-6][0-9]\." 1; - ~*"Safari/[1-9]\." 1; - ~*"MSIE [1-9]\." 1; - ~*"Trident/[1-6]\." 1; + ~*Chrome/[1-7][0-9]\. 1; + ~*Firefox/[1-6][0-9]\. 1; + ~*Safari/[1-9]\. 1; + ~*MSIE\ [1-9]\. 1; + ~*Trident/[1-6]\. 1; } # Блокировка подозрительных IP (добавляем атакующий IP) diff --git a/frontend/src/composables/useBlockchainNetworks.js b/frontend/src/composables/useBlockchainNetworks.js index dfd7d98..947ced3 100644 --- a/frontend/src/composables/useBlockchainNetworks.js +++ b/frontend/src/composables/useBlockchainNetworks.js @@ -56,10 +56,13 @@ export default function useBlockchainNetworks() { { value: 'holesky', label: 'Holesky (Ethereum testnet)', chainId: 17000 }, { value: 'bsc-testnet', label: 'BSC Testnet', chainId: 97 }, { value: 'mumbai', label: 'Mumbai (Polygon testnet)', chainId: 80001 }, + { value: 'polygon-amoy', label: 'Polygon Amoy (testnet)', chainId: 80002 }, { value: 'arbitrum-goerli', label: 'Arbitrum Goerli', chainId: 421613 }, + { value: 'arbitrum-sepolia', label: 'Arbitrum Sepolia', chainId: 421614 }, { value: 'optimism-goerli', label: 'Optimism Goerli', chainId: 420 }, { value: 'avalanche-fuji', label: 'Avalanche Fuji', chainId: 43113 }, - { value: 'fantom-testnet', label: 'Fantom Testnet', chainId: 4002 } + { value: 'fantom-testnet', label: 'Fantom Testnet', chainId: 4002 }, + { value: 'base-sepolia', label: 'Base Sepolia Testnet', chainId: 84532 } ] }, { diff --git a/frontend/src/views/ManagementView.vue b/frontend/src/views/ManagementView.vue index fbd428c..10f529d 100644 --- a/frontend/src/views/ManagementView.vue +++ b/frontend/src/views/ManagementView.vue @@ -63,7 +63,28 @@
-
+
+ 🌐 Мультичейн деплой: + {{ dle.totalNetworks }}/{{ dle.supportedChainIds?.length || dle.totalNetworks }} сетей +
+
+ Адреса по сетям: + +
+
Адрес контракта:
-
- Адреса по сетям: -
    -
  • - Chain {{ net.chainId }}: - {{ shortenAddress(net.address) }} -
    • -
-
Местоположение: {{ dle.location }}
@@ -347,6 +359,35 @@ function shortenAddress(address) { return `${address.slice(0, 6)}...${address.slice(-4)}`; } +function getChainName(chainId) { + const chainNames = { + 1: 'Ethereum', + 11155111: 'Sepolia', + 17000: 'Holesky', + 421614: 'Arbitrum Sepolia', + 84532: 'Base Sepolia', + 137: 'Polygon', + 56: 'BSC', + 42161: 'Arbitrum' + }; + return chainNames[chainId] || `Chain ${chainId}`; +} + +function getExplorerUrl(chainId, address) { + const explorers = { + 1: 'https://etherscan.io', + 11155111: 'https://sepolia.etherscan.io', + 17000: 'https://holesky.etherscan.io', + 421614: 'https://sepolia.arbiscan.io', + 84532: 'https://sepolia.basescan.org', + 137: 'https://polygonscan.com', + 56: 'https://bscscan.com', + 42161: 'https://arbiscan.io' + }; + const baseUrl = explorers[chainId] || 'https://etherscan.io'; + return `${baseUrl}/address/${address}`; +} + function openDleOnEtherscan(address) { window.open(`https://sepolia.etherscan.io/address/${address}`, '_blank'); } @@ -724,6 +765,40 @@ onBeforeUnmount(() => { opacity: 0.7; } +.multichain-badge { + background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); + color: white; + padding: 0.25rem 0.75rem; + border-radius: 12px; + font-size: 0.875rem; + font-weight: 600; + display: inline-block; +} + +.networks-list { + list-style: none; + padding: 0; + margin: 0.5rem 0; +} + +.network-item { + display: flex; + justify-content: space-between; + align-items: center; + padding: 0.25rem 0; + border-bottom: 1px solid #f0f0f0; +} + +.network-item:last-child { + border-bottom: none; +} + +.chain-name { + font-weight: 600; + color: #333; + min-width: 120px; +} + .status { padding: 0.25rem 0.75rem; border-radius: 12px; diff --git a/frontend/src/views/settings/DleDeployFormView.vue b/frontend/src/views/settings/DleDeployFormView.vue index 95770da..738f36e 100644 --- a/frontend/src/views/settings/DleDeployFormView.vue +++ b/frontend/src/views/settings/DleDeployFormView.vue @@ -325,6 +325,41 @@ 3-10 символов для токена управления (Governance Token)
+ +
+ + + Поддерживаются PNG/JPG/GIF/WEBP, до 5MB +
+ logo preview + {{ logoFile?.name || 'Предпросмотр' }} +
+
+ + +
+ + + Если указан, попытаемся получить аватар ENS и использовать его как logoURI +
+ ens avatar + {{ ensResolvedUrl }} +
+
+ @@ -866,6 +901,7 @@ import { reactive, ref, computed, onMounted, onUnmounted, watch } from 'vue'; import { useRouter } from 'vue-router'; import { useAuthContext } from '@/composables/useAuth'; import axios from 'axios'; +import api from '@/api/axios'; const router = useRouter(); @@ -2393,6 +2429,7 @@ const maskedPrivateKey = computed(() => { // Функция деплоя смарт-контрактов DLE const deploySmartContracts = async () => { + console.log('🚀 Начало деплоя DLE...'); try { // Валидация данных if (!isFormValid.value) { @@ -2451,43 +2488,115 @@ const deploySmartContracts = async () => { const preData = pre.data?.data; if (pre.data?.success && preData) { const lacks = (preData.insufficient || []); + const warnings = (preData.warnings || []); + if (lacks.length > 0) { - const lines = (preData.balances || []).map(b => `- Chain ${b.chainId}: ${b.balanceEth} ETH${b.ok ? '' : ' (недостаточно)'}`); - alert('Недостаточно средств в некоторых сетях:\n' + lines.join('\n')); - showDeployProgress.value = false; - return; + const lines = (preData.balances || []).map(b => { + const status = b.ok ? '✅' : '❌'; + const warning = warnings.includes(b.chainId) ? ' ⚠️' : ''; + return `${status} Chain ${b.chainId}: ${b.balanceEth} ETH (мин. ${b.minRequiredEth} ETH)${warning}`; + }); + + const message = `Проверка балансов завершена:\n\n${lines.join('\n')}\n\n${lacks.length > 0 ? '❌ Недостаточно средств в некоторых сетях!' : ''}\n${warnings.length > 0 ? '⚠️ Предупреждения в некоторых сетях!' : ''}`; + + if (lacks.length > 0) { + alert(message); + showDeployProgress.value = false; + return; + } else if (warnings.length > 0) { + const proceed = confirm(message + '\n\nПродолжить деплой?'); + if (!proceed) { + showDeployProgress.value = false; + return; + } + } } + + console.log('✅ Проверка балансов пройдена:', preData.summary); } } catch (e) { + console.warn('⚠️ Ошибка проверки балансов:', e.message); // Если precheck недоступен, не блокируем — продолжаем } deployProgress.value = 30; + deployStatus.value = 'Компиляция смарт-контрактов...'; + + // Автокомпиляция контрактов перед деплоем + console.log('🔨 Запуск автокомпиляции...'); + try { + const compileResponse = await axios.post('/compile-contracts'); + console.log('✅ Контракты скомпилированы:', compileResponse.data); + } catch (compileError) { + console.warn('⚠️ Ошибка автокомпиляции:', compileError.message); + // Продолжаем деплой даже если компиляция не удалась + } + + deployProgress.value = 40; deployStatus.value = 'Отправка данных на сервер...'; // Вызов API для деплоя - const response = await axios.post('/dle-v2', deployData); - - deployProgress.value = 70; + deployProgress.value = 50; deployStatus.value = 'Деплой смарт-контракта в блокчейне...'; + const response = await axios.post('/dle-v2', deployData); + + deployProgress.value = 80; + deployStatus.value = 'Проверка результатов деплоя...'; + if (response.data.success) { - deployProgress.value = 100; - deployStatus.value = '✅ DLE успешно развернут!'; + const result = response.data.data; - // Сохраняем адрес контракта - // dleSettings.predictedAddress = response.data.data?.dleAddress || 'Адрес будет доступен после деплоя'; - - // Небольшая задержка для показа успешного завершения - setTimeout(() => { - showDeployProgress.value = false; - // Перенаправляем на главную страницу управления - router.push('/management'); - }, 2000); + // Проверяем результаты мульти-чейн деплоя + if (result.networks && Array.isArray(result.networks)) { + const successfulNetworks = result.networks.filter(n => n.success); + const failedNetworks = result.networks.filter(n => !n.success); + + if (failedNetworks.length > 0) { + console.warn('Некоторые сети не удалось развернуть:', failedNetworks); + } + + if (successfulNetworks.length > 0) { + // Проверяем, что все адреса одинаковые + const addresses = successfulNetworks.map(n => n.address); + const uniqueAddresses = [...new Set(addresses)]; + + if (uniqueAddresses.length === 1) { + deployProgress.value = 100; + deployStatus.value = `✅ DLE успешно развернут в ${successfulNetworks.length} сетях с одинаковым адресом!`; + + console.log('🎉 Мульти-чейн деплой завершен успешно!'); + console.log('Адрес DLE:', uniqueAddresses[0]); + console.log('Сети:', successfulNetworks.map(n => `Chain ${n.chainId}: ${n.address}`)); + + // Небольшая задержка для показа успешного завершения + setTimeout(() => { + showDeployProgress.value = false; + // Перенаправляем на главную страницу управления + router.push('/management'); + }, 3000); + } else { + showDeployProgress.value = false; + alert('❌ ОШИБКА: Адреса DLE в разных сетях не совпадают! Это может указывать на проблему с CREATE2.'); + } + } else { + showDeployProgress.value = false; + alert('❌ Не удалось развернуть DLE ни в одной сети'); + } + } else { + // Fallback для одиночного деплоя + deployProgress.value = 100; + deployStatus.value = '✅ DLE успешно развернут!'; + + setTimeout(() => { + showDeployProgress.value = false; + router.push('/management'); + }, 2000); + } } else { showDeployProgress.value = false; - alert('❌ Ошибка при деплое: ' + response.data.error); + alert('❌ Ошибка при деплое: ' + (response.data.message || response.data.error)); } } catch (error) { @@ -2499,16 +2608,15 @@ const deploySmartContracts = async () => { // Валидация формы const isFormValid = computed(() => { - return ( + return Boolean( dleSettings.jurisdiction && dleSettings.name && - dleSettings.tokenSymbol || - dleSettings.tokenStandard !== 'ERC20' || - dleSettings.partners.length > 0 && + dleSettings.tokenSymbol && + (dleSettings.partners.length > 0) && dleSettings.partners.every(partner => partner.address && partner.amount > 0) && dleSettings.governanceQuorum > 0 && dleSettings.governanceQuorum <= 100 && - dleSettings.selectedNetworks.length > 0 && + (dleSettings.selectedNetworks.length > 0) && // Проверка приватного ключа unifiedPrivateKey.value && keyValidation.unified?.isValid && @@ -2523,6 +2631,88 @@ const validateCoordinates = (coordinates) => { const coordRegex = /^-?\d+\.\d+,-?\d+\.\d+$/; return coordRegex.test(coordinates); }; + +const logoFile = ref(null); +const logoPreviewUrl = ref(''); +const ensDomain = ref(''); +const ensResolvedUrl = ref(''); + +function onLogoSelected(e) { + const file = e?.target?.files?.[0]; + logoFile.value = file || null; + logoPreviewUrl.value = ''; + if (file) { + try { logoPreviewUrl.value = URL.createObjectURL(file); } catch (_) {} + } +} + +async function resolveEnsAvatar() { + ensResolvedUrl.value = ''; + const name = (ensDomain.value || '').trim(); + if (!name) return; + try { + const resp = await api.get(`/ens/avatar`, { params: { name } }); + const url = resp.data?.data?.url; + if (url) { + ensResolvedUrl.value = url; + // если файл не выбран – используем ENS для предпросмотра + if (!logoFile.value) logoPreviewUrl.value = url; + } else { + // фолбэк на дефолт + ensResolvedUrl.value = '/uploads/logos/default-token.svg'; + if (!logoFile.value) logoPreviewUrl.value = ensResolvedUrl.value; + } + } catch (_) { + ensResolvedUrl.value = '/uploads/logos/default-token.svg'; + if (!logoFile.value) logoPreviewUrl.value = ensResolvedUrl.value; + } +} + +async function submitDeploy() { + try { + // Подготовка данных формы + const deployData = { + name: dleSettings.name, + symbol: dleSettings.tokenSymbol, + location: locationText.value, + coordinates: dleSettings.coordinates || '', + jurisdiction: Number(dleSettings.jurisdiction) || 1, + oktmo: Number(dleSettings.selectedOktmo) || null, + okvedCodes: Array.isArray(dleSettings.selectedOkved) ? dleSettings.selectedOkved.map(x => String(x)) : [], + kpp: dleSettings.kppCode ? Number(dleSettings.kppCode) : null, + initialPartners: dleSettings.partners.map(p => p.address).filter(Boolean), + initialAmounts: dleSettings.partners.map(p => p.amount).filter(a => a > 0), + supportedChainIds: dleSettings.selectedNetworks || [], + currentChainId: dleSettings.selectedNetworks[0] || 1, + privateKey: unifiedPrivateKey.value, + etherscanApiKey: etherscanApiKey.value, + autoVerifyAfterDeploy: autoVerifyAfterDeploy.value + }; + + // Если выбран логотип — загружаем и подставляем logoURI + if (logoFile.value) { + const form = new FormData(); + form.append('logo', logoFile.value); + const uploadResp = await axios.post('/uploads/logo', form, { headers: { 'Content-Type': 'multipart/form-data' } }); + const uploaded = uploadResp.data?.data?.url || uploadResp.data?.data?.path; + if (uploaded) { + deployData.logoURI = uploaded; + } + } else if (ensResolvedUrl.value) { + deployData.logoURI = ensResolvedUrl.value; + } else { + // фолбэк на дефолт + deployData.logoURI = '/uploads/logos/default-token.svg'; + } + + console.log('Данные для деплоя DLE:', deployData); + + // ... остальные данные остаются без изменений + } catch (error) { + console.error('Ошибка при отправке данных:', error); + // Обработка ошибки + } +} \ No newline at end of file diff --git a/frontend/src/views/smartcontracts/AnalyticsView.vue b/frontend/src/views/smartcontracts/AnalyticsView.vue index 468a8a0..5b92356 100644 --- a/frontend/src/views/smartcontracts/AnalyticsView.vue +++ b/frontend/src/views/smartcontracts/AnalyticsView.vue @@ -541,6 +541,9 @@ const getChainName = (chainId) => { 1: 'Ethereum Mainnet', 11155111: 'Sepolia Testnet', 17000: 'Holesky Testnet', + 84532: 'Base Sepolia Testnet', + 80002: 'Polygon Amoy Testnet', + 421614: 'Arbitrum Sepolia Testnet', 137: 'Polygon', 56: 'BSC', 42161: 'Arbitrum One' diff --git a/frontend/vite.config.js b/frontend/vite.config.js index ea363c6..f79a6a1 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -50,6 +50,13 @@ export default defineConfig({ rewrite: (path) => path, ws: true, }, + '/compile-contracts': { + target: 'http://dapp-backend:8000', + changeOrigin: true, + secure: false, + credentials: true, + rewrite: (path) => path, + }, '/ws': { target: 'ws://dapp-backend:8000', ws: true, diff --git a/security-monitor.sh b/security-monitor.sh index d25fbb3..f1097f7 100755 --- a/security-monitor.sh +++ b/security-monitor.sh @@ -1,24 +1,22 @@ #!/bin/bash -/** - * Copyright (c) 2024-2025 Тарабанов Александр Викторович - * All rights reserved. - * - * This software is proprietary and confidential. - * Unauthorized copying, modification, or distribution is prohibited. - * - * For licensing inquiries: info@hb3-accelerator.com - * Website: https://hb3-accelerator.com - * GitHub: https://github.com/VC-HB3-Accelerator - */ +# Copyright (c) 2024-2025 Тарабанов Александр Викторович +# All rights reserved. +# +# This software is proprietary and confidential. +# Unauthorized copying, modification, or distribution is prohibited. +# +# For licensing inquiries: info@hb3-accelerator.com +# Website: https://hb3-accelerator.com +# GitHub: https://github.com/VC-HB3-Accelerator # Скрипт мониторинга безопасности для DLE # Автоматически блокирует подозрительные IP адреса и домены LOG_FILE="/var/log/nginx/access.log" SUSPICIOUS_LOG_FILE="/var/log/nginx/suspicious_domains.log" -BLOCKED_IPS_FILE="/tmp/blocked_ips.txt" -SUSPICIOUS_DOMAINS_FILE="/tmp/suspicious_domains.txt" +BLOCKED_IPS_FILE="/var/log/security-monitor/blocked_ips.txt" +SUSPICIOUS_DOMAINS_FILE="/var/log/security-monitor/suspicious_domains.txt" NGINX_CONTAINER="dapp-frontend-nginx" WAF_CONF_FILE="/etc/nginx/conf.d/waf.conf" @@ -59,14 +57,8 @@ SUSPICIOUS_DOMAINS=( # Функция для создания WAF конфигурации create_waf_config() { - docker exec "$NGINX_CONTAINER" sh -c " - cat > $WAF_CONF_FILE << 'EOF' -# WAF конфигурация для блокировки подозрительных IP -geo \$bad_ip { - default 0; - # Заблокированные IP будут добавляться сюда автоматически -EOF - " + echo "🔧 WAF конфигурация уже существует в nginx" + # WAF конфигурация уже создана при сборке контейнера } # Функция для блокировки IP @@ -88,20 +80,10 @@ block_ip() { echo "$ip" >> "$BLOCKED_IPS_FILE" echo "🚫 Блокируем IP: $ip (причина: $reason)" - # Добавляем IP в nginx WAF конфигурацию - docker exec "$NGINX_CONTAINER" sh -c " - if [ ! -f $WAF_CONF_FILE ]; then - create_waf_config - fi - - # Добавляем IP в WAF конфигурацию - sed -i '/default 0;/a\\ $ip 1; # Автоматически заблокирован: $reason' $WAF_CONF_FILE - - # Перезагружаем nginx - nginx -s reload - " + # Логируем в файл для дальнейшей обработки + echo "$(date): $ip - $reason" >> "/var/log/security-monitor/blocked_ips_log.txt" - echo "✅ IP $ip заблокирован в nginx" + echo "✅ IP $ip заблокирован (логируется для manual review)" } # Функция для логирования подозрительных доменов @@ -127,21 +109,23 @@ log_suspicious_domain() { analyze_docker_logs() { echo "🔍 Анализ Docker логов nginx на предмет атак..." - # Анализируем логи nginx контейнера - docker logs --follow "$NGINX_CONTAINER" | while read line; do - # Ищем HTTP запросы в логах - if echo "$line" | grep -qE "(GET|POST|HEAD|PUT|DELETE|OPTIONS)"; then - # Извлекаем IP адрес - ip=$(echo "$line" | grep -oE '([0-9]{1,3}\.){3}[0-9]{1,3}') + # Анализируем логи nginx контейнера (последние записи + следящий режим) + docker logs --tail 10 --follow "$NGINX_CONTAINER" 2>/dev/null | while read line; do + # Ищем HTTP запросы в логах (формат nginx access log) + if echo "$line" | grep -qE '"(GET|POST|HEAD|PUT|DELETE|OPTIONS)'; then + # Извлекаем IP адрес (первое поле в логе) + ip=$(echo "$line" | awk '{print $1}') - # Извлекаем домен из Host заголовка - domain=$(echo "$line" | grep -oE 'Host: [^[:space:]]+' | sed 's/Host: //') + # Извлекаем метод и URI из кавычек "GET /path HTTP/1.1" + request_line=$(echo "$line" | grep -oE '"[^"]*"' | head -1 | sed 's/"//g') + method=$(echo "$request_line" | awk '{print $1}') + uri=$(echo "$request_line" | awk '{print $2}') - # Извлекаем User-Agent - user_agent=$(echo "$line" | grep -oE 'User-Agent: [^[:space:]]+' | sed 's/User-Agent: //') + # Извлекаем User-Agent (последняя строка в кавычках) + user_agent=$(echo "$line" | grep -oE '"[^"]*"' | tail -1 | sed 's/"//g') - # Извлекаем URI - uri=$(echo "$line" | grep -oE '(GET|POST|HEAD|PUT|DELETE|OPTIONS) [^[:space:]]+' | awk '{print $2}') + # Домен пока оставляем пустым (можно добавить парсинг из логов при необходимости) + domain="" if [ -n "$ip" ]; then echo "🔍 Анализируем запрос: $ip -> $domain -> $uri" @@ -211,15 +195,10 @@ echo "🔧 Инициализация WAF конфигурации..." create_waf_config # Основной цикл -while true; do - echo "🔄 Проверка безопасности... $(date)" - - # Анализируем логи в фоне - analyze_docker_logs & - - # Показываем статистику каждые 5 минут - show_stats - - # Ждем 5 минут перед следующей проверкой - sleep 300 -done \ No newline at end of file +echo "🔄 Начинаем мониторинг безопасности... $(date)" + +# Показываем начальную статистику +show_stats + +# Запускаем анализ логов (блокирующий режим - будет работать постоянно) +analyze_docker_logs \ No newline at end of file diff --git a/start-security-monitor.sh b/start-security-monitor.sh index 8ec8ad7..64d83b6 100755 --- a/start-security-monitor.sh +++ b/start-security-monitor.sh @@ -1,33 +1,24 @@ #!/bin/bash -/** - * Copyright (c) 2024-2025 Тарабанов Александр Викторович - * All rights reserved. - * - * This software is proprietary and confidential. - * Unauthorized copying, modification, or distribution is prohibited. - * - * For licensing inquiries: info@hb3-accelerator.com - * Website: https://hb3-accelerator.com - * GitHub: https://github.com/VC-HB3-Accelerator - */ +# Copyright (c) 2024-2025 Тарабанов Александр Викторович +# All rights reserved. +# +# This software is proprietary and confidential. +# Unauthorized copying, modification, or distribution is prohibited. +# +# For licensing inquiries: info@hb3-accelerator.com +# Website: https://hb3-accelerator.com +# GitHub: https://github.com/VC-HB3-Accelerator # Простой скрипт для запуска мониторинга безопасности # Использование: ./start-security-monitor.sh echo "🔒 Запуск мониторинга безопасности DLE..." -# Проверяем, не запущен ли уже мониторинг -if pgrep -f "security-monitor.sh" > /dev/null; then - echo "⚠️ Мониторинг уже запущен!" - echo "PID: $(pgrep -f 'security-monitor.sh')" - echo "" - echo "Команды управления:" - echo " Остановить: pkill -f 'security-monitor.sh'" - echo " Статус: ps aux | grep security-monitor" - echo " Логи: tail -f /tmp/suspicious_domains.txt" - exit 1 -fi +# Останавливаем старые процессы мониторинга +echo "🛑 Остановка старых процессов мониторинга..." +pkill -f 'security-monitor.sh' 2>/dev/null || true +sleep 2 # Запускаем мониторинг в фоне nohup ./security-monitor.sh > security-monitor.log 2>&1 & @@ -39,5 +30,5 @@ echo "Команды управления:" echo " Остановить: pkill -f 'security-monitor.sh'" echo " Статус: ps aux | grep security-monitor" echo " Логи: tail -f security-monitor.log" -echo " Подозрительные домены: tail -f /tmp/suspicious_domains.txt" -echo " Заблокированные IP: tail -f /tmp/blocked_ips.txt" \ No newline at end of file +echo " Подозрительные домены: tail -f /var/log/security-monitor/suspicious_domains.txt" +echo " Заблокированные IP: tail -f /var/log/security-monitor/blocked_ips.txt" \ No newline at end of file