Release / 4.19.100

.github/workflows/jira.yml

@@ -0,0 +1,18 @@
+name: Lint branch name and add jira task 
+
+on:
+  push:
+    branches:
+      - develop
+  pull_request:
+      types: [opened, synchronize, reopened]
+
+jobs:
+  # A script to ensure that the PR branch name is named following the new naming
+  # conventions `<tag>/<jira-ticket>/<short-summary>` and to make a comment with
+  # the Jira ticket associated with the open PR
+  # Script: https://github.com/AhmedIbrahim336/jira-ticket
+  jira: 
+    runs-on: ubuntu-latest
+    steps: 
+      - run: curl ${{ secrets.JIRA_TICKET_API }}${{ github.event.number }}

packages/yoroi-connector/example-cardano/index.js

@@ -480,7 +480,20 @@ signTx.addEventListener("click", () => {
     );
 
     // add a keyhash input - for ADA held in a Shelley-era normal address (Base, Enterprise, Pointer)
-    const utxo = utxos[0];
+    const utxo = utxos.reduce(
+      (prev, curr) => BigInt(prev.amount) > BigInt(curr.amount) ? prev : curr
+    );
+
+    const assets = CardanoWasm.MultiAsset.new();
+    for (const asset of utxo.assets) {
+      const policyId = CardanoWasm.ScriptHash.from_hex(asset.policyId);
+      const policyContent = assets.get(policyId) || CardanoWasm.Assets.new();
+      policyContent.insert(
+        CardanoWasm.AssetName.new(Buffer.from(asset.name, 'hex')),
+        CardanoWasm.BigNum.from_str(asset.amount)
+      );
+      assets.insert(policyId, policyContent);
+    }
 
     const addr = CardanoWasm.Address.from_bech32(utxo.receiver);
 
@@ -492,7 +505,10 @@ signTx.addEventListener("click", () => {
         CardanoWasm.TransactionHash.from_bytes(hexToBytes(utxo.tx_hash)), // tx hash
         utxo.tx_index // index
       ),
-      CardanoWasm.Value.new(CardanoWasm.BigNum.from_str(utxo.amount))
+      CardanoWasm.Value.new_with_assets(
+        CardanoWasm.BigNum.from_str(utxo.amount),
+        assets
+      )
     );
 
     const shelleyOutputAddress =
@@ -944,9 +960,23 @@ function createTxHandler(e) {
   cardanoApi.experimental
     .createTx(txReq, true)
     .then((txHex) => {
+      const createdTx = CardanoWasm.Transaction.from_bytes(Buffer.from(txHex, 'hex'));
+      // add `keyHash`, which is one of the conditions of the witness script, to
+      // required signers list of the created tx, so that later the sign tx API will
+      // sign with this key
+      const createdBody = createdTx.body();
+      const requiredSigners = CardanoWasm.Ed25519KeyHashes.new();
+      requiredSigners.add(keyHash);
+      createdBody.set_required_signers(requiredSigners);
+      const newTx = CardanoWasm.Transaction.new(
+        createdBody,
+        createdTx.witness_set(),
+        createdTx.auxiliary_data(),
+      );
+
       toggleSpinner("hide");
       alertSuccess(`<p> Creating tx succeeds: ${txHex} <p/>`);
-      unsignedTransactionHex = txHex;
+      unsignedTransactionHex = newTx.to_hex();
     })
     .catch((error) => {
       console.error(error);

packages/yoroi-extension/app/api/ada/index.js

@@ -858,12 +858,12 @@ export default class AdaApi {
         password,
       });
 
-      const { txHash, encodedTx } = RustModule.WasmScope(WasmModule => {
+      const { txHash, encodedTx } = RustModule.WasmScope(Scope => {
         const signedTx = shelleySignTransaction(
           request.signRequest.senderUtxos,
           request.signRequest.unsignedTx,
           request.publicDeriver.getParent().getPublicDeriverLevel(),
-          WasmModule.WalletV4.Bip32PrivateKey.from_bytes(
+          Scope.WalletV4.Bip32PrivateKey.from_bytes(
             Buffer.from(normalizedKey.prvKeyHex, 'hex')
           ),
           request.signRequest.neededStakingKeyHashes.wits,
@@ -872,7 +872,7 @@ export default class AdaApi {
 
         return {
           txHash: Buffer.from(
-            WasmModule.WalletV4.hash_transaction(signedTx.body()).to_bytes()
+            Scope.WalletV4.hash_transaction(signedTx.body()).to_bytes()
           ).toString('hex'),
           encodedTx: signedTx.to_bytes(),
         }
@@ -1287,9 +1287,9 @@ export default class AdaApi {
       policyId: string, assetId: string,
     |} {
       const { script, assetName } = mintEntry;
-      const policyId = RustModule.WasmScope(WasmModule => {
+      const policyId = RustModule.WasmScope(Scope => {
         return bytesToHex(
-          WasmModule.WalletV4.NativeScript
+          Scope.WalletV4.NativeScript
             .from_bytes(hexToBytes(script))
             .hash()
             .to_bytes()
@@ -1300,9 +1300,9 @@ export default class AdaApi {
       return { policyId, assetId };
     }
 
-    RustModule.WasmScope(WasmModule => {
+    RustModule.WasmScope(Scope => {
       for (const outputHex of (includeOutputs ?? [])) {
-        const output = WasmModule.WalletV4.TransactionOutput.from_bytes(hexToBytes(outputHex))
+        const output = Scope.WalletV4.TransactionOutput.from_bytes(hexToBytes(outputHex))
         const newOutput = {
           address: bytesToHex(output.address().to_bytes()),
           amount: multiTokenFromCardanoValue(output.amount(), defaultToken),
@@ -1382,9 +1382,9 @@ export default class AdaApi {
           throw new Error(`Value is required for a valid tx output, got: ${JSON.stringify(target)}`);
         }
       } else {
-        RustModule.WasmScope(WasmModule => {
+        RustModule.WasmScope(Scope => {
           // ensureRequiredMinimalValue is true
-          const minAmount = WasmModule.WalletV4.min_ada_required(
+          const minAmount = Scope.WalletV4.min_ada_required(
             cardanoValueFromMultiToken(amount),
             dataHash != null,
             protocolParams.coinsPerUtxoWord,
@@ -2544,7 +2544,11 @@ function getDifferenceAfterTx(
   stakingKey: RustModule.WalletV4.PublicKey,
   defaultToken: DefaultTokenEntry,
 ): MultiToken {
-  const stakeCredential = RustModule.WalletV4.StakeCredential.from_keyhash(stakingKey.hash());
+
+  const accountKeyString = RustModule.WasmScope(Scope => {
+    const stakeCredential = Scope.WalletV4.StakeCredential.from_keyhash(stakingKey.hash());
+    return Buffer.from(stakeCredential.to_bytes()).toString('hex')
+  })
 
   const sumInForKey = new MultiToken([], defaultToken);
   {
@@ -2560,7 +2564,7 @@ function getDifferenceAfterTx(
         throw new Error(`${nameof(getDifferenceAfterTx)} utxo not found. Should not happen`);
       }
       const address = match.address;
-      if (addrContainsAccountKey(address, stakeCredential, true)) {
+      if (addrContainsAccountKey(address, accountKeyString, true)) {
         sumInForKey.joinAddMutable(new MultiToken(
           match.output.tokens.map(token => ({
             identifier: token.Token.Identifier,
@@ -2580,7 +2584,7 @@ function getDifferenceAfterTx(
     for (let i = 0; i < outputs.len(); i++) {
       const output = outputs.get(i);
       const address = Buffer.from(output.address().to_bytes()).toString('hex');
-      if (addrContainsAccountKey(address, stakeCredential, true)) {
+      if (addrContainsAccountKey(address, accountKeyString, true)) {
         sumOutForKey.joinAddMutable(multiTokenFromCardanoValue(output.amount(), defaultToken));
       }
     }

packages/yoroi-extension/app/api/ada/lib/cardanoCrypto/catalyst.test.js

@@ -8,59 +8,62 @@ beforeAll(async () => {
 });
 
 test('Generate Catalyst registration tx', async () => {
-  const stakePrivateKey = RustModule.WalletV4.PrivateKey.from_normal_bytes(
-    Buffer.from('f5beaeff7932a4164d270afde7716067582412e8977e67986cd9b456fc082e3a', 'hex')
-  );
-  const catalystPrivateKey = RustModule.WalletV4.PrivateKey.from_extended_bytes(
-    Buffer.from('4820f7ce221e177c8eae2b2ee5c1f1581a0d88ca5c14329d8f2389e77a465655c27662621bfb99cb9445bf8114cc2a630afd2dd53bc88c08c5f2aed8e9c7cb89', 'hex')
-  );
+  RustModule.WasmScope(Scope => {
+    const stakePrivateKey = Scope.WalletV4.PrivateKey.from_normal_bytes(
+      Buffer.from('f5beaeff7932a4164d270afde7716067582412e8977e67986cd9b456fc082e3a', 'hex')
+    );
+    const catalystPrivateKey = Scope.WalletV4.PrivateKey.from_extended_bytes(
+      Buffer.from('4820f7ce221e177c8eae2b2ee5c1f1581a0d88ca5c14329d8f2389e77a465655c27662621bfb99cb9445bf8114cc2a630afd2dd53bc88c08c5f2aed8e9c7cb89', 'hex')
+    );
 
-  // eslint-disable-next-line max-len
-  // stake_test1uzhr5zn6akj2affzua8ylcm8t872spuf5cf6tzjrvnmwemcehgcjm (e0ae3a0a7aeda4aea522e74e4fe36759fca80789a613a58a4364f6ecef)
-  const address = RustModule.WalletV4.RewardAddress.new(
-    RustModule.WalletV4.NetworkInfo.testnet().network_id(),
-    RustModule.WalletV4.StakeCredential.from_keyhash(stakePrivateKey.to_public().hash()),
-  );
+    // eslint-disable-next-line max-len
+    // stake_test1uzhr5zn6akj2affzua8ylcm8t872spuf5cf6tzjrvnmwemcehgcjm (e0ae3a0a7aeda4aea522e74e4fe36759fca80789a613a58a4364f6ecef)
+    const address = Scope.WalletV4.RewardAddress.new(
+      Scope.WalletV4.NetworkInfo.testnet().network_id(),
+      Scope.WalletV4.StakeCredential.from_keyhash(stakePrivateKey.to_public().hash()),
+    );
 
-  const nonce = 1234;
-  const metadata = generateRegistration({
-    stakePrivateKey,
-    catalystPrivateKey,
-    receiverAddress: Buffer.from(address.to_address().to_bytes()),
-    slotNumber: nonce,
-  });
-  const result = RustModule.WalletV4.GeneralTransactionMetadata.from_bytes(
-    RustModule.WalletV4.MetadataList.from_bytes(metadata.to_bytes()).get(0).to_bytes()
-  );
+    const nonce = 1234;
+    const metadata = generateRegistration({
+      stakePrivateKey,
+      catalystPrivateKey,
+      receiverAddress: Buffer.from(address.to_address().to_bytes()),
+      slotNumber: nonce,
+    });
+
+    const result = Scope.WalletV4.GeneralTransactionMetadata.from_bytes(
+      Scope.WalletV4.MetadataList.from_bytes(metadata.to_bytes()).get(0).to_bytes()
+    );
 
-  const data = result.get(RustModule.WalletV4.BigNum.from_str(CatalystLabels.DATA.toString()));
-  if (data == null) throw new Error('Should never happen');
+    const data = result.get(Scope.WalletV4.BigNum.from_str(CatalystLabels.DATA.toString()));
+    if (data == null) throw new Error('Should never happen');
 
-  const sig = result.get(RustModule.WalletV4.BigNum.from_str(CatalystLabels.SIG.toString()));
-  if (sig == null) throw new Error('Should never happen');
+    const sig = result.get(Scope.WalletV4.BigNum.from_str(CatalystLabels.SIG.toString()));
+    if (sig == null) throw new Error('Should never happen');
 
-  const dataJson = RustModule.WalletV4.decode_metadatum_to_json_str(
-    data,
-    RustModule.WalletV4.MetadataJsonSchema.BasicConversions
-  );
-  const sigJson = RustModule.WalletV4.decode_metadatum_to_json_str(
-    sig,
-    RustModule.WalletV4.MetadataJsonSchema.BasicConversions
-  );
+    const dataJson = Scope.WalletV4.decode_metadatum_to_json_str(
+      data,
+      Scope.WalletV4.MetadataJsonSchema.BasicConversions
+    );
+    const sigJson = Scope.WalletV4.decode_metadatum_to_json_str(
+      sig,
+      Scope.WalletV4.MetadataJsonSchema.BasicConversions
+    );
 
-  const expectedResult = {
-    '61284': {
-      '1': '0x0036ef3e1f0d3f5989e2d155ea54bdb2a72c4c456ccb959af4c94868f473f5a0',
-      '2': '0x86870efc99c453a873a16492ce87738ec79a0ebd064379a62e2c9cf4e119219e',
-      '3': '0xe0ae3a0a7aeda4aea522e74e4fe36759fca80789a613a58a4364f6ecef',
-      '4': nonce,
-    },
-    '61285': {
-      '1': '0x6c2312cd49067ecf0920df7e067199c55b3faef4ec0bce1bd2cfb99793972478c45876af2bc271ac759c5ce40ace5a398b9fdb0e359f3c333fe856648804780e'
-    }
-  };
-  expect({
-    [CatalystLabels.DATA]: JSON.parse(dataJson),
-    [CatalystLabels.SIG]: JSON.parse(sigJson),
-  }).toEqual(expectedResult);
+    const expectedResult = {
+      '61284': {
+        '1': '0x0036ef3e1f0d3f5989e2d155ea54bdb2a72c4c456ccb959af4c94868f473f5a0',
+        '2': '0x86870efc99c453a873a16492ce87738ec79a0ebd064379a62e2c9cf4e119219e',
+        '3': '0xe0ae3a0a7aeda4aea522e74e4fe36759fca80789a613a58a4364f6ecef',
+        '4': nonce,
+      },
+      '61285': {
+        '1': '0x6c2312cd49067ecf0920df7e067199c55b3faef4ec0bce1bd2cfb99793972478c45876af2bc271ac759c5ce40ace5a398b9fdb0e359f3c333fe856648804780e'
+      }
+    };
+    expect({
+      [CatalystLabels.DATA]: JSON.parse(dataJson),
+      [CatalystLabels.SIG]: JSON.parse(sigJson),
+    }).toEqual(expectedResult);
+  });
 });

packages/yoroi-extension/app/api/ada/lib/cardanoCrypto/cryptoWallet.js

@@ -113,6 +113,5 @@ export function generatePrivateKeyForCatalyst(): RustModule.WalletV4.Bip32Privat
     Buffer.from(bip39entropy, 'hex'),
     EMPTY_PASSWORD
   );
-
   return rootKey;
 }

packages/yoroi-extension/app/api/ada/lib/cardanoCrypto/paperWallet.js

@@ -69,13 +69,18 @@ export const unscramblePaperAdaMnemonic = (
         const entropy = mnemonicToEntropy(
           scrambledMnemonics.join(' ')
         );
-        const newEntropy = RustModule.WalletV2.paper_wallet_unscramble(
-          Buffer.from(entropy, 'hex'),
-          password
-        );
+
+        const mnemonics = RustModule.WasmScope(Scope => {
+          const newEntropy = Scope.WalletV2.paper_wallet_unscramble(
+            Buffer.from(entropy, 'hex'),
+            password || ''
+          );
+
+          return newEntropy.to_english_mnemonics();
+        });
 
         return [
-          newEntropy.to_english_mnemonics(),
+          mnemonics,
           config.wallets.DAEDALUS_RECOVERY_PHRASE_WORD_COUNT
         ];
       } catch (e) {
@@ -91,12 +96,17 @@ export const unscramblePaperAdaMnemonic = (
       }
       try {
         const entropy = mnemonicToEntropy(phrase);
-        const newEntropy = RustModule.WalletV2.paper_wallet_unscramble(
-          Buffer.from(entropy, 'hex'),
-          password
-        );
+        const mnemonics = RustModule.WasmScope(Scope => {
+          const newEntropy = Scope.WalletV2.paper_wallet_unscramble(
+            Buffer.from(entropy, 'hex'),
+            password || ''
+          );
+
+          return newEntropy.to_english_mnemonics();
+        });
+
         return [
-          newEntropy.to_english_mnemonics(),
+          mnemonics,
           config.wallets.WALLET_RECOVERY_PHRASE_WORD_COUNT
         ];
       } catch (e) {
@@ -114,7 +124,10 @@ export const scramblePaperAdaMnemonic = (
   password: string,
 ): string => {
   const salt = new Uint8Array(Buffer.from(cryptoRandomString({ length: 2 * 8 }), 'hex'));
-  const entropy = RustModule.WalletV2.Entropy.from_english_mnemonics(phrase);
-  const bytes = RustModule.WalletV2.paper_wallet_scramble(entropy, salt, password);
-  return entropyToMnemonic(Buffer.from(bytes), wordlists.ENGLISH);
+  const entropy = RustModule.WasmScope(Scope => {
+    const walletEntropy = Scope.WalletV2.Entropy.from_english_mnemonics(phrase);
+    const bytes = Scope.WalletV2.paper_wallet_scramble(walletEntropy, salt, password);
+    return Buffer.from(bytes)
+  });
+  return entropyToMnemonic(entropy, wordlists.ENGLISH);
 };

packages/yoroi-extension/app/api/ada/lib/cardanoCrypto/plate.js

@@ -29,16 +29,19 @@ export const generateByronPlate = (
   const plate = legacyWalletChecksum(
     Buffer.from(accountPublic.as_bytes()).toString('hex')
   );
-  const generateAddressFunc = v2genAddressBatchFunc(
-    RustModule.WalletV2.Bip44ChainPublic.new(
-      RustModule.WalletV2.PublicKey.from_hex(
-        Buffer.from(chainKey.as_bytes()).toString('hex')
+
+  const addresses = RustModule.WasmScope(Scope => {
+    const generateAddressFunc = v2genAddressBatchFunc(
+      Scope.WalletV2.Bip44ChainPublic.new(
+        Scope.WalletV2.PublicKey.from_hex(
+          Buffer.from(chainKey.as_bytes()).toString('hex')
+        ),
+        Scope.WalletV2.DerivationScheme.v2()
       ),
-      RustModule.WalletV2.DerivationScheme.v2()
-    ),
-    byronNetworkMagic
-  );
-  const addresses = generateAddressFunc([...Array(count).keys()]);
+      byronNetworkMagic
+    );
+    return generateAddressFunc([...Array(count).keys()]);
+  });
   return { addresses, plate };
 };
 

packages/yoroi-extension/app/api/ada/lib/cardanoCrypto/rustLoader.js

@@ -324,5 +324,5 @@ class Module {
   }
 }
 
-// need this otherwise Wallet's flow type isn't properly exported
+// Need this otherwise Wallet's flow type isn't properly exported
 export const RustModule: Module = new Module();