@cardano-sdk/e2e 0.17.1 → 0.18.0

package/local-network/scripts/pools/update-node-utils.sh

@@ -67,22 +67,22 @@ updatePool()
   coldKey=network-files/pools/cold"${SP_NODE_ID}".skey
   vrfKey=network-files/pools/vrf"${SP_NODE_ID}".vkey
   delegatorPaymentKey=network-files/stake-delegator-keys/payment"${SP_NODE_ID}".vkey
-  delegatorStakingKey=network-files/stake-delegator-keys/staking"${SP_NODE_ID}".vkey
+  delegatorStakeKey=network-files/stake-delegator-keys/staking"${SP_NODE_ID}".vkey
   delegatorPaymentSKey=network-files/stake-delegator-keys/payment"${SP_NODE_ID}".skey
-  delegatorStakingSKey=network-files/stake-delegator-keys/staking"${SP_NODE_ID}".skey
+  delegatorStakeSKey=network-files/stake-delegator-keys/staking"${SP_NODE_ID}".skey
 
   POOL_ID=$(cardano-cli stake-pool id --cold-verification-key-file "$coldVKey" --output-format "hex")
 
   # funding pool owner stake address
-  stakingAddr=$(cardano-cli address build --payment-verification-key-file "$genesisVKey" --stake-verification-key-file "$stakeVKey" --testnet-magic 888)
-  currentBalance=$(getAddressBalance "$stakingAddr")
+  stakeAddr=$(cardano-cli address build --payment-verification-key-file "$genesisVKey" --stake-verification-key-file "$stakeVKey" --testnet-magic 888)
+  currentBalance=$(getAddressBalance "$stakeAddr")
   utxo=$(cardano-cli query utxo --address "$genesisAddr" --testnet-magic 888 | awk 'NR == 3 {printf("%s#%s", $1, $2)}')
 
   cardano-cli transaction build \
     --babbage-era \
     --change-address "$genesisAddr" \
     --tx-in "$utxo" \
-    --tx-out "$stakingAddr"+"$POOL_OWNER_STAKE" \
+    --tx-out "$stakeAddr"+"$POOL_OWNER_STAKE" \
     --testnet-magic 888 \
     --out-file wallets-tx.raw 2>&1
 
@@ -94,11 +94,11 @@ updatePool()
 
   cardano-cli transaction submit --testnet-magic 888 --tx-file wallets-tx.signed 2>&1
 
-  updatedBalance=$(getAddressBalance "$stakingAddr")
+  updatedBalance=$(getAddressBalance "$stakeAddr")
 
   while [ "$currentBalance" -eq "$updatedBalance" ]
   do
-    updatedBalance=$(getAddressBalance "$stakingAddr")
+    updatedBalance=$(getAddressBalance "$stakeAddr")
     sleep 1
   done
 
@@ -216,12 +216,12 @@ updatePool()
   # register delegator stake address
   echo "Registering delegator stake certificate ${SP_NODE_ID}..."
 
-  paymentAddr=$(cardano-cli address build --payment-verification-key-file "$delegatorPaymentKey" --stake-verification-key-file "$delegatorStakingKey" --testnet-magic 888)
+  paymentAddr=$(cardano-cli address build --payment-verification-key-file "$delegatorPaymentKey" --stake-verification-key-file "$delegatorStakeKey" --testnet-magic 888)
   currentBalance=$(getAddressBalance "$paymentAddr")
 
   # create pool delegation certificate
   cardano-cli stake-address delegation-certificate \
-      --stake-verification-key-file "$delegatorStakingKey" \
+      --stake-verification-key-file "$delegatorStakeKey" \
       --stake-pool-id "$POOL_ID" \
       --out-file deleg.cert
 
@@ -258,7 +258,7 @@ updatePool()
   cardano-cli transaction sign \
       --tx-body-file tx.raw \
       --signing-key-file "$delegatorPaymentSKey" \
-      --signing-key-file "$delegatorStakingSKey" \
+      --signing-key-file "$delegatorStakeSKey" \
       --testnet-magic 888 \
       --out-file tx.signed
 
