diff --git a/ironfish-cli/src/commands/wallet/multisig/create-signing-package.ts b/ironfish-cli/src/commands/wallet/multisig/commitment/aggregate.ts similarity index 92% rename from ironfish-cli/src/commands/wallet/multisig/create-signing-package.ts rename to ironfish-cli/src/commands/wallet/multisig/commitment/aggregate.ts index bc60eaa5c4..3835dab44a 100644 --- a/ironfish-cli/src/commands/wallet/multisig/create-signing-package.ts +++ b/ironfish-cli/src/commands/wallet/multisig/commitment/aggregate.ts @@ -3,9 +3,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ import { Flags } from '@oclif/core' -import { IronfishCommand } from '../../../command' -import { RemoteFlags } from '../../../flags' -import { longPrompt } from '../../../utils/longPrompt' +import { IronfishCommand } from '../../../../command' +import { RemoteFlags } from '../../../../flags' +import { longPrompt } from '../../../../utils/longPrompt' export class CreateSigningPackage extends IronfishCommand { static description = `Creates a signing package for a given transaction for a multisig account` diff --git a/ironfish-cli/src/commands/wallet/multisig/create-signing-commitment.ts b/ironfish-cli/src/commands/wallet/multisig/commitment/create.ts similarity index 92% rename from ironfish-cli/src/commands/wallet/multisig/create-signing-commitment.ts rename to ironfish-cli/src/commands/wallet/multisig/commitment/create.ts index 5927064dcc..c0ce194c5e 100644 --- a/ironfish-cli/src/commands/wallet/multisig/create-signing-commitment.ts +++ b/ironfish-cli/src/commands/wallet/multisig/commitment/create.ts @@ -3,10 +3,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ import { UnsignedTransaction } from '@ironfish/sdk' import { CliUx, Flags } from '@oclif/core' -import { IronfishCommand } from '../../../command' -import { RemoteFlags } from '../../../flags' -import { longPrompt } from '../../../utils/longPrompt' -import { renderUnsignedTransactionDetails } from '../../../utils/transaction' +import { IronfishCommand } from '../../../../command' +import { RemoteFlags } from '../../../../flags' +import { longPrompt } from '../../../../utils/longPrompt' +import { renderUnsignedTransactionDetails } from '../../../../utils/transaction' export class CreateSigningCommitmentCommand extends IronfishCommand { static description = 'Create a signing commitment from a participant for a given transaction' diff --git a/ironfish-cli/src/commands/wallet/multisig/account/create.ts b/ironfish-cli/src/commands/wallet/multisig/dealer/create.ts similarity index 94% rename from ironfish-cli/src/commands/wallet/multisig/account/create.ts rename to ironfish-cli/src/commands/wallet/multisig/dealer/create.ts index 6339bf4474..db3346b029 100644 --- a/ironfish-cli/src/commands/wallet/multisig/account/create.ts +++ b/ironfish-cli/src/commands/wallet/multisig/dealer/create.ts @@ -6,8 +6,8 @@ import { CliUx, Flags } from '@oclif/core' import { IronfishCommand } from '../../../../command' import { RemoteFlags } from '../../../../flags' -export class MultisigCreate extends IronfishCommand { - static description = `Create a set of multisig accounts from identities` +export class MultisigCreateDealer extends IronfishCommand { + static description = `Create a set of multisig accounts from participant identities` static hidden = true static flags = { @@ -33,7 +33,7 @@ export class MultisigCreate extends IronfishCommand { } async start(): Promise { - const { flags } = await this.parse(MultisigCreate) + const { flags } = await this.parse(MultisigCreateDealer) let identities = flags.identity if (!identities || identities.length < 2) { diff --git a/ironfish-cli/src/commands/wallet/multisig/identity/create.ts b/ironfish-cli/src/commands/wallet/multisig/participant/create.ts similarity index 91% rename from ironfish-cli/src/commands/wallet/multisig/identity/create.ts rename to ironfish-cli/src/commands/wallet/multisig/participant/create.ts index c6a686a139..89fbef5941 100644 --- a/ironfish-cli/src/commands/wallet/multisig/identity/create.ts +++ b/ironfish-cli/src/commands/wallet/multisig/participant/create.ts @@ -7,7 +7,7 @@ import { IronfishCommand } from '../../../../command' import { RemoteFlags } from '../../../../flags' export class MultisigIdentityCreate extends IronfishCommand { - static description = `Create a multisig identity` + static description = `Create a multisig participant identity` static hidden = true static flags = { @@ -31,7 +31,7 @@ export class MultisigIdentityCreate extends IronfishCommand { let response while (!response) { try { - response = await client.wallet.multisig.createIdentity({ name }) + response = await client.wallet.multisig.createParticipant({ name }) } catch (e) { if ( e instanceof RpcRequestError && diff --git a/ironfish-cli/src/commands/wallet/multisig/identity/index.ts b/ironfish-cli/src/commands/wallet/multisig/participant/index.ts similarity index 86% rename from ironfish-cli/src/commands/wallet/multisig/identity/index.ts rename to ironfish-cli/src/commands/wallet/multisig/participant/index.ts index 553bfd74ef..47de09b312 100644 --- a/ironfish-cli/src/commands/wallet/multisig/identity/index.ts +++ b/ironfish-cli/src/commands/wallet/multisig/participant/index.ts @@ -6,14 +6,14 @@ import { IronfishCommand } from '../../../../command' import { RemoteFlags } from '../../../../flags' export class MultisigIdentity extends IronfishCommand { - static description = `Retrieve a multisig identity` + static description = `Retrieve a multisig participant identity from a name` static hidden = true static flags = { ...RemoteFlags, name: Flags.string({ char: 'n', - description: 'Name of the identity', + description: 'Name of the participant identity', required: true, }), } diff --git a/ironfish-cli/src/commands/wallet/multisig/account/identities.ts b/ironfish-cli/src/commands/wallet/multisig/participants/index.ts similarity index 79% rename from ironfish-cli/src/commands/wallet/multisig/account/identities.ts rename to ironfish-cli/src/commands/wallet/multisig/participants/index.ts index 54ccb93029..346d4f4b2f 100644 --- a/ironfish-cli/src/commands/wallet/multisig/account/identities.ts +++ b/ironfish-cli/src/commands/wallet/multisig/participants/index.ts @@ -5,8 +5,8 @@ import { Flags } from '@oclif/core' import { IronfishCommand } from '../../../../command' import { RemoteFlags } from '../../../../flags' -export class MultisigAccountIdentities extends IronfishCommand { - static description = `List the identities for a multisig account` +export class MultisigAccountParticipants extends IronfishCommand { + static description = `List the participant identities for a multisig account` static hidden = true static flags = { @@ -18,7 +18,7 @@ export class MultisigAccountIdentities extends IronfishCommand { } async start(): Promise { - const { flags } = await this.parse(MultisigAccountIdentities) + const { flags } = await this.parse(MultisigAccountParticipants) const client = await this.sdk.connectRpc() diff --git a/ironfish-cli/src/commands/wallet/multisig/sign.ts b/ironfish-cli/src/commands/wallet/multisig/signature/aggregate.ts similarity index 94% rename from ironfish-cli/src/commands/wallet/multisig/sign.ts rename to ironfish-cli/src/commands/wallet/multisig/signature/aggregate.ts index 8c23c1c745..91d756b6d5 100644 --- a/ironfish-cli/src/commands/wallet/multisig/sign.ts +++ b/ironfish-cli/src/commands/wallet/multisig/signature/aggregate.ts @@ -3,9 +3,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ import { CurrencyUtils, Transaction } from '@ironfish/sdk' import { CliUx, Flags } from '@oclif/core' -import { IronfishCommand } from '../../../command' -import { RemoteFlags } from '../../../flags' -import { longPrompt } from '../../../utils/longPrompt' +import { IronfishCommand } from '../../../../command' +import { RemoteFlags } from '../../../../flags' +import { longPrompt } from '../../../../utils/longPrompt' export class MultisigSign extends IronfishCommand { static description = 'Aggregate signature shares from participants to sign a transaction' diff --git a/ironfish-cli/src/commands/wallet/multisig/create-signature-share.ts b/ironfish-cli/src/commands/wallet/multisig/signature/create.ts similarity index 89% rename from ironfish-cli/src/commands/wallet/multisig/create-signature-share.ts rename to ironfish-cli/src/commands/wallet/multisig/signature/create.ts index c8747ff7a6..6ee06535ae 100644 --- a/ironfish-cli/src/commands/wallet/multisig/create-signature-share.ts +++ b/ironfish-cli/src/commands/wallet/multisig/signature/create.ts @@ -1,13 +1,12 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ - import { UnsignedTransaction } from '@ironfish/sdk' import { CliUx, Flags } from '@oclif/core' -import { IronfishCommand } from '../../../command' -import { RemoteFlags } from '../../../flags' -import { longPrompt } from '../../../utils/longPrompt' -import { renderUnsignedTransactionDetails } from '../../../utils/transaction' +import { IronfishCommand } from '../../../../command' +import { RemoteFlags } from '../../../../flags' +import { longPrompt } from '../../../../utils/longPrompt' +import { renderUnsignedTransactionDetails } from '../../../../utils/transaction' export class CreateSignatureShareCommand extends IronfishCommand { static description = `Creates a signature share for a participant for a given transaction` diff --git a/ironfish/src/rpc/clients/client.ts b/ironfish/src/rpc/clients/client.ts index a76a2391a7..b6f92b40c6 100644 --- a/ironfish/src/rpc/clients/client.ts +++ b/ironfish/src/rpc/clients/client.ts @@ -21,8 +21,8 @@ import type { BurnAssetResponse, CreateAccountRequest, CreateAccountResponse, - CreateIdentityRequest, - CreateIdentityResponse, + CreateParticipantRequest, + CreateParticipantResponse, CreateSignatureShareRequest, CreateSignatureShareResponse, CreateSigningCommitmentRequest, @@ -234,11 +234,11 @@ export abstract class RpcClient { ).waitForEnd() }, - createIdentity: ( - params: CreateIdentityRequest, - ): Promise> => { - return this.request( - `${ApiNamespace.wallet}/multisig/createIdentity`, + createParticipant: ( + params: CreateParticipantRequest, + ): Promise> => { + return this.request( + `${ApiNamespace.wallet}/multisig/createParticipant`, params, ).waitForEnd() }, diff --git a/ironfish/src/rpc/routes/wallet/exportAccount.test.ts b/ironfish/src/rpc/routes/wallet/exportAccount.test.ts index 086ca9d6cf..0defc77f95 100644 --- a/ironfish/src/rpc/routes/wallet/exportAccount.test.ts +++ b/ironfish/src/rpc/routes/wallet/exportAccount.test.ts @@ -11,7 +11,7 @@ import { JsonEncoder } from '../../../wallet/account/encoder/json' import { MnemonicEncoder } from '../../../wallet/account/encoder/mnemonic' import { SpendingKeyEncoder } from '../../../wallet/account/encoder/spendingKey' import { ExportAccountResponse } from './exportAccount' -import { CreateIdentityResponse } from './multisig/createIdentity' +import { CreateParticipantResponse } from './multisig/createParticipant' describe('Route wallet/exportAccount', () => { const routeTest = createRouteTest(true) @@ -149,7 +149,7 @@ describe('Route wallet/exportAccount', () => { async (name) => ( await routeTest.client - .request('wallet/multisig/createIdentity', { name }) + .request('wallet/multisig/createParticipant', { name }) .waitForEnd() ).content, ), diff --git a/ironfish/src/rpc/routes/wallet/importAccount.test.ts b/ironfish/src/rpc/routes/wallet/importAccount.test.ts index 6dad3e0650..a01b3aa28a 100644 --- a/ironfish/src/rpc/routes/wallet/importAccount.test.ts +++ b/ironfish/src/rpc/routes/wallet/importAccount.test.ts @@ -17,7 +17,7 @@ import { Bech32JsonEncoder } from '../../../wallet/account/encoder/bech32json' import { AccountFormat } from '../../../wallet/account/encoder/encoder' import { RpcClient } from '../../clients' import { ImportResponse } from './importAccount' -import { CreateIdentityResponse } from './multisig/createIdentity' +import { CreateParticipantResponse } from './multisig/createParticipant' describe('Route wallet/importAccount', () => { const routeTest = createRouteTest(true) @@ -319,7 +319,7 @@ describe('Route wallet/importAccount', () => { const identity = ( await routeTest.client - .request('wallet/multisig/createIdentity', { name }) + .request('wallet/multisig/createParticipant', { name }) .waitForEnd() ).content.identity const base64 = encodeAccount(createAccountImport(name), AccountFormat.Base64Json, { @@ -371,11 +371,11 @@ describe('Route wallet/importAccount', () => { const name = 'multisig-encrypted-base64 (wrong key)' await routeTest.client - .request('wallet/multisig/createIdentity', { name }) + .request('wallet/multisig/createParticipant', { name }) .waitForEnd() - const encryptingIdentity = ParticipantSecret.random().toIdentity() + const encryptingParticipant = ParticipantSecret.random().toIdentity() const base64 = encodeAccount(createAccountImport(name), AccountFormat.Base64Json, { - encryptWith: { kind: 'MultisigIdentity', identity: encryptingIdentity }, + encryptWith: { kind: 'MultisigIdentity', identity: encryptingParticipant }, }) await expect( diff --git a/ironfish/src/rpc/routes/wallet/multisig/__fixtures__/createSigningPackage.test.ts.fixture b/ironfish/src/rpc/routes/wallet/multisig/__fixtures__/createSigningPackage.test.ts.fixture index a07c805309..0027f82258 100644 --- a/ironfish/src/rpc/routes/wallet/multisig/__fixtures__/createSigningPackage.test.ts.fixture +++ b/ironfish/src/rpc/routes/wallet/multisig/__fixtures__/createSigningPackage.test.ts.fixture @@ -2,13 +2,13 @@ "Route multisig/createSigningPackage should create signing package": [ { "version": 4, - "id": "643485a7-a130-4661-84f8-8627c44db47a", + "id": "5bd50c3c-6539-444e-a65f-7576df689ec7", "name": "test", - "spendingKey": "d28b4c09ff9dcfd9ccd4ef5686496682a99456c7c1e55d20ec12fba34a8d9c82", - "viewKey": "a466e83e75f0fffde7b561e1cdf51c37b703872264f4ba86a446479081daa3dba5ec8fd39015a7058025784dd009eb2e386d8f8c2301b3246fca9aaab07dd7e7", - "incomingViewKey": "917a452e57c355d5875492d837c3b2db143828b0a0f2de1201a85c1d0e3b1d04", - "outgoingViewKey": "d27a8ed39e83c7d4ec264e7c5626f04de0e9fdb857c396493bc1d90740363a76", - "publicAddress": "ec194a8f1fd1eeb3fb598784520ceeb178d847d91e3cd3dc4d1dc7c33dd5636c", + "spendingKey": "fe1e0c55cf4a6528b8c0a7765c98be0e895a6744500593ba9c796507322a7dac", + "viewKey": "f461e2eda7d920c3eec1afca71eac6fe176d61bc5e72778a5d51189fb0f5a44b43643eff7a3f29f6c76ee8e0c4e800f1aaf9febeffac26cc08d36cecbaacbc2d", + "incomingViewKey": "9bc32b94f00c3bf8198434a1ba7a501d8c9b64423cc5c920392e7ae038b74e00", + "outgoingViewKey": "c20bd7e169306324e3050087b8f1a44795bd5866e227926b8104872f6bfd46b9", + "publicAddress": "0531c3796cd0e0e5db4118ad16662413c3f41b490cf51f531d94a3d04f3821cd", "createdAt": { "hash": { "type": "Buffer", @@ -16,7 +16,7 @@ }, "sequence": 1 }, - "proofAuthorizingKey": "0ada1f7840a9c5ef207c53d437cb3a2dab3c7f6bfa14d202baca441e6c1f7107" + "proofAuthorizingKey": "cfb8683f14041deb798c49c9d704e8ad08b50967f847b9b6ae4b4e9ba84c640a" }, { "header": { @@ -24,15 +24,15 @@ "previousBlockHash": "4791D7AE9F97DF100EF1558E84772D6A09B43762388283F75C6F20A32A88AA86", "noteCommitment": { "type": "Buffer", - "data": "base64:fVl0Y8NDkt1+KwAgnL8TJHBXncjr5ChXHsfOngYVg3E=" + "data": "base64:0NKojeVsZLsIciUPhfVX+PmuFh73r+MXTo29XXdFEBY=" }, "transactionCommitment": { "type": "Buffer", - "data": "base64:rlIrkNk6kqoPRw6njHqJVgFjd+E7Fxtt9ezCXbyOoIk=" + "data": "base64:prOD+qubJ06SCDKIIHzBgU56ivmiZca+oxnqgfhiH/g=" }, "target": "9282972777491357380673661573939192202192629606981189395159182914949423", "randomness": "0", - "timestamp": 1708551341189, + "timestamp": 1709591815765, "graffiti": "0000000000000000000000000000000000000000000000000000000000000000", "noteSize": 4, "work": "0" @@ -40,25 +40,25 @@ "transactions": [ { "type": "Buffer", - "data": "base64:AQAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGzKiP////8AAAAAJiTBBh+OVlGUqGCULKVAaLoEaHliUC1CpcRnKMT6OLeCvouaL9WxKKEcXDGB9FSK+P0ub9SQOTjeet7t9Tk9IZgs3agwFygs06fO0ElN0yewR/n9CtRfsTI6Pb1M5ow6GiJXBga5cd8u9BlS+uXXwAWtAAB5kGMsYHWjdOtiTB8FE0Zj+L7C0cYZkAy1rw2EproOsb4Cn1s5kD4d6x+tzpUVZlQ+r+9yIAz99JxtWoiVhKMuqtWRZlH/U/R83rd0d7mmaJM1XSAiCySKlzPDD2dCDegGQFbRhMxFMnTWIk9taf+o6lYSUKe99kNQLFFjjW15vEiJfWFP+HEHBFZcySn2+G+xDDaK4NM8AniiaU4oULXpawnCx8u4kbgBPoINTG+BtJw0FBtbNcGh8QA13jv7C0ZwVgaYhooLcAChbaPzZcg8APBMs5bYWDL/xGuW8fP0eQCHdrqO6yDZSoVjRYv7IsG7wzZyHNKMCwSe368y18u1MUn4fLxVkSZSmyYsy0z5nsIKajLpHbkpe6+7tj0ympU+6CMmfgWPHScrp1jyOO+3Ip3XIAZgSzE3rzaI+el2d3M1tm/R0+aMnVyFT1c5IElDua/AgvSpnbJsqdWwKOjV2I/aV0lyb24gRmlzaCBub3RlIGVuY3J5cHRpb24gbWluZXIga2V5MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwGNt2ZYu0rOtO8UwinivKgHlWCf/3YeLbQMJpVmq8fdsLoWdozuPIA9ECA8xa+FfxiBozYY/tEzfb9HiWdZVrAA==" + "data": "base64:AQAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGzKiP////8AAAAADViTHO69UYSpUNzZtsYC7iL8+75ckf7EXC/dKMMB+nGsHPEK1i0FZTjIvT9udrBhfEQCxL5iaY4CMRG5JcP+qEHjCPM84bVx5Y66n9Lav1KS+8h+5Hpy185DQ6seI4TadSCzTbnDgW+f+vEwISh9l0tCw2cnOpthfy16lvTzOm4JbglshDQpaYdJlyAojswIoasccBPrwLlAkqRrzt9UE0rx5AmW/Y1SywQmDrj1tiCZHjcV5M+hQKnSed484Glp1od2cZLTsiy/XNULj8Uwp8PlGK3bfPfudwCq8sSXVDFRvbgUirh0BIbEEjg+nn3gDkYLqvorUSXbPGQjU/SabvKyCU5gxXsa9o+Hsn+7F+9roW8r2OPgfRuUYTaXulkOfAZokFtIipHNUUMsgOOfWFMlTVbO3E+m9DjSZ710vW0yMXigoUBcHSFgGl6IaljuMUqA9VR6byASLC0zXd7wk+sxS897RfJpPT9OMXuHZ2ueYteat8G1N35CPOnGM3KubMfrw0l8qeXoIFeyAJ0+Spa+R0PabzIZj1VnT88aUR2WyfQcwRorwca7eSPkugGXbIsqmx076glhcqqaYC7rubphcDCiiUPIv/B6EPIe8i5UcOIJd2EMSklyb24gRmlzaCBub3RlIGVuY3J5cHRpb24gbWluZXIga2V5MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw842XiOqgQYieqFJCCK7D7CHaDCmEkuNF/o8RGe4qt1T7AVXhcIG3e3AXib8Q6f1LyWhSjbBkRzlqH5gT95paBQ==" } ] }, { "type": "Buffer", - "data": "base64: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" + "data": "base64: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" } ], "Route multisig/createSigningPackage should verify commitment identities": [ { "version": 4, - "id": "f304fcd6-bc5c-4b52-a152-87654b8d2943", + "id": "453094d4-6348-48a1-b625-75f68461fe72", "name": "test", - "spendingKey": "54ebde2265798123538cd1e2178bc649fc20f8ab6d5794e36e31f640bc6c6c4e", - "viewKey": "365efe594df256e24938e18c5c300b09eb513babf06241791eb728ea2933563ab13660b4e1558f0614532bf9889012398b041a418dd564bf1138d7571ad68ec8", - "incomingViewKey": "16962493ecabcde419405f4e566f908f34305333a1e6614f8afcb37a8d325a07", - "outgoingViewKey": "a8b2685d6a3b0b17c2474e2fa53ec14efd01a2d55fa21cf92cdc8f4058dbdde8", - "publicAddress": "8d849a74f1135c926af3c6c783a1088ad62b2761b70b289394f10138ac6ed585", + "spendingKey": "4f0ec9dbc204d53c3e960f0cf935e11e08ed00a11bfaac2fa043dd67dff37ef8", + "viewKey": "27b0cbbf1bbb319fb83fd6b423bd64872ddb9f97dbd7b53a40e65f98cf320f4c1d2f5efa957061251cb560e506327363c2353ffdc03d9aa7fbbfc19c4bd0e0a4", + "incomingViewKey": "c6e34c9247139a84bb4336f61a7ee32b3f151c983e0f717f388db6598718f204", + "outgoingViewKey": "631c569fa8f09e783a238c21bbc3cbcffe0aa482a7b35d507958e10b18009e05", + "publicAddress": "e2bdb8edaddf79665a291557806198b91261d93a28de4bb81334ed90b4875445", "createdAt": { "hash": { "type": "Buffer", @@ -66,7 +66,7 @@ }, "sequence": 1 }, - "proofAuthorizingKey": "a4e5ca78a2e58b16a1afd842306a8a7b6d528fd035efb7223e153134251d0105" + "proofAuthorizingKey": "fc4f4bbb17d69002b1cf28de960645ba5ef26d29d9a54dee457c9d8d9b164b05" }, { "header": { @@ -74,15 +74,15 @@ "previousBlockHash": "4791D7AE9F97DF100EF1558E84772D6A09B43762388283F75C6F20A32A88AA86", "noteCommitment": { "type": "Buffer", - "data": "base64:V616bMOOd+LkcsA/4ktI/kTL6rJ7ZhvOGheRXeOIWVo=" + "data": "base64:9BbvmAKv3VDcfPSUfr7JPoS3JE0upFIirARc091abgg=" }, "transactionCommitment": { "type": "Buffer", - "data": "base64:a49eSfHxsqAewoeHulfubOkM1wpbHQ3gsgO44nFXPEo=" + "data": "base64:0P7hihq6K71YDMYpa/JKZuBoPeq6en2WpdpREIscfNQ=" }, "target": "9282972777491357380673661573939192202192629606981189395159182914949423", "randomness": "0", - "timestamp": 1708734750297, + "timestamp": 1709591818640, "graffiti": "0000000000000000000000000000000000000000000000000000000000000000", "noteSize": 4, "work": "0" @@ -90,13 +90,13 @@ "transactions": [ { "type": "Buffer", - "data": "base64:AQAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGzKiP////8AAAAA+EPXK1t0NwOyI6EKI1jhFdLNv/UH8moIUt2CyawsvtO1X6P6zcamXyROkEc683tHb4QrfenN72ADmRPm3Hpfyy9cnwfhtkUxvSCjZrhDlwe0M4RncpguzrUX7BHcin0XVajsjV/yorQs2beMmLve0rIiNVQljkCHR+x2Zaa/WTYX1haY/K6vlasc2EXuJOPmror/OEB36c4gGSQ+Ojqal0Foa+wiMa1wcz28BJklRTyPhGBtiSl3LBD0yhxy8AWRS7LfF62mjlbzc6iVGtp8T4UomOKHJs0TBZT/5TZDW9igbeV5BzYRQxGxX+UteG6ogGaR05HLESsvXi5M4VeN7cA8eHn13NxmNODKuBBePDLw4cOLYbBHtI3sTspPJ1cDByYacCZ8SARfdEBiK9IT+9QA9KLRG3pb/dtd1/c5DwzuFdEhcOIFo/ctYtQ9eNot8wzAYuxGuNFKc3HAPItkDFl193fMHcCTYihWxt2j4wLp93T4S3FcEk9RTJrHAyvIKqxQYLmsqDryo3m4Q8VklxWCY++WctZswQ0pr1q3UBdPY0VIg8vePApEacZxtfDxBUyc970LrnnqDDoHNw9pmOvHsB9fu/6QD2vLw3iT164W8OQhVm4bUElyb24gRmlzaCBub3RlIGVuY3J5cHRpb24gbWluZXIga2V5MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwN2RqUpitc1ZyUxfTuI/BaC1qO6IA0ByvhamCVp2VEdyLDlL5m6s3Kksb5vOS8Y5dMll1cm9xfEITqxcMsW8RCA==" + "data": "base64:AQAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGzKiP////8AAAAAEFCQ6P/SypxBxhs9f0L8NVdta8XhV0B1NAbs8YNTrQGUY5IWm0YsBIEddvJ/fc83F+VYvICguW4N+HZfp9znMT639wCeM6v+PhebnVAZpKuMBevQ9kFhpVdPStPfjdSCb+KG83/svf3fLD0SM5Lc8rsvyvLqQphEZ3cG1aWuG/YWPye+0kYUAEEOpeG/ybau24N2FG5VLk9S1y05q7kjkel/wqah9qydOuxy+TlRQJ6pkXfS6XU8hnAamhQ41+hDWTnttRHu/RjVyRiYCFQsXGmzHy9iQdkgG4D93+EiCYqELTE0p3o5g9F/88kwVcn2EQ/uKBqPlBFY9QdgPDnKieatXC0XdxTK0vXAu3vUfXChJ9OKQJeNN9go5HEfNsQBiQLOad0ruMnWs/2qd8/0807IF8LGvnZRpgc2XWmEmI+Gn4vu/sddMNqGl/uSr5KH7XPZbDfrmqVvfOBNN0MlGnkePpFmNTQGcx4MDKYg82+Wav4I9NgrTwyJ6Hs4OeJHRnh74c6ZPvSTOJGmxhwq7JifEQA0USRBHX17hr4SFqgKqy5oHCVstvFWPiPqdO5ErxtWWxNJZN9LDA/MtvBdDXxT/Itljt54bGi2zAlM27aWWewebN+9tElyb24gRmlzaCBub3RlIGVuY3J5cHRpb24gbWluZXIga2V5MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwugkZaNFTWRvmGTppiQTRIpa5WTA0BUttHJjwHfbiKzTSfbF3i4rBJFbdP/BEBz5MoJK94Lf2FS3g4rl81c4pBw==" } ] }, { "type": "Buffer", - "data": "base64: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" + "data": "base64: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" } ] } \ No newline at end of file diff --git a/ironfish/src/rpc/routes/wallet/multisig/createIdentity.test.ts b/ironfish/src/rpc/routes/wallet/multisig/createParticipant.test.ts similarity index 84% rename from ironfish/src/rpc/routes/wallet/multisig/createIdentity.test.ts rename to ironfish/src/rpc/routes/wallet/multisig/createParticipant.test.ts index d072aced7e..1390a84c0e 100644 --- a/ironfish/src/rpc/routes/wallet/multisig/createIdentity.test.ts +++ b/ironfish/src/rpc/routes/wallet/multisig/createParticipant.test.ts @@ -4,15 +4,15 @@ import { Assert } from '../../../../assert' import { createRouteTest } from '../../../../testUtilities/routeTest' -describe('Route wallet/multisig/createIdentity', () => { +describe('Route wallet/multisig/createParticipant', () => { const routeTest = createRouteTest() it('should fail for a secret name that exists', async () => { const name = 'name' - await routeTest.client.wallet.multisig.createIdentity({ name }) + await routeTest.client.wallet.multisig.createParticipant({ name }) await expect( - routeTest.client.wallet.multisig.createIdentity({ + routeTest.client.wallet.multisig.createParticipant({ name, }), ).rejects.toThrow( @@ -30,7 +30,7 @@ describe('Route wallet/multisig/createIdentity', () => { await routeTest.client.wallet.createAccount({ name }) await expect( - routeTest.client.wallet.multisig.createIdentity({ + routeTest.client.wallet.multisig.createParticipant({ name, }), ).rejects.toThrow( @@ -43,7 +43,7 @@ describe('Route wallet/multisig/createIdentity', () => { it('should create a secret for a new identity', async () => { const name = 'identity' - const response = await routeTest.client.wallet.multisig.createIdentity({ name }) + const response = await routeTest.client.wallet.multisig.createParticipant({ name }) const secretValue = await routeTest.node.wallet.walletDb.getMultisigSecret( Buffer.from(response.content.identity, 'hex'), diff --git a/ironfish/src/rpc/routes/wallet/multisig/createIdentity.ts b/ironfish/src/rpc/routes/wallet/multisig/createParticipant.ts similarity index 64% rename from ironfish/src/rpc/routes/wallet/multisig/createIdentity.ts rename to ironfish/src/rpc/routes/wallet/multisig/createParticipant.ts index 697d570384..1005e8f485 100644 --- a/ironfish/src/rpc/routes/wallet/multisig/createIdentity.ts +++ b/ironfish/src/rpc/routes/wallet/multisig/createParticipant.ts @@ -6,29 +6,29 @@ import { ApiNamespace } from '../../namespaces' import { routes } from '../../router' import { AssertHasRpcContext } from '../../rpcContext' -export type CreateIdentityRequest = { +export type CreateParticipantRequest = { name: string } -export type CreateIdentityResponse = { +export type CreateParticipantResponse = { identity: string } -export const CreateIdentityRequestSchema: yup.ObjectSchema = yup +export const CreateParticipantRequestSchema: yup.ObjectSchema = yup .object({ name: yup.string().defined(), }) .defined() -export const CreateIdentityResponseSchema: yup.ObjectSchema = yup +export const CreateParticipantResponseSchema: yup.ObjectSchema = yup .object({ identity: yup.string().defined(), }) .defined() -routes.register( - `${ApiNamespace.wallet}/multisig/createIdentity`, - CreateIdentityRequestSchema, +routes.register( + `${ApiNamespace.wallet}/multisig/createParticipant`, + CreateParticipantRequestSchema, async (request, context): Promise => { AssertHasRpcContext(request, context, 'wallet') diff --git a/ironfish/src/rpc/routes/wallet/multisig/createSigningCommitment.test.ts b/ironfish/src/rpc/routes/wallet/multisig/createSigningCommitment.test.ts index 84db691fc0..81280b6152 100644 --- a/ironfish/src/rpc/routes/wallet/multisig/createSigningCommitment.test.ts +++ b/ironfish/src/rpc/routes/wallet/multisig/createSigningCommitment.test.ts @@ -5,7 +5,7 @@ import { ParticipantSecret } from '@ironfish/rust-nodejs' import { useAccountAndAddFundsFixture, useUnsignedTxFixture } from '../../../../testUtilities' import { createRouteTest } from '../../../../testUtilities/routeTest' import { ACCOUNT_SCHEMA_VERSION } from '../../../../wallet' -import { CreateIdentityResponse } from './createIdentity' +import { CreateParticipantResponse } from './createParticipant' describe('Route wallet/multisig/createSigningCommitment', () => { const routeTest = createRouteTest() @@ -93,7 +93,7 @@ describe('Route wallet/multisig/createSigningCommitment', () => { async (name) => ( await routeTest.client - .request('wallet/multisig/createIdentity', { name }) + .request('wallet/multisig/createParticipant', { name }) .waitForEnd() ).content, ), diff --git a/ironfish/src/rpc/routes/wallet/multisig/createSigningPackage.test.ts b/ironfish/src/rpc/routes/wallet/multisig/createSigningPackage.test.ts index 5aa2414558..3c10f280fb 100644 --- a/ironfish/src/rpc/routes/wallet/multisig/createSigningPackage.test.ts +++ b/ironfish/src/rpc/routes/wallet/multisig/createSigningPackage.test.ts @@ -4,7 +4,7 @@ import { useAccountAndAddFundsFixture, useUnsignedTxFixture } from '../../../../testUtilities' import { createRouteTest } from '../../../../testUtilities/routeTest' import { RpcRequestError } from '../../../clients' -import { CreateIdentityResponse } from './createIdentity' +import { CreateParticipantResponse } from './createParticipant' describe('Route multisig/createSigningPackage', () => { const routeTest = createRouteTest() @@ -16,7 +16,7 @@ describe('Route multisig/createSigningPackage', () => { accountNames.map(async (name) => { const identity = ( await routeTest.client - .request('wallet/multisig/createIdentity', { name }) + .request('wallet/multisig/createParticipant', { name }) .waitForEnd() ).content.identity return { name, identity } @@ -79,7 +79,7 @@ describe('Route multisig/createSigningPackage', () => { accountNames.map(async (name) => { const identity = ( await routeTest.client - .request('wallet/multisig/createIdentity', { name }) + .request('wallet/multisig/createParticipant', { name }) .waitForEnd() ).content.identity return { name, identity } diff --git a/ironfish/src/rpc/routes/wallet/multisig/index.ts b/ironfish/src/rpc/routes/wallet/multisig/index.ts index d167a3e32a..3a2911f7ad 100644 --- a/ironfish/src/rpc/routes/wallet/multisig/index.ts +++ b/ironfish/src/rpc/routes/wallet/multisig/index.ts @@ -7,6 +7,6 @@ export * from './createSigningCommitment' export * from './createSigningPackage' export * from './createTrustedDealerKeyPackage' export * from './createSignatureShare' -export * from './createIdentity' +export * from './createParticipant' export * from './getIdentity' export * from './getAccountIdentities' diff --git a/ironfish/src/rpc/routes/wallet/multisig/integration.test.slow.ts b/ironfish/src/rpc/routes/wallet/multisig/integration.test.slow.ts index 8470dc8667..d681f3bd60 100644 --- a/ironfish/src/rpc/routes/wallet/multisig/integration.test.slow.ts +++ b/ironfish/src/rpc/routes/wallet/multisig/integration.test.slow.ts @@ -14,7 +14,7 @@ describe('multisig RPC integration', () => { const accountNames = Array.from({ length: 3 }, (_, index) => `test-account-${index}`) const participants = await Promise.all( accountNames.map(async (name) => { - const identity = (await routeTest.client.wallet.multisig.createIdentity({ name })) + const identity = (await routeTest.client.wallet.multisig.createParticipant({ name })) .content.identity return { name, identity } }),