Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import { CONFIGS } from '../../config';
import { InMemorySpendingKey, InMemoryViewingKey, SaplingToolkit, SaplingTransactionViewer } from '@taquito/sapling';
import BigNumber from 'bignumber.js';
import { singleSaplingStateContractJProtocol } from '../../data/single_sapling_state_contract_jakarta_michelson';
import * as bip39 from 'bip39';
import * as bip39 from '@scure/bip39';
import { wordlist } from '@scure/bip39/wordlists/english.js';

CONFIGS().forEach(({ lib, rpc, setup }) => {
const Tezos = lib;
Expand Down Expand Up @@ -45,14 +46,14 @@ CONFIGS().forEach(({ lib, rpc, setup }) => {
await saplingContractOrigination.confirmation();
saplingContract = await saplingContractOrigination.contract();

const mnemonic1: string = bip39.generateMnemonic();
const mnemonic1: string = bip39.generateMnemonic(wordlist);
inMemorySpendingKey1 = await InMemorySpendingKey.fromMnemonic(mnemonic1);
inMemoryViewingKey1 = await inMemorySpendingKey1.getSaplingViewingKeyProvider();
saplingToolkit1 = new SaplingToolkit({ saplingSigner: inMemorySpendingKey1 }, { contractAddress: saplingContract.address, memoSize }, new RpcReadAdapter(Tezos.rpc));
txViewer1 = await saplingToolkit1.getSaplingTransactionViewer();
paymentAddress1Index0 = (await inMemoryViewingKey1.getAddress(0)).address;

const mnemonic2: string = bip39.generateMnemonic();
const mnemonic2: string = bip39.generateMnemonic(wordlist);
inMemorySpendingKey2 = await InMemorySpendingKey.fromMnemonic(mnemonic2);
inMemoryViewingKey2 = await inMemorySpendingKey2.getSaplingViewingKeyProvider();
saplingToolkit2 = new SaplingToolkit({ saplingSigner: inMemorySpendingKey2 }, { contractAddress: saplingContract.address, memoSize }, new RpcReadAdapter(Tezos.rpc));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import { CONFIGS } from '../../config';
import { InMemorySpendingKey, SaplingToolkit } from '@taquito/sapling';
import BigNumber from 'bignumber.js';
import { singleSaplingStateContractJProtocol } from '../../data/single_sapling_state_contract_jakarta_michelson';
import * as bip39 from 'bip39';
import * as bip39 from '@scure/bip39';
import { wordlist } from '@scure/bip39/wordlists/english.js';

CONFIGS().forEach(({ lib, rpc, setup, createAddress }) => {
const Tezos = lib;
Expand All @@ -28,7 +29,7 @@ CONFIGS().forEach(({ lib, rpc, setup, createAddress }) => {
saplingContract = await saplingContractOrigination.contract();

// Generate a spending key and an InMemorySpendingKey instance for Bob using a mnemonic
const mnemonic: string = bip39.generateMnemonic();
const mnemonic: string = bip39.generateMnemonic(wordlist);
bobInmemorySpendingKey = await InMemorySpendingKey.fromMnemonic(mnemonic);

// Instantiate an InMemorySpendingKey from a spending key for Alice
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import { CONFIGS } from '../../config';
import { InMemorySpendingKey, SaplingToolkit, InMemoryProvingKey } from '@taquito/sapling';
import BigNumber from 'bignumber.js';
import { singleSaplingStateContractJProtocol } from '../../data/single_sapling_state_contract_jakarta_michelson';
import * as bip39 from 'bip39';
import * as bip39 from '@scure/bip39';
import { wordlist } from '@scure/bip39/wordlists/english.js';

CONFIGS().forEach(({ lib, rpc, setup }) => {
const Tezos = lib;
Expand All @@ -30,7 +31,7 @@ CONFIGS().forEach(({ lib, rpc, setup }) => {
saplingContract = await saplingContractOrigination.contract();

// Generate a spending key and an InMemorySpendingKey instance for Bob using a mnemonic
const mnemonic: string = bip39.generateMnemonic();
const mnemonic: string = bip39.generateMnemonic(wordlist);
bobInmemorySpendingKey = await InMemorySpendingKey.fromMnemonic(mnemonic);

// Instantiate an InMemorySpendingKey from a spending key for Alice
Expand Down
5 changes: 3 additions & 2 deletions integration-tests/__tests__/signer-mnemonic.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { InMemorySigner } from '@taquito/signer';
import { TezosToolkit } from '@taquito/taquito';
import { CONFIGS } from '../config';
import * as Bip39 from 'bip39';
import * as bip39 from '@scure/bip39';
import { wordlist } from '@scure/bip39/wordlists/english.js';

CONFIGS().forEach(({ lib, rpc, setup }) => {
let Funder: TezosToolkit;
Expand All @@ -14,7 +15,7 @@ CONFIGS().forEach(({ lib, rpc, setup }) => {
let funderPKH: string;

beforeAll(async () => {
mnemonic = Bip39.generateMnemonic();
mnemonic = bip39.generateMnemonic(wordlist);
Funder = lib;
await setup();

Expand Down
19 changes: 17 additions & 2 deletions integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,29 @@
"@taquito/tzip12": "^24.0.1",
"@taquito/tzip16": "^24.0.1",
"@taquito/utils": "^24.0.1",
"@scure/bip39": "^2.0.1",
"bignumber.js": "^9.1.2",
"bip39": "3.1.0",
"blakejs": "^1.2.1"
},
"private": true,
"jest": {
"transform": {
".(ts|tsx)": "ts-jest"
"^.+\\.(ts|tsx|js|mjs)$": [
"ts-jest",
{
"useESM": true,
"tsconfig": {
"esModuleInterop": true,
"allowJs": true
}
}
]
},
"transformIgnorePatterns": [
"/node_modules/(?!(@scure/bip39|@noble/hashes|@scure/base)/.*)"
],
"moduleNameMapper": {
"^@scure/bip39/wordlists/english.js$": "<rootDir>/../node_modules/@scure/bip39/wordlists/english.js"
},
"testEnvironment": "node",
"testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
Expand Down
Loading
Loading