@@ -384,21 +384,21 @@ deregisterPool()
   coldVKey=network-files/pools/cold"${SP_NODE_ID}".vkey
   coldKey=network-files/pools/cold"${SP_NODE_ID}".skey
   delegatorPaymentKey=network-files/stake-delegator-keys/payment"${SP_NODE_ID}".vkey
-  delegatorStakingKey=network-files/stake-delegator-keys/staking"${SP_NODE_ID}".vkey
+  delegatorStakeKey=network-files/stake-delegator-keys/staking"${SP_NODE_ID}".vkey
   delegatorPaymentSKey=network-files/stake-delegator-keys/payment"${SP_NODE_ID}".skey
-  delegatorStakingSKey=network-files/stake-delegator-keys/staking"${SP_NODE_ID}".skey
+  delegatorStakeSKey=network-files/stake-delegator-keys/staking"${SP_NODE_ID}".skey
 
   # We are going to redelegate this stake to dbSync can index it properly.
   echo "Registering delegator stake certificate ${SP_NODE_ID}..."
 
-  paymentAddr=$(cardano-cli address build --payment-verification-key-file "$delegatorPaymentKey" --stake-verification-key-file "$delegatorStakingKey" --testnet-magic 888)
+  paymentAddr=$(cardano-cli address build --payment-verification-key-file "$delegatorPaymentKey" --stake-verification-key-file "$delegatorStakeKey" --testnet-magic 888)
   currentBalance=$(getAddressBalance "$paymentAddr")
 
   POOL_ID=$(cardano-cli stake-pool id --cold-verification-key-file "$coldVKey" --output-format "hex")
 
   # create pool delegation certificate
   cardano-cli stake-address delegation-certificate \
-      --stake-verification-key-file "$delegatorStakingKey" \
+      --stake-verification-key-file "$delegatorStakeKey" \
       --stake-pool-id "$POOL_ID" \
       --out-file deleg.cert
 
@@ -435,7 +435,7 @@ deregisterPool()
   cardano-cli transaction sign \
       --tx-body-file tx.raw \
       --signing-key-file "$delegatorPaymentSKey" \
-      --signing-key-file "$delegatorStakingSKey" \
+      --signing-key-file "$delegatorStakeSKey" \
       --testnet-magic 888 \
       --out-file tx.signed
 

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@cardano-sdk/e2e",
-  "version": "0.17.1",
+  "version": "0.18.0",
   "description": "End to end tests for the cardano-js-sdk packages.",
   "engines": {
-    "node": ">=16.0"
+    "node": ">=16.20.1"
   },
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -81,19 +81,19 @@
   "dependencies": {
     "@cardano-foundation/ledgerjs-hw-app-cardano": "^6.0.0",
     "@cardano-ogmios/client": "5.6.0",
-    "@cardano-sdk/cardano-services": "~0.14.8",
-    "@cardano-sdk/cardano-services-client": "~0.10.6",
-    "@cardano-sdk/core": "~0.15.4",
-    "@cardano-sdk/crypto": "~0.1.9",
-    "@cardano-sdk/hardware-ledger": "~0.2.17",
-    "@cardano-sdk/input-selection": "~0.11.4",
-    "@cardano-sdk/key-management": "~0.8.2",
-    "@cardano-sdk/ogmios": "~0.12.13",
-    "@cardano-sdk/tx-construction": "~0.9.4",
-    "@cardano-sdk/util": "~0.13.0",
-    "@cardano-sdk/util-dev": "~0.13.9",
-    "@cardano-sdk/util-rxjs": "~0.5.5",
-    "@cardano-sdk/wallet": "~0.18.5",
+    "@cardano-sdk/cardano-services": "~0.15.0",
+    "@cardano-sdk/cardano-services-client": "~0.11.0",
+    "@cardano-sdk/core": "~0.16.0",
+    "@cardano-sdk/crypto": "~0.1.10",
+    "@cardano-sdk/hardware-ledger": "~0.3.0",
+    "@cardano-sdk/input-selection": "~0.11.5",
+    "@cardano-sdk/key-management": "~0.9.0",
+    "@cardano-sdk/ogmios": "~0.12.14",
+    "@cardano-sdk/tx-construction": "~0.10.0",
+    "@cardano-sdk/util": "~0.13.1",
+    "@cardano-sdk/util-dev": "~0.14.0",
+    "@cardano-sdk/util-rxjs": "~0.5.6",
+    "@cardano-sdk/wallet": "~0.19.0",
     "@vespaiach/axios-fetch-adapter": "^0.3.0",
     "axios": "^0.27.2",
     "bunyan": "^1.8.15",
@@ -122,10 +122,10 @@
     "@babel/core": "^7.18.2",
     "@babel/preset-env": "^7.18.2",
     "@babel/preset-typescript": "^7.17.12",
-    "@cardano-sdk/dapp-connector": "~0.9.11",
-    "@cardano-sdk/projection": "~0.6.17",
-    "@cardano-sdk/projection-typeorm": "~0.3.13",
-    "@cardano-sdk/web-extension": "~0.14.1",
+    "@cardano-sdk/dapp-connector": "~0.9.12",
+    "@cardano-sdk/projection": "~0.7.0",
+    "@cardano-sdk/projection-typeorm": "~0.4.0",
+    "@cardano-sdk/web-extension": "~0.14.2",
     "@dcspark/cardano-multiplatform-lib-browser": "^3.1.1",
     "@emurgo/cardano-message-signing-asmjs": "^1.0.1",
     "@types/bunyan": "^1.8.8",
@@ -177,5 +177,5 @@
     "webpack-cli": "^4.9.2",
     "webpack-merge": "^5.8.0"
   },
