Skip to content

Commit f06cbbb

Browse files
feat(crypto-transactions): disable MultiSignatureRegistration from milestones (#4858)
* Update yarn.lock * Check milestone * Fix tests * Update crypto networks
1 parent 1ad1262 commit f06cbbb

6 files changed

Lines changed: 279 additions & 14 deletions

File tree

__tests__/unit/core-transactions/handlers/handler-registry.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ beforeEach(() => {
170170
.when(Container.Selectors.anyAncestorOrTargetTaggedFirst("plugin", "@arkecosystem/core-transactions"));
171171

172172
Managers.configManager.getMilestone().aip11 = false;
173+
Managers.configManager.getMilestone().multiSignatureRegistrationEnabled = true;
173174
});
174175

175176
afterEach(() => {

packages/core-test-framework/src/app/generators/crypto.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ export class CryptoGenerator extends Generator {
128128
htlcEnabled: true,
129129
blockBurnAddress: true,
130130
blsPublicKeyRegistrationEnabled: true,
131+
multiSignatureRegistrationEnabled: true,
131132
},
132133
{
133134
height: rewardHeight,

packages/core-transactions/src/handlers/one/multi-signature-registration.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ export class MultiSignatureRegistrationTransactionHandler extends TransactionHan
4949
}
5050

5151
public async isActivated(): Promise<boolean> {
52-
return !Managers.configManager.getMilestone().aip11;
52+
const milestone = Managers.configManager.getMilestone();
53+
return !milestone.aip11 && milestone.multiSignatureRegistrationEnabled;
5354
}
5455

5556
public async throwIfCannotBeApplied(

packages/core-transactions/src/handlers/two/multi-signature-registration.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ export class MultiSignatureRegistrationTransactionHandler extends TransactionHan
5959
}
6060

6161
public async isActivated(): Promise<boolean> {
62-
return Managers.configManager.getMilestone().aip11 === true;
62+
const milestone = Managers.configManager.getMilestone();
63+
return milestone.aip11 === true && milestone.multiSignatureRegistrationEnabled;
6364
}
6465

6566
public async throwIfCannotBeApplied(

packages/crypto/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"dependencies": {
3434
"@arkecosystem/crypto-identities": "1.2.0",
35-
"@arkecosystem/crypto-networks": "1.6.3",
35+
"@arkecosystem/crypto-networks": "1.7.0",
3636
"@arkecosystem/utils": "1.3.1",
3737
"ajv": "6.12.6",
3838
"ajv-keywords": "3.4.1",

0 commit comments

Comments
 (0)