Skip to content

Do not emit an event when setSignerWeight is a no-op #5775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ernestognw merged 2 commits into from
Jul 3, 2025
Merged

Do not emit an event when setSignerWeight is a no-op #5775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6f54cf
Do not emit an event when setSignerWeight is a no-op
Amxx Jul 1, 2025
47e47ca
up
ernestognw Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,18 +104,22 @@ abstract contract MultiSignerERC7913Weighted is MultiSignerERC7913 {
uint256 extraWeightRemoved = 0;
for (uint256 i = 0; i < signers.length; ++i) {
bytes memory signer = signers[i];
uint64 weight = weights[i];

require(isSigner(signer), MultiSignerERC7913NonexistentSigner(signer));

uint64 weight = weights[i];
require(weight > 0, MultiSignerERC7913WeightedInvalidWeight(signer, weight));

unchecked {
// Overflow impossible: weight values are bounded by uint64 and economic constraints
extraWeightRemoved += _extraWeights[signer];
extraWeightAdded += _extraWeights[signer] = weight - 1;
uint64 oldExtraWeight = _extraWeights[signer];
uint64 newExtraWeight = weight - 1;

if (oldExtraWeight != newExtraWeight) {
// Overflow impossible: weight values are bounded by uint64 and economic constraints
extraWeightRemoved += oldExtraWeight;
extraWeightAdded += _extraWeights[signer] = newExtraWeight;
emit ERC7913SignerWeightChanged(signer, weight);
}
}

emit ERC7913SignerWeightChanged(signer, weight);
}
unchecked {
// Safe from underflow: `extraWeightRemoved` is bounded by `_totalExtraWeight` by construction
Expand Down
24 changes: 14 additions & 10 deletions test/account/AccountMultiSignerWeighted.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,10 @@ describe('AccountMultiSignerWeighted', function () {
await expect(this.mock.signerWeight(signer3)).to.eventually.equal(3); // unchanged
});

it("no-op doesn't emit an event", async function () {
await expect(this.mock.$_setSignerWeights([signer1], [1])).to.not.emit(this.mock, 'ERC7913SignerWeightChanged');
});

it('cannot set weight to non-existent signer', async function () {
// Reverts when setting weight for non-existent signer
await expect(this.mock.$_setSignerWeights([signer4], [1]))
Expand Down Expand Up @@ -186,28 +190,28 @@ describe('AccountMultiSignerWeighted', function () {
});

it('validates threshold is reachable when updating weights', async function () {
// First, lower the weights so the sum is exactly 6 (just enough for threshold=6)
await expect(this.mock.$_setSignerWeights([signer1, signer2, signer3], [1, 2, 3]))
// First, lower the weights so the sum is exactly 9 (just enough for threshold=9)
await expect(this.mock.$_setSignerWeights([signer1, signer2, signer3], [2, 3, 4]))
.to.emit(this.mock, 'ERC7913SignerWeightChanged')
.withArgs(signer1, 1)
.withArgs(signer1, 2)
.to.emit(this.mock, 'ERC7913SignerWeightChanged')
.withArgs(signer2, 2)
.withArgs(signer2, 3)
.to.emit(this.mock, 'ERC7913SignerWeightChanged')
.withArgs(signer3, 3);
.withArgs(signer3, 4);

// Increase threshold to 6
await expect(this.mock.$_setThreshold(6)).to.emit(this.mock, 'ERC7913ThresholdSet').withArgs(6);
// Increase threshold to 9
await expect(this.mock.$_setThreshold(9)).to.emit(this.mock, 'ERC7913ThresholdSet').withArgs(9);

// Now try to lower weights so their sum is less than the threshold
await expect(this.mock.$_setSignerWeights([signer1, signer2, signer3], [1, 1, 1])).to.be.revertedWithCustomError(
await expect(this.mock.$_setSignerWeights([signer1, signer2, signer3], [2, 2, 2])).to.be.revertedWithCustomError(
this.mock,
'MultiSignerERC7913UnreachableThreshold',
);

// Try to increase threshold to be larger than the total weight
await expect(this.mock.$_setThreshold(7))
await expect(this.mock.$_setThreshold(10))
.to.be.revertedWithCustomError(this.mock, 'MultiSignerERC7913UnreachableThreshold')
.withArgs(6, 7);
.withArgs(9, 10);
});

it('reports default weight of 1 for signers without explicit weight', async function () {
Expand Down