Skip to content

Commit 2d6c1b5

Browse files
Filipp MakarovFilipp Makarov
Filipp Makarov
authored and
Filipp Makarov
committed
chore: bump versions + new salts
1 parent d5ac637 commit 2d6c1b5

13 files changed

Lines changed: 88 additions & 69 deletions

File tree

‎contracts/nexus/Nexus.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ contract Nexus is INexus, BaseAccount, ExecutionHelper, ModuleManager, UUPSUpgra
503503
/// Returns the account's implementation ID.
504504
/// @return The unique identifier for this account implementation.
505505
function accountId() external pure virtual returns (string memory) {
506-
return "biconomy.nexus.1.3.0";
506+
return "biconomy.nexus.1.3.1";
507507
}
508508

509509
/// Upgrades the contract to a new implementation and calls a function on the new contract.
@@ -657,6 +657,6 @@ contract Nexus is INexus, BaseAccount, ExecutionHelper, ModuleManager, UUPSUpgra
657657
/// @dev EIP712 domain name and version.
658658
function _domainNameAndVersion() internal pure override returns (string memory name, string memory version) {
659659
name = "Nexus";
660-
version = "1.3.0";
660+
version = "1.3.1";
661661
}
662662
}

‎contracts/validators/stx-validator/K1MeeValidator.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ contract K1MeeValidator is IValidator, IStatelessValidator, ERC7739Validator {
294294
/// - supports appended 65-bytes signature for on-chain fusion mode
295295
/// - supports erc7702-delegated EOAs as owners
296296
function version() external pure returns (string memory) {
297-
return "1.0.5";
297+
return "1.1.0";
298298
}
299299

300300
/// @notice Checks if the module is of the specified type

‎script/deploy/DeployStxContracts.s.sol‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ import { CreateX } from "script/deploy/util/CreateX.sol";
1313

1414
contract DeployStxContracts is Script, Config {
1515
/* ===== salts ===== */
16-
bytes32 constant MEE_K1_VALIDATOR_SALT = 0x00000000000000000000000000000000000000007b2b83ee18c0340289459702; //=>
17-
// 0x00000000eFCeaA8158112c4b7D48851445bB9D55;
16+
bytes32 constant MEE_K1_VALIDATOR_SALT = 0x00000000000000000000000000000000000000005fe8f5cea26ea502e2353dc7; //=>
17+
// 0x00000000983d6976c35EBFf16C8c82C25dB02741;
1818

19-
bytes32 constant NEXUS_SALT = 0x000000000000000000000000000000000000000069e4899d55219e0366b0f6ba; // =>
20-
// 0x0000009901cf970b3F7BD7268Fe5C5b2Cd031C1D;
19+
bytes32 constant NEXUS_SALT = 0x0000000000000000000000000000000000000000f8526dfbfad5b102ee58fd37; // =>
20+
// 0x000000007aDb4a4257975C9Dd6d8df2144B1bfC7;
2121

22-
bytes32 constant NEXUSBOOTSTRAP_SALT = 0x00000000000000000000000000000000000000008cddbe8e64a32603e5c8a08e; // =>
22+
bytes32 constant NEXUSBOOTSTRAP_SALT = 0x0000000000000000000000000000000000000000f72983c6386f4d01693fac9b; // =>
2323
// 0x000000883b2d98307c8024503C864bbDf8B45A2f
2424

25-
bytes32 constant NEXUS_ACCOUNT_FACTORY_SALT = 0x0000000000000000000000000000000000000000d5af607691681802316edffe; //
26-
// => 0x00000000519A04DA34e20FDb3BAe2887e1cf8d14;
25+
bytes32 constant NEXUS_ACCOUNT_FACTORY_SALT = 0x000000000000000000000000000000000000000025a91df89f517902cceea895; //
26+
// => 0x0000000070D5F6a41C3CF3a8b754b6cEa048234C;
2727

2828
bytes32 constant COMPOSABLE_EXECUTION_MODULE_SALT =
2929
0x000000000000000000000000000000000000000093ca75554c2a3c03ef8aebc4; // =>

‎script/deploy/artifacts/K1MeeValidator/K1MeeValidator.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎script/deploy/artifacts/K1MeeValidator/verify.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎script/deploy/artifacts/Nexus/Nexus.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎script/deploy/artifacts/Nexus/verify.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎script/deploy/build-artifacts.sh‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
export FOUNDRY_PROFILE="via-ir"
2+
3+
# Spinner function
4+
spinner() {
5+
local pid=$1
6+
local delay=0.1
7+
local spinstr='|/-\'
8+
printf " "
9+
while kill -0 $pid 2>/dev/null; do
10+
local temp=${spinstr#?}
11+
printf "[%c]" "$spinstr"
12+
spinstr=$temp${spinstr%"$temp"}
13+
sleep $delay
14+
printf "\b\b\b"
15+
done
16+
printf " \b\b\b"
17+
}
18+
19+
read -r -p "Do you want to rebuild Stx-contracts artifacts from your local sources? (y/n): " proceed
20+
if [ $proceed = "y" ]; then
21+
### BUILD ARTIFACTS ###
22+
printf "Building Stx-contracts artifacts "
23+
{ (forge build 1> ./deploy-logs/build/forge-build.log 2> ./deploy-logs/build/forge-build-errors.log) } &
24+
spinner $!
25+
wait $!
26+
if [ $? -ne 0 ]; then
27+
printf "\nBuild failed\n See logs for more details\n"
28+
exit 1
29+
fi
30+
printf "\n"
31+
printf "Copying Stx-contracts artifacts\n"
32+
33+
mkdir -p ./artifacts/K1MeeValidator
34+
mkdir -p ./artifacts/Nexus
35+
mkdir -p ./artifacts/NexusBootstrap
36+
mkdir -p ./artifacts/NexusAccountFactory
37+
mkdir -p ./artifacts/NexusProxy
38+
mkdir -p ./artifacts/ComposableExecutionModule
39+
mkdir -p ./artifacts/ComposableStorage
40+
mkdir -p ./artifacts/EtherForwarder
41+
mkdir -p ./artifacts/NodePaymasterFactory
42+
43+
cp ../../out/K1MeeValidator.sol/K1MeeValidator.json ./artifacts/K1MeeValidator/.
44+
cp ../../out/Nexus.sol/Nexus.json ./artifacts/Nexus/.
45+
cp ../../out/NexusBootstrap.sol/NexusBootstrap.json ./artifacts/NexusBootstrap/.
46+
cp ../../out/NexusAccountFactory.sol/NexusAccountFactory.json ./artifacts/NexusAccountFactory/.
47+
cp ../../out/NexusProxy.sol/NexusProxy.json ./artifacts/NexusProxy/.
48+
cp ../../out/ComposableExecutionModule.sol/ComposableExecutionModule.json ./artifacts/ComposableExecutionModule/.
49+
cp ../../out/ComposableStorage.sol/ComposableStorage.json ./artifacts/ComposableStorage/.
50+
cp ../../out/EtherForwarder.sol/EtherForwarder.json ./artifacts/EtherForwarder/.
51+
cp ../../out/NodePaymasterFactory.sol/NodePaymasterFactory.json ./artifacts/NodePaymasterFactory/.
52+
53+
printf "Artifacts copied\n"
54+
55+
### CREATE VERIFICATION ARTIFACTS ###
56+
printf "Creating verification artifacts\n"
57+
forge verify-contract --show-standard-json-input $(cast address-zero) K1MeeValidator > ./artifacts/K1MeeValidator/verify.json
58+
forge verify-contract --show-standard-json-input $(cast address-zero) Nexus > ./artifacts/Nexus/verify.json
59+
forge verify-contract --show-standard-json-input $(cast address-zero) NexusBootstrap > ./artifacts/NexusBootstrap/verify.json
60+
forge verify-contract --show-standard-json-input $(cast address-zero) NexusAccountFactory > ./artifacts/NexusAccountFactory/verify.json
61+
forge verify-contract --show-standard-json-input $(cast address-zero) NexusProxy > ./artifacts/NexusProxy/verify.json
62+
forge verify-contract --show-standard-json-input $(cast address-zero) ComposableExecutionModule > ./artifacts/ComposableExecutionModule/verify.json
63+
forge verify-contract --show-standard-json-input $(cast address-zero) ComposableStorage > ./artifacts/ComposableStorage/verify.json
64+
forge verify-contract --show-standard-json-input $(cast address-zero) EtherForwarder > ./artifacts/EtherForwarder/verify.json
65+
forge verify-contract --show-standard-json-input $(cast address-zero) NodePaymasterFactory > ./artifacts/NodePaymasterFactory/verify.json
66+
67+
printf "Artifacts created\n"
68+
else
69+
printf "Precompiled artifacts will be used\n"
70+
fi

‎script/deploy/deploy-stx.sh‎

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -157,57 +157,6 @@ CHAIN_ARRAY="${CHAIN_ARRAY}]"
157157

158158
log_info "Forks successfully created, all RPC's from config are accessible"
159159

160-
# Check if we have to recompile the artifacts
161-
export FOUNDRY_PROFILE="via-ir"
162-
read -r -p "Do you want to rebuild Stx-contracts artifacts from your local sources? (y/n): " proceed
163-
if [ $proceed = "y" ]; then
164-
### BUILD ARTIFACTS ###
165-
printf "Building Stx-contracts artifacts\n"
166-
{ (forge build 1> ./deploy-logs/build/forge-build.log 2> ./deploy-logs/build/forge-build-errors.log) } || {
167-
printf "Build failed\n See logs for more details\n"
168-
exit 1
169-
}
170-
printf "Copying Stx-contracts artifacts\n"
171-
172-
mkdir -p ./artifacts/K1MeeValidator
173-
mkdir -p ./artifacts/Nexus
174-
mkdir -p ./artifacts/NexusBootstrap
175-
mkdir -p ./artifacts/NexusAccountFactory
176-
mkdir -p ./artifacts/NexusProxy
177-
mkdir -p ./artifacts/ComposableExecutionModule
178-
mkdir -p ./artifacts/ComposableStorage
179-
mkdir -p ./artifacts/EtherForwarder
180-
mkdir -p ./artifacts/NodePaymasterFactory
181-
182-
cp ../../out/K1MeeValidator.sol/K1MeeValidator.json ./artifacts/K1MeeValidator/.
183-
cp ../../out/Nexus.sol/Nexus.json ./artifacts/Nexus/.
184-
cp ../../out/NexusBootstrap.sol/NexusBootstrap.json ./artifacts/NexusBootstrap/.
185-
cp ../../out/NexusAccountFactory.sol/NexusAccountFactory.json ./artifacts/NexusAccountFactory/.
186-
cp ../../out/NexusProxy.sol/NexusProxy.json ./artifacts/NexusProxy/.
187-
cp ../../out/ComposableExecutionModule.sol/ComposableExecutionModule.json ./artifacts/ComposableExecutionModule/.
188-
cp ../../out/ComposableStorage.sol/ComposableStorage.json ./artifacts/ComposableStorage/.
189-
cp ../../out/EtherForwarder.sol/EtherForwarder.json ./artifacts/EtherForwarder/.
190-
cp ../../out/NodePaymasterFactory.sol/NodePaymasterFactory.json ./artifacts/NodePaymasterFactory/.
191-
192-
printf "Artifacts copied\n"
193-
194-
### CREATE VERIFICATION ARTIFACTS ###
195-
printf "Creating verification artifacts\n"
196-
forge verify-contract --show-standard-json-input $(cast address-zero) K1MeeValidator > ./artifacts/K1MeeValidator/verify.json
197-
forge verify-contract --show-standard-json-input $(cast address-zero) Nexus > ./artifacts/Nexus/verify.json
198-
forge verify-contract --show-standard-json-input $(cast address-zero) NexusBootstrap > ./artifacts/NexusBootstrap/verify.json
199-
forge verify-contract --show-standard-json-input $(cast address-zero) NexusAccountFactory > ./artifacts/NexusAccountFactory/verify.json
200-
forge verify-contract --show-standard-json-input $(cast address-zero) NexusProxy > ./artifacts/NexusProxy/verify.json
201-
forge verify-contract --show-standard-json-input $(cast address-zero) ComposableExecutionModule > ./artifacts/ComposableExecutionModule/verify.json
202-
forge verify-contract --show-standard-json-input $(cast address-zero) ComposableStorage > ./artifacts/ComposableStorage/verify.json
203-
forge verify-contract --show-standard-json-input $(cast address-zero) EtherForwarder > ./artifacts/EtherForwarder/verify.json
204-
forge verify-contract --show-standard-json-input $(cast address-zero) NodePaymasterFactory > ./artifacts/NodePaymasterFactory/verify.json
205-
206-
log_info "Artifacts created"
207-
else
208-
log_info "Using precompiled artifacts"
209-
fi
210-
211160
# Check the expected addresses for the contracts and record the bytecode hashes
212161
log_info "Getting expected addresses for the contracts..."
213162
{

‎test/fork/nexus/arbitrum/ArbitrumSmartAccountUpgradeTest.t.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ contract ArbitrumSmartAccountUpgradeTest is NexusTestBase, ArbitrumSettings {
4646
/// @notice Validates the account ID after the upgrade process.
4747
function test_AccountIdValidationAfterUpgrade() public {
4848
test_UpgradeV2ToV3AndInitialize();
49-
string memory expectedAccountId = "biconomy.nexus.1.3.0";
49+
string memory expectedAccountId = "biconomy.nexus.1.3.1";
5050
string memory actualAccountId = IAccountConfig(payable(address(smartAccountV2))).accountId();
5151
assertEq(actualAccountId, expectedAccountId, "Account ID does not match after upgrade.");
5252
}

0 commit comments

Comments
 (0)