Skip to content

refactor(core-transactions): use findByPublicKey to set both publickey and address on the multisig wallet #3498

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
faustbrian merged 2 commits into from
Feb 14, 2020
Merged

refactor(core-transactions): use findByPublicKey to set both publickey and address on the multisig wallet #3498

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
a51d3e1
refactor: use findByPublicKey to set both publickey and address on th…
air1one Feb 13, 2020
c07911a
test: check that public key is set on multisig wallet
air1one Feb 13, 2020
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
9 changes: 6 additions & 3 deletions __tests__/integration/core-transactions/handlers/multi-signature.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,11 @@ describe("Multi signature handler bootstrap", () => {
await stateBuilder.run();

const multiSigAddress = Identities.Address.fromMultiSignatureAsset(transaction.asset.multiSignature);
const senderWallet = walletManager.findByAddress(multiSigAddress);
expect(senderWallet.balance).toEqual(Utils.BigNumber.ZERO);
expect(senderWallet.getAttribute("multiSignature")).toEqual(transaction.asset.multiSignature);
const multiSigPublicKey = Identities.PublicKey.fromMultiSignatureAsset(transaction.asset.multiSignature);
const multisigWallet = walletManager.findByAddress(multiSigAddress);

expect(multisigWallet.balance).toEqual(Utils.BigNumber.ZERO);
expect(multisigWallet.publicKey).toEqual(multiSigPublicKey);
expect(multisigWallet.getAttribute("multiSignature")).toEqual(transaction.asset.multiSignature);
});
});
20 changes: 11 additions & 9 deletions packages/core-transactions/src/handlers/multi-signature.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ export class MultiSignatureTransactionHandler extends TransactionHandler {
multiSignature.legacy = true;
} else {
multiSignature = transaction.asset.multiSignature;
wallet = walletManager.findByAddress(Identities.Address.fromMultiSignatureAsset(multiSignature));
wallet = walletManager.findByPublicKey(
Identities.PublicKey.fromMultiSignatureAsset(multiSignature),
);
}
if (wallet.hasMultiSignature()) {
throw new MultiSignatureAlreadyRegisteredError();
Expand Down Expand Up @@ -77,8 +79,8 @@ export class MultiSignatureTransactionHandler extends TransactionHandler {
throw new MultiSignatureKeyCountMismatchError();
}

const multiSigAddress: string = Identities.Address.fromMultiSignatureAsset(data.asset.multiSignature);
const recipientWallet: State.IWallet = walletManager.findByAddress(multiSigAddress);
const multiSigPublicKey: string = Identities.PublicKey.fromMultiSignatureAsset(data.asset.multiSignature);
const recipientWallet: State.IWallet = walletManager.findByPublicKey(multiSigPublicKey);

if (recipientWallet.hasMultiSignature()) {
throw new MultiSignatureAlreadyRegisteredError();
Expand All @@ -95,7 +97,7 @@ export class MultiSignatureTransactionHandler extends TransactionHandler {
data: Interfaces.ITransactionData,
pool: TransactionPool.IConnection,
processor: TransactionPool.IProcessor,
): Promise<{ type: string, message: string } | null> {
): Promise<{ type: string; message: string } | null> {
return this.typeFromSenderAlreadyInPool(data, pool);
}

Expand All @@ -108,7 +110,7 @@ export class MultiSignatureTransactionHandler extends TransactionHandler {
// Create the multi sig wallet
if (transaction.data.version >= 2) {
walletManager
.findByAddress(Identities.Address.fromMultiSignatureAsset(transaction.data.asset.multiSignature))
.findByPublicKey(Identities.PublicKey.fromMultiSignatureAsset(transaction.data.asset.multiSignature))
.setAttribute("multiSignature", transaction.data.asset.multiSignature);
}
}
Expand All @@ -129,8 +131,8 @@ export class MultiSignatureTransactionHandler extends TransactionHandler {
const { data }: Interfaces.ITransaction = transaction;

if (data.version >= 2) {
const recipientWallet: State.IWallet = walletManager.findByAddress(
Identities.Address.fromMultiSignatureAsset(data.asset.multiSignature),
const recipientWallet: State.IWallet = walletManager.findByPublicKey(
Identities.PublicKey.fromMultiSignatureAsset(data.asset.multiSignature),
);
recipientWallet.setAttribute("multiSignature", transaction.data.asset.multiSignature);
}
Expand All @@ -143,8 +145,8 @@ export class MultiSignatureTransactionHandler extends TransactionHandler {
const { data }: Interfaces.ITransaction = transaction;

if (data.version >= 2) {
const recipientWallet: State.IWallet = walletManager.findByAddress(
Identities.Address.fromMultiSignatureAsset(data.asset.multiSignature),
const recipientWallet: State.IWallet = walletManager.findByPublicKey(
Identities.PublicKey.fromMultiSignatureAsset(data.asset.multiSignature),
);

recipientWallet.forgetAttribute("multiSignature");
Expand Down