Merge pull request #5752 from iron-fish/staging

STAGING -> MASTER

Author: NullSoldier

.github/workflows/deploy-npm-ironfish-rust-wasm.yml

@@ -0,0 +1,55 @@
+name: Deploy NPM Ironfish Rust Wasm
+
+on:
+  workflow_dispatch:
+    inputs:
+      dry-run:
+        description: 'Run the publish command in dry-run mode'
+        required: false
+        default: 'false'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          registry-url: 'https://registry.npmjs.org'
+          cache: yarn
+
+      - name: Cache Rust
+        uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: wasm
+
+      - name: Install wasm-pack
+        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+
+      - name: Generate package
+        working-directory: ./ironfish-rust-wasm
+        run: wasm-pack build --release --target=web --scope=ironfish
+
+      - name: Test in Firefox
+        working-directory: ./ironfish-rust-wasm
+        run: wasm-pack test --headless --firefox
+
+      - name: Test in Chrome
+        working-directory: ./ironfish-rust-wasm
+        run: wasm-pack test --headless --chrome
+
+      - name: Publish
+        working-directory: ./ironfish-rust-wasm/pkg
+        run: |
+          if [ ${{ github.event.inputs.dry-run }} = "true" ]; then
+            npm publish --access public --dry-run
+          else
+            npm publish --access public
+          fi
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

Cargo.lock

