Skip to content

Commit 0114c30

Browse files
authored
Merge pull request #19 from bcnmy/feat/stx-validator-test-merge-dev
feat: stx validator: resolve conflicts with develop
2 parents 4c634d2 + 75ea5f7 commit 0114c30

55 files changed

Lines changed: 159 additions & 363 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/foundry-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Install Foundry
2323
uses: foundry-rs/foundry-toolchain@v1
2424
with:
25-
version: stable
25+
version: nightly
2626

2727
- name: Setup pnpm
2828
uses: pnpm/action-setup@v3
@@ -39,7 +39,7 @@ jobs:
3939
run: pnpm install --frozen-lockfile
4040

4141
- name: Run Forge tests
42-
run: export FOUNDRY_PROFILE="via-ir" && pnpm test
42+
run: pnpm test
4343
env:
4444
FOUNDRY_PROFILE: ci
4545
RPC_84532: https://sepolia.base.org

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ temp
99

1010
# dependencies
1111
node_modules/
12+
.pnpm-store/
1213
/lib/
1314

1415
# env
@@ -49,3 +50,5 @@ script/deploy/deploy-logs/precalc/*.log
4950
!script/deploy/deploy-logs/build/.gitkeep
5051
!script/deploy/deploy-logs/precalc/.gitkeep
5152

53+
# Debug scripts
54+
script/debug

.npmrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
node-linker=hoisted
1+
node-linker=hoisted
2+
store-dir=~/.pnpm-store

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# @biconomy/mee-contracts
1+
event Module# @biconomy/mee-contracts
22

33
## 1.1.0
44
- MEE K1 Validator 1.1.0

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,5 @@ $ pnpm test
121121
```
122122

123123
### Deployments
124-
See [`script/deploy/README.MD`](script/deploy/README.MD) to learn how to deploy the stx contracts to your chain.
124+
- Open any of the `deploy/vx.x.x` baranches
125+
- Read `script/deploy/README.MD` to learn how to deploy the stx contracts to your chain.
203 KB
Binary file not shown.

contracts/composability/ComposableExecutionLib.sol

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ library ComposableExecutionLib {
2222
error InvalidOutputParamFetcherType();
2323
error InvalidConstraintType();
2424
error InvalidSetOfInputParams(string message);
25+
error ComposableExecutionFailed();
2526

2627
// Process the input parameters and return the composed calldata
2728
function processInputs(

contracts/composability/ComposableStorage.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ contract ComposableStorage {
8080
function getNamespace(address account, address _caller) public pure returns (bytes32 result) {
8181
assembly {
8282
mstore(0x00, account)
83-
mstore(0x14, _caller)
83+
mstore(0x20, shl(96, _caller))
8484
result := keccak256(0x0c, 0x28)
8585
}
8686
}

contracts/interfaces/nexus/INexusEventsAndErrors.sol

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,14 @@ interface INexusEventsAndErrors {
4747

4848
/// @notice Error thrown when the provided signature is invalid.
4949
error InvalidSignature();
50+
51+
/// @notice Thrown when there is an attempt to remove the last validator.
52+
error CanNotRemoveLastValidator();
53+
54+
/// @notice Error thrown when the `r` component of the PREP signature restores as invalid.
55+
error InvalidPREP();
56+
57+
/// @notice Event emitted when a PREP is initialized.
58+
/// @param r The `r` component of the PREP signature.
59+
event PREPInitialized(bytes32 r);
5060
}

contracts/interfaces/nexus/base/IModuleManagerEventsAndErrors.sol

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,13 @@ interface IModuleManagerEventsAndErrors {
9393

9494
/// @notice Error thrown when the default validator is already installed.
9595
error DefaultValidatorAlreadyInstalled();
96+
97+
/// @notice Error thrown when the validator is not installed.
98+
error ValidatorNotInstalled();
99+
100+
/// @notice Error thrown when the enable mode signature is invalid.
101+
error EnableModeSigError();
102+
103+
/// @notice Error thrown when a fallback handler is not installed for a given selector.
104+
error MissingFallbackHandler(bytes4 selector);
96105
}

0 commit comments

Comments
 (0)