From bf4fea086d3994db2b6d0bcdd0f6861d844d490f Mon Sep 17 00:00:00 2001 From: Filipp Makarov Date: Mon, 25 Nov 2024 11:42:51 +0400 Subject: [PATCH 1/4] pp --- package.json | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index c4d5f57c..b1da19ed 100644 --- a/package.json +++ b/package.json @@ -7,14 +7,17 @@ "url": "https://github.com/bcnmy" }, "dependencies": { - "@openzeppelin": "https://github.com/OpenZeppelin/openzeppelin-contracts", - "@rhinestone/module-template": "https://github.com/erc7579/erc7739Validator", - "dotenv": "^16.4.5", + "account-abstraction": "github:eth-infinitism/account-abstraction#develop", "erc7739-validator-base": "https://github.com/erc7579/erc7739Validator", "solarray": "github:sablier-labs/solarray", - "viem": "2.7.13" + "sentinellist": "github:zeroknots/sentinellist", + "forge-std": "github:foundry-rs/forge-std#v1.8.2", + "solady": "github:vectorized/solady", + "ds-test": "github:dapphub/ds-test" }, "devDependencies": { + "viem": "2.7.13", + "dotenv": "^16.4.5", "@nomicfoundation/hardhat-chai-matchers": "^2.0.6", "@nomicfoundation/hardhat-ethers": "^3.0.6", "@nomicfoundation/hardhat-foundry": "^1.1.2", @@ -28,23 +31,17 @@ "@types/chai": "^4.3.16", "@types/mocha": ">=10.0.6", "@types/node": ">=20.12.12", - "account-abstraction": "github:eth-infinitism/account-abstraction#develop", "chai": "^4.3.7", "codecov": "^3.8.3", - "ds-test": "github:dapphub/ds-test", "ethers": "^6.12.1", - "forge-std": "github:foundry-rs/forge-std#v1.8.2", "hardhat": "^2.22.4", "hardhat-deploy": "^0.12.4", "hardhat-deploy-ethers": "^0.4.2", "hardhat-gas-reporter": "^1.0.10", "hardhat-storage-layout": "^0.1.7", "husky": "^9.0.11", - "modulekit": "github:rhinestonewtf/modulekit", "prettier": "^3.2.5", "prettier-plugin-solidity": "^1.3.1", - "sentinellist": "github:zeroknots/sentinellist", - "solady": "github:vectorized/solady", "solhint": "^5.0.1", "solhint-plugin-prettier": "^0.1.0", "solidity-coverage": "^0.8.12", From e81e477d83deb4e18cea89346d1c82deb30c4bc0 Mon Sep 17 00:00:00 2001 From: Filipp Makarov Date: Mon, 25 Nov 2024 11:46:17 +0400 Subject: [PATCH 2/4] rn --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b1da19ed..e135f4e2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "nexus", + "name": "bcnmy-nexus", "description": "Nexus - ERC7579 Modular Smart Account", - "version": "1.0.0", + "version": "1.0.1", "author": { "name": "Biconomy", "url": "https://github.com/bcnmy" From 9849de5f9326dd69bb92cc8e9d2007743cec791f Mon Sep 17 00:00:00 2001 From: Filipp Makarov Date: Mon, 25 Nov 2024 11:53:53 +0400 Subject: [PATCH 3/4] remapping clean --- package.json | 5 +---- remappings.txt | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/package.json b/package.json index e135f4e2..1a995451 100644 --- a/package.json +++ b/package.json @@ -13,11 +13,8 @@ "sentinellist": "github:zeroknots/sentinellist", "forge-std": "github:foundry-rs/forge-std#v1.8.2", "solady": "github:vectorized/solady", - "ds-test": "github:dapphub/ds-test" }, "devDependencies": { - "viem": "2.7.13", - "dotenv": "^16.4.5", "@nomicfoundation/hardhat-chai-matchers": "^2.0.6", "@nomicfoundation/hardhat-ethers": "^3.0.6", "@nomicfoundation/hardhat-foundry": "^1.1.2", @@ -25,7 +22,6 @@ "@nomicfoundation/hardhat-toolbox": "^4.0.0", "@nomicfoundation/hardhat-verify": "^2.0.7", "@nomiclabs/hardhat-ethers": "^2.2.3", - "@prb/test": "^0.6.4", "@typechain/ethers-v6": "^0.5.1", "@typechain/hardhat": "^9.1.0", "@types/chai": "^4.3.16", @@ -47,6 +43,7 @@ "solidity-coverage": "^0.8.12", "ts-node": ">=10.9.2", "typechain": "^8.3.2", + "dotenv": "^16.4.5", "typescript": ">=5.4.5" }, "keywords": [ diff --git a/remappings.txt b/remappings.txt index 4613129f..1acb59a1 100644 --- a/remappings.txt +++ b/remappings.txt @@ -1,10 +1,8 @@ @openzeppelin/=node_modules/@openzeppelin/ -@prb/test/=node_modules/@prb/test/ forge-std/=node_modules/forge-std/src/ account-abstraction/=node_modules/account-abstraction/contracts/ solady/=node_modules/solady/src/ excessively-safe-call/=node_modules/excessively-safe-call/src/ sentinellist/=node_modules/sentinellist/src/ -ds-test/=node_modules/ds-test/src/ solarray/=node_modules/solarray/src/ erc7739Validator/=node_modules/erc7739-validator-base/src/ From 2a757c4a488d554ea25a2a88a52d9e45e55977ff Mon Sep 17 00:00:00 2001 From: Filipp Makarov Date: Mon, 25 Nov 2024 11:54:56 +0400 Subject: [PATCH 4/4] ff --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1a995451..5fdae8f6 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "solarray": "github:sablier-labs/solarray", "sentinellist": "github:zeroknots/sentinellist", "forge-std": "github:foundry-rs/forge-std#v1.8.2", - "solady": "github:vectorized/solady", + "solady": "github:vectorized/solady" }, "devDependencies": { "@nomicfoundation/hardhat-chai-matchers": "^2.0.6",