@@ -86,11 +86,13 @@ If you want to contribute code, you must first read [our contributing guidelines
 
 ## Other Repositories
 
-- [iron-fish/homebrew-brew](https://github.com/iron-fish/homebrew-brew): Contains brew formula for installing via the [Brew](https://brew.sh) package manager
 - [iron-fish/website](https://github.com/iron-fish/website): The repo that powers [ironfish.network](https://ironfish.network)
-- [iron-fish/website-testnet](https://github.com/iron-fish/website-testnet): The repo that powers [testnet.ironfish.network](https://testnet.ironfish.network)
 - [iron-fish/ironfish-api](https://github.com/iron-fish/ironfish-api): The repository that powers most Iron Fish API services.
+- [iron-fish/ironfish-node-app](https://github.com/iron-fish/ironfish-node-app): Desktop app to run and manage an Iron Fish node
+- [iron-fish/mobile-wallet](https://github.com/iron-fish/mobile-wallet): Mobile app Iron Fish wallet
+- [iron-fish/homebrew-brew](https://github.com/iron-fish/homebrew-brew): Contains brew formula for installing via the [Brew](https://brew.sh) package manager
 - [iron-fish/chain-explorer](https://github.com/iron-fish/chain-explorer): A visual tool to explore the block chain and all of its forks.
+- [iron-fish/website-testnet](https://github.com/iron-fish/website-testnet): The repo that powered testnet.ironfish.network
 
 ## Audit
 

README.md

@@ -6,7 +6,7 @@ RUN \
     apt-get update && \
     apt-get install jq rsync -y
 
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=1.76.0
 
 COPY ./ /usr/src/ironfish
 

ironfish-cli/Dockerfile

@@ -1,6 +1,6 @@
 {
   "name": "ironfish",
-  "version": "2.10.0",
+  "version": "2.11.0",
   "description": "CLI for running and interacting with an Iron Fish node",
   "author": "Iron Fish <contact@ironfish.network> (https://ironfish.network)",
   "main": "build/src/index.js",
@@ -62,8 +62,8 @@
   },
   "dependencies": {
     "@ironfish/multisig-broker": "0.3.0",
-    "@ironfish/rust-nodejs": "2.9.0",
-    "@ironfish/sdk": "2.10.0",
+    "@ironfish/rust-nodejs": "2.10.0",
+    "@ironfish/sdk": "2.11.0",
     "@ledgerhq/errors": "6.19.1",
     "@ledgerhq/hw-transport-node-hid": "6.29.5",
     "@oclif/core": "4.0.11",

ironfish-cli/package.json

@@ -2,7 +2,7 @@
  * 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 { multisig } from '@ironfish/rust-nodejs'
-import { RpcClient, UnsignedTransaction } from '@ironfish/sdk'
+import { UnsignedTransaction } from '@ironfish/sdk'
 import { Flags } from '@oclif/core'
 import { IronfishCommand } from '../../../../command'
 import { RemoteFlags } from '../../../../flags'
@@ -53,9 +53,9 @@ export class CreateSigningCommitmentCommand extends IronfishCommand {
     const client = await this.connectRpc()
     await ui.checkWalletUnlocked(client)
 
-    let participantName = flags.account
-    if (!participantName) {
-      participantName = await ui.multisigSecretPrompt(client)
+    let accountName = flags.account
+    if (!accountName) {
+      accountName = await ui.multisigAccountPrompt(client)
     }
 
     let identities = options.identity
@@ -88,24 +88,19 @@ export class CreateSigningCommitmentCommand extends IronfishCommand {
     await renderUnsignedTransactionDetails(
       client,
       unsignedTransaction,
-      participantName,
+      accountName,
       this.logger,
     )
 
     await ui.confirmOrQuit('Confirm signing commitment creation', flags.confirm)
 
     if (flags.ledger) {
-      await this.createSigningCommitmentWithLedger(
-        client,
-        participantName,
-        unsignedTransaction,
-        identities,
-      )
+      await this.createSigningCommitmentWithLedger(unsignedTransaction, identities)
       return
     }
 
     const response = await client.wallet.multisig.createSigningCommitment({
-      account: participantName,
+      account: accountName,
       unsignedTransaction: unsignedTransactionInput,
       signers: identities.map((identity) => ({ identity })),
     })
@@ -119,15 +114,18 @@ export class CreateSigningCommitmentCommand extends IronfishCommand {
   }
 
   async createSigningCommitmentWithLedger(
-    client: RpcClient,
-    participantName: string,
     unsignedTransaction: UnsignedTransaction,
     signers: string[],
   ): Promise<void> {
     const ledger = new LedgerMultiSigner()
 
-    const identityResponse = await client.wallet.multisig.getIdentity({ name: participantName })
-    const identity = identityResponse.content.identity
+    const identity = (
+      await ui.ledger({
+        ledger,
+        message: 'Getting Ledger Identity',
+        action: () => ledger.dkgGetIdentity(0),
+      })
+    ).toString('hex')
 
     const rawCommitments = await ui.ledger({
       ledger,

ironfish-cli/src/commands/wallet/multisig/commitment/create.ts

@@ -98,6 +98,7 @@ export class MultisigCreateDealer extends IronfishCommand {
         multisigKeys: {
           publicKeyPackage: response.content.publicKeyPackage,
         },
+        ledger: false,
       }
 
       await client.wallet.importAccount({

ironfish-cli/src/commands/wallet/multisig/dealer/create.ts

@@ -235,38 +235,20 @@ export class DkgCreateCommand extends IronfishCommand {
     identity: string
     name: string
   }> {
-    const identities = await client.wallet.multisig.getIdentities()
-
     if (ledger) {
-      const ledgerIdentity = await ui.ledger({
-        ledger,
-        message: 'Getting Ledger Identity',
-        action: () => ledger.dkgGetIdentity(0),
-      })
-
-      const foundIdentity = identities.content.identities.find(
-        (i) => i.identity === ledgerIdentity.toString('hex'),
-      )
-
-      if (foundIdentity) {
-        this.debug('Identity from ledger already exists')
-        return foundIdentity
-      }
-
-      // We must use the ledger's identity
-      while (identities.content.identities.find((i) => i.name === name)) {
-        this.log('An identity with the same name already exists')
-        name = await ui.inputPrompt('Enter a new name for the identity', true)
-      }
-
-      const created = await client.wallet.multisig.importParticipant({
-        name,
-        identity: ledgerIdentity.toString('hex'),
-      })
+      const ledgerIdentity = (
+        await ui.ledger({
+          ledger,
+          message: 'Getting Ledger Identity',
+          action: () => ledger.dkgGetIdentity(0),
+        })
+      ).toString('hex')
 
-      return { name, identity: created.content.identity }
+      return { name, identity: ledgerIdentity }
     }
 
+    const identities = await client.wallet.multisig.getIdentities()
+
     const foundIdentity = identities.content.identities.find((i) => i.name === name)
 
     if (foundIdentity) {
@@ -301,15 +283,18 @@ export class DkgCreateCommand extends IronfishCommand {
 
   async performRound1WithLedger(
     ledger: LedgerMultiSigner,
-    client: RpcClient,
-    participantName: string,
     identities: string[],
     minSigners: number,
   ): Promise<{
     round1: { secretPackage: string; publicPackage: string }
   }> {
-    const identityResponse = await client.wallet.multisig.getIdentity({ name: participantName })
-    const identity = identityResponse.content.identity
+    const identity = (
+      await ui.ledger({
+        ledger,
+        message: 'Getting Ledger Identity',
+        action: () => ledger.dkgGetIdentity(0),
+      })
+    ).toString('hex')
 
     if (!identities.includes(identity)) {
       identities.push(identity)
@@ -351,13 +336,7 @@ export class DkgCreateCommand extends IronfishCommand {
     })
 
     if (ledger) {
-      return await this.performRound1WithLedger(
-        ledger,
-        client,
-        participantName,
-        identities,
-        minSigners,
-      )
+      return await this.performRound1WithLedger(ledger, identities, minSigners)
     }
 
     this.log('\nPerforming DKG Round 1...')
@@ -450,14 +429,18 @@ export class DkgCreateCommand extends IronfishCommand {
     ledger: LedgerMultiSigner,
     client: RpcClient,
     accountName: string,
-    participantName: string,
     round1PublicPackagesStr: string[],
     round2PublicPackagesStr: string[],
     round2SecretPackage: string,
     accountCreatedAt?: number,
   ): Promise<void> {
-    const identityResponse = await client.wallet.multisig.getIdentity({ name: participantName })
-    const identity = identityResponse.content.identity
+    const identity = (
+      await ui.ledger({
+        ledger,
+        message: 'Getting Ledger Identity',
+        action: () => ledger.dkgGetIdentity(0),
+      })
+    ).toString('hex')
 
     // Sort packages by identity
     const round1PublicPackages = round1PublicPackagesStr
@@ -529,6 +512,7 @@ export class DkgCreateCommand extends IronfishCommand {
       name: accountName,
       createdAt: null,
       spendingKey: null,
+      ledger: true,
     }
 
     // Import multisig account
@@ -566,7 +550,6 @@ export class DkgCreateCommand extends IronfishCommand {
         ledger,
         client,
         accountName,
-        participantName,
         round1PublicPackages,
         round2PublicPackages,
         round2Result.secretPackage,

ironfish-cli/src/commands/wallet/multisig/dkg/create.ts

@@ -1,7 +1,6 @@
 /* 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 { RpcClient } from '@ironfish/sdk'
 import { Flags } from '@oclif/core'
 import { IronfishCommand } from '../../../../command'
 import { RemoteFlags } from '../../../../flags'
@@ -31,7 +30,7 @@ export class DkgRound1Command extends IronfishCommand {
     ledger: Flags.boolean({
       default: false,
       description: 'Perform operation with a ledger device',
-      hidden: true,
+      exclusive: ['participantName'],
     }),
   }
 
@@ -41,11 +40,6 @@ export class DkgRound1Command extends IronfishCommand {
     const client = await this.connectRpc()
     await ui.checkWalletUnlocked(client)
 
-    let participantName = flags.participantName
-    if (!participantName) {
-      participantName = await ui.multisigSecretPrompt(client)
-    }
-
     let identities = flags.identity
     if (!identities || identities.length < 2) {
       const input = await ui.longPrompt(
@@ -72,10 +66,15 @@ export class DkgRound1Command extends IronfishCommand {
     }
 
     if (flags.ledger) {
-      await this.performRound1WithLedger(client, participantName, identities, minSigners)
+      await this.performRound1WithLedger(identities, minSigners)
       return
     }
 
+    let participantName = flags.participantName
+    if (!participantName) {
+      participantName = await ui.multisigSecretPrompt(client)
+    }
+
     const response = await client.wallet.multisig.dkg.round1({
       participantName,
       participants: identities.map((identity) => ({ identity })),
@@ -94,16 +93,16 @@ export class DkgRound1Command extends IronfishCommand {
     this.log('Send the round 1 public package to each participant')
   }
 
-  async performRound1WithLedger(
-    client: RpcClient,
-    participantName: string,
-    identities: string[],
-    minSigners: number,
-  ): Promise<void> {
+  async performRound1WithLedger(identities: string[], minSigners: number): Promise<void> {
     const ledger = new LedgerMultiSigner()
 
-    const identityResponse = await client.wallet.multisig.getIdentity({ name: participantName })
-    const identity = identityResponse.content.identity
+    const identity = (
+      await ui.ledger({
+        ledger,
+        message: 'Getting Ledger Identity',
+        action: () => ledger.dkgGetIdentity(0),
+      })
+    ).toString('hex')
 
     if (!identities.includes(identity)) {
       identities.push(identity)