-  "gitHead": "9ee5e5d97ec63af2b5994d5fe9290a718a84b980"
+  "gitHead": "4308af6772b6761b0bcafa7d2c689cd9847a0bed"
 }

package/test/long-running/delegation-rewards.test.ts

@@ -1,4 +1,4 @@
-import { Cardano } from '@cardano-sdk/core';
+import { Cardano, StakePoolProvider } from '@cardano-sdk/core';
 import { PersonalWallet } from '@cardano-sdk/wallet';
 import {
   TestWallet,
@@ -16,6 +16,64 @@ import { waitForWalletStateSettle } from '../../../wallet/test/util';
 
 const env = getEnv(walletVariables);
 
+const submitDelegationTx = async (wallet: PersonalWallet, pools: Cardano.PoolId[]) => {
+  logger.info(`Creating delegation tx at epoch #${(await firstValueFrom(wallet.currentEpoch$)).epochNo}`);
+  const { tx: signedTx } = await wallet
+    .createTxBuilder()
+    .delegatePortfolio({
+      pools: pools.map((poolId) => ({ id: Cardano.PoolIdHex(Cardano.PoolId.toKeyHash(poolId)), weight: 1 }))
+    })
+    .build()
+    .sign();
+  await wallet.submitTx(signedTx);
+  const { epochNo } = await firstValueFrom(wallet.currentEpoch$);
+  logger.info(`Delegation tx ${signedTx.id} submitted at epoch #${epochNo}`);
+
+  return signedTx;
+};
+
+const generateTxs = async (sendingWallet: PersonalWallet, receivingWallet: PersonalWallet) => {
+  logger.info('Sending 100 txs to generate reward fees');
+
+  const tAdaToSend = 5_000_000n;
+  const [{ address: receivingAddress }] = await firstValueFrom(receivingWallet.addresses$);
+
+  for (let i = 0; i < 100; i++) {
+    const txBuilder = sendingWallet.createTxBuilder();
+    const txOut = await txBuilder.buildOutput().address(receivingAddress).coin(tAdaToSend).build();
+    const { tx: signedTx } = await txBuilder.addOutput(txOut).build().sign();
+    await sendingWallet.submitTx(signedTx);
+  }
+};
+
+const buildSpendRewardTx = async (sendingWallet: PersonalWallet, receivingWallet: PersonalWallet) => {
+  const tAdaToSend = 5_000_000n;
+  const [{ address: receivingAddress }] = await firstValueFrom(receivingWallet.addresses$);
+  const txBuilder = sendingWallet.createTxBuilder();
+  const txOut = await txBuilder.buildOutput().address(receivingAddress).coin(tAdaToSend).build();
+  const tx = txBuilder.addOutput(txOut).build();
+  const { body } = await tx.inspect();
+  logger.debug('Body of tx before sign');
+  logger.debug(body);
+  const { tx: signedTx } = await tx.sign();
+  logger.debug('Body of tx after sign');
+  logger.debug(signedTx.body);
+
+  return signedTx;
+};
+
+const getPoolIds = async (stakePoolProvider: StakePoolProvider, count: number) => {
+  const activePools = await stakePoolProvider.queryStakePools({
+    filters: { pledgeMet: true, status: [Cardano.StakePoolStatus.Active] },
+    pagination: { limit: count, startAt: 0 }
+  });
+  expect(activePools.totalResultCount).toBeGreaterThanOrEqual(count);
+  const poolIds = activePools.pageResults.map(({ id }) => id);
+  expect(poolIds.every((poolId) => poolId !== undefined)).toBeTruthy();
+  logger.info('Wallet funds will be staked to pools:', poolIds);
+  return poolIds;
+};
+
 describe('delegation rewards', () => {
   let providers: TestWallet['providers'];
   let wallet1: PersonalWallet;
@@ -51,64 +109,11 @@ describe('delegation rewards', () => {
     await initializeWallets();
 
     // Arrange
-    const activePools = await providers.stakePoolProvider.queryStakePools({
-      filters: { pledgeMet: true, status: [Cardano.StakePoolStatus.Active] },
-      pagination: { limit: 1, startAt: 0 }
-    });
-    expect(activePools.totalResultCount).toBeGreaterThan(0);
-    const poolId = activePools.pageResults[0].id;
-    expect(poolId).toBeDefined();
-    logger.info(`Wallet funds will be staked to pool ${poolId}.`);
-
-    const submitDelegationTx = async () => {
-      logger.info(`Creating delegation tx at epoch #${(await firstValueFrom(wallet1.currentEpoch$)).epochNo}`);
-      const { tx: signedTx } = await wallet1
-        .createTxBuilder()
-        .delegatePortfolio({
-          pools: [{ id: Cardano.PoolIdHex(Cardano.PoolId.toKeyHash(poolId)), weight: 1 }]
-        })
-        .build()
-        .sign();
-      await wallet1.submitTx(signedTx);
-      const { epochNo } = await firstValueFrom(wallet1.currentEpoch$);
-      logger.info(`Delegation tx ${signedTx.id} submitted at epoch #${epochNo}`);
-
-      return signedTx;
-    };
-
-    const generateTxs = async () => {
-      logger.info('Sending 100 txs to generate reward fees');
-
-      const tAdaToSend = 5_000_000n;
-      const [{ address: receivingAddress }] = await firstValueFrom(wallet2.addresses$);
-
-      for (let i = 0; i < 100; i++) {
-        const txBuilder = wallet1.createTxBuilder();
-        const txOut = await txBuilder.buildOutput().address(receivingAddress).coin(tAdaToSend).build();
-        const { tx: signedTx } = await txBuilder.addOutput(txOut).build().sign();
-        await wallet1.submitTx(signedTx);
-      }
-    };
-
-    const buildSpendRewardTx = async () => {
-      const tAdaToSend = 5_000_000n;
-      const [{ address: receivingAddress }] = await firstValueFrom(wallet2.addresses$);
-      const txBuilder = wallet1.createTxBuilder();
-      const txOut = await txBuilder.buildOutput().address(receivingAddress).coin(tAdaToSend).build();
-      const tx = await txBuilder.addOutput(txOut).build();
-      const { body } = await tx.inspect();
-      logger.debug('Body of tx before sign');
-      logger.debug(body);
-      const { tx: signedTx } = await tx.sign();
-      logger.debug('Body of tx after sign');
-      logger.debug(signedTx.body);
-
-      return signedTx;
-    };
+    const [poolId] = await getPoolIds(providers.stakePoolProvider, 1);
 
     // Stake and wait for reward
 
-    const signedTx = await submitDelegationTx();
+    const signedTx = await submitDelegationTx(wallet1, [poolId]);
 
     const delegationTxConfirmedAtEpoch = await getTxConfirmationEpoch(wallet1, signedTx);
 
@@ -116,7 +121,7 @@ describe('delegation rewards', () => {
 
     await waitForEpoch(wallet1, delegationTxConfirmedAtEpoch + 2);
 
-    await generateTxs();
+    await generateTxs(wallet1, wallet2);
     await waitForEpoch(wallet1, delegationTxConfirmedAtEpoch + 4);
 
     // Check reward
@@ -127,8 +132,49 @@ describe('delegation rewards', () => {
     logger.info(`Generated rewards: ${rewards} tLovelace`);
 
     // Spend reward
-    const spendRewardTx = await buildSpendRewardTx();
+    const spendRewardTx = await buildSpendRewardTx(wallet1, wallet2);
     expect(spendRewardTx.body.withdrawals?.length).toBeGreaterThan(0);
     await submitAndConfirm(wallet1, spendRewardTx);
   });
+
+  it('can spend rewards from multiple accounts', async () => {
+    if (!(await runningAgainstLocalNetwork())) {
+      return logger.fatal(
+        "Skipping test 'will receive rewards for delegated tADA' as it should only run with a fast test network"
+      );
+    }
+
+    // This has to be done inside the test (instead of beforeAll)
+    // so that it doesn't fail when running against non-local networks
+    await initializeWallets();
+
+    const [poolId1, poolId2] = await getPoolIds(providers.stakePoolProvider, 2);
+    const signedTx = await submitDelegationTx(wallet1, [poolId1, poolId2]);
+
+    const delegationTxConfirmedAtEpoch = await getTxConfirmationEpoch(wallet1, signedTx);
+
+    logger.info(`Delegation tx confirmed at epoch #${delegationTxConfirmedAtEpoch}`);
+
+    await waitForEpoch(wallet1, delegationTxConfirmedAtEpoch + 2);
+
+    await generateTxs(wallet1, wallet2);
+    await waitForEpoch(wallet1, delegationTxConfirmedAtEpoch + 4);
+
+    // Check reward
+    await waitForWalletStateSettle(wallet1);
+    const rewardsPerAcct = await firstValueFrom(wallet1.delegation.rewardAccounts$);
+    const rewards = await firstValueFrom(wallet1.balance.rewardAccounts.rewards$);
+
+    logger.info(`Generated rewards: ${rewards} tLovelace`);
+    logger.info('Generated rewards per account:', rewardsPerAcct);
+
+    expect(rewards).toBeGreaterThan(0n);
+
+    // Spend reward
+    const spendRewardTx = await buildSpendRewardTx(wallet1, wallet2);
+    logger.info('transaction Withdrawals', spendRewardTx.body.withdrawals);
+
+    expect(spendRewardTx.body.withdrawals?.length).toBeGreaterThanOrEqual(2);
+    await submitAndConfirm(wallet1, spendRewardTx);
+  });
 });

package/test/web-extension/extension/background/cip30.ts

@@ -8,7 +8,11 @@ import { wallet$ } from './walletManager';
 import { walletName } from '../const';
 
 // this should come from remote api
-const confirmationCallback: walletCip30.CallbackConfirmation = async () => true;
+const confirmationCallback: walletCip30.CallbackConfirmation = {
+  signData: async () => true,
+  signTx: async () => true,
+  submitTx: async () => true
+};
 
 const walletApi = walletCip30.createWalletApi(wallet$, confirmationCallback, { logger });
 cip30.initializeBackgroundScript({ walletName }, { authenticator, logger, runtime, walletApi });

package/test/web-extension/specs/wallet.spec.ts

@@ -37,7 +37,7 @@ describe('wallet', () => {
   const dappBtnRun = '#bp3-tab-panel_TabsExample_1 > div > button';
   const dappSubmittedTxConfirmation = '#root > div > p:last-child';
   const dappChangeAddress = '#root > div > p:nth-child(11)';
-  const dappStakingAddress = '#root > div > p:nth-child(12)';
+  const dappStakeAddress = '#root > div > p:nth-child(12)';
   const dappUsedAddress = '#root > div > p:nth-child(13)';
 
   const btnDelegate = '#multiDelegation .delegate button';
@@ -120,7 +120,7 @@ describe('wallet', () => {
 
       it('dapp gets correct addresses from cip30 wallet api', async () => {
         await expect($(dappChangeAddress)).toHaveTextContaining(walletAddr1);
-        await expect($(dappStakingAddress)).toHaveTextContaining(walletStakeAddr1);
+        await expect($(dappStakeAddress)).toHaveTextContaining(walletStakeAddr1);
         await expect($(dappUsedAddress)).toHaveTextContaining(walletAddr1);
       });
     });