fix: update ws impl, add TEST_WS_URL, update token constants

Author: tabaktoni

__tests__/WebSocketChannel.test.ts

@@ -2,7 +2,7 @@ import { WebSocket } from 'isows';
 
 import { Provider, WSSubscriptions, WebSocketChannel } from '../src';
 import { StarknetChainId } from '../src/global/constants';
-import { getTestAccount, getTestProvider } from './config/fixtures';
+import { getTestAccount, getTestProvider, STRKtokenAddress, TEST_WS_URL } from './config/fixtures';
 
 const nodeUrl = 'wss://sepolia-pathfinder-rpc.spaceshard.io/rpc/v0_8';
 
@@ -15,7 +15,7 @@ describe('websocket specific endpoints - pathfinder test', () => {
   let webSocketChannel: WebSocketChannel;
 
   beforeAll(async () => {
-    webSocketChannel = new WebSocketChannel({ nodeUrl });
+    webSocketChannel = new WebSocketChannel({ nodeUrl: TEST_WS_URL });
     expect(webSocketChannel.isConnected()).toBe(false);
     try {
       await webSocketChannel.waitForConnection();
@@ -122,7 +122,7 @@ describe('websocket specific endpoints - pathfinder test', () => {
 
   test('Test subscribeTransactionStatus', async () => {
     const { transaction_hash } = await account.execute({
-      contractAddress: '0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d',
+      contractAddress: STRKtokenAddress,
       entrypoint: 'transfer',
       calldata: [account.address, '10', '0'],
     });
@@ -147,11 +147,8 @@ describe('websocket specific endpoints - pathfinder test', () => {
   });
 
   test('Test subscribeTransactionStatus and block_id', async () => {
-    const latestBlock = await account.getBlockLatestAccepted();
-    const blockId = latestBlock.block_number - 5;
-
     const { transaction_hash } = await account.execute({
-      contractAddress: '0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d',
+      contractAddress: STRKtokenAddress,
       entrypoint: 'transfer',
       calldata: [account.address, '10', '0'],
     });
@@ -167,7 +164,7 @@ describe('websocket specific endpoints - pathfinder test', () => {
       }
     };
 
-    const subid = await webSocketChannel.subscribeTransactionStatus(transaction_hash, blockId);
+    const subid = await webSocketChannel.subscribeTransactionStatus(transaction_hash);
     expect(subid).toEqual(expect.any(Number));
     const expectedId = webSocketChannel.subscriptions.get(WSSubscriptions.TRANSACTION_STATUS);
     const subscriptionId = await webSocketChannel.waitForUnsubscription(expectedId);

__tests__/account.outsideExecution.test.ts

@@ -23,10 +23,9 @@ import {
 } from '../src';
 import { getSelectorFromName } from '../src/utils/hash';
 import { getDecimalString } from '../src/utils/num';
-import { contracts, createTestProvider, getTestAccount } from './config/fixtures';
+import { contracts, createTestProvider, ETHtokenAddress, getTestAccount } from './config/fixtures';
 
 describe('Account and OutsideExecution', () => {
-  const ethAddress = '0x49D36570D4E46F48E99674BD3FCC84644DDD6B96F7C741B1562B82F9E004DC7';
   let provider: Provider;
   let executorAccount: Account;
   let signerAccount: Account;
@@ -40,7 +39,7 @@ describe('Account and OutsideExecution', () => {
     provider = new Provider(await createTestProvider());
     executorAccount = getTestAccount(provider);
     recipientAccount = executorAccount;
-    ethContract = new Contract(contracts.Erc20OZ.sierra.abi, ethAddress, provider);
+    ethContract = new Contract(contracts.Erc20OZ.sierra.abi, ETHtokenAddress, provider);
 
     // Deploy the SNIP-9 signer account (ArgentX v 0.4.0, using SNIP-9 v2):
     const calldataAX = new CallData(contracts.ArgentX4Account.sierra.abi);
@@ -61,7 +60,7 @@ describe('Account and OutsideExecution', () => {
 
     // Transfer dust of ETH token to the signer account
     const transferCall = {
-      contractAddress: ethAddress,
+      contractAddress: ETHtokenAddress,
       entrypoint: 'transfer',
       calldata: {
         recipient: signerAccount.address,
@@ -245,31 +244,31 @@ describe('Account and OutsideExecution', () => {
       caller: 'ANY_CALLER',
     };
     const call1: Call = {
-      contractAddress: ethAddress,
+      contractAddress: ETHtokenAddress,
       entrypoint: 'transfer',
       calldata: {
         recipient: recipientAccount.address,
         amount: cairo.uint256(100),
       },
     };
     const call2: Call = {
-      contractAddress: ethAddress,
+      contractAddress: ETHtokenAddress,
       entrypoint: 'transfer',
       calldata: {
         recipient: recipientAccount.address,
         amount: cairo.uint256(200),
       },
     };
     const call3: Call = {
-      contractAddress: ethAddress,
+      contractAddress: ETHtokenAddress,
       entrypoint: 'transfer',
       calldata: {
         recipient: recipientAccount.address,
         amount: cairo.uint256(300),
       },
     };
     const call4: Call = {
-      contractAddress: ethAddress,
+      contractAddress: ETHtokenAddress,
       entrypoint: 'transfer',
       calldata: {
         recipient: recipientAccount.address,
@@ -293,7 +292,7 @@ describe('Account and OutsideExecution', () => {
     expect(outsideTransaction1.outsideExecution.execute_before).toBe(hour_later);
     expect(outsideTransaction1.outsideExecution.calls).toEqual([
       {
-        to: ethAddress,
+        to: ETHtokenAddress,
         selector: '0x83afd3f4caedc6eebf44246fe54e38c95e3179a5ec9ea81740eca5b482d12e',
         calldata: [getDecimalString(recipientAccount.address), '300', '0'],
       },
@@ -305,12 +304,12 @@ describe('Account and OutsideExecution', () => {
     );
     expect(outsideTransaction2.outsideExecution.calls).toEqual([
       {
-        to: ethAddress,
+        to: ETHtokenAddress,
         selector: '0x83afd3f4caedc6eebf44246fe54e38c95e3179a5ec9ea81740eca5b482d12e',
         calldata: [getDecimalString(recipientAccount.address), '100', '0'],
       },
       {
-        to: ethAddress,
+        to: ETHtokenAddress,
         selector: '0x83afd3f4caedc6eebf44246fe54e38c95e3179a5ec9ea81740eca5b482d12e',
         calldata: [getDecimalString(recipientAccount.address), '200', '0'],
       },

__tests__/config/fixtures.ts

@@ -131,6 +131,7 @@ export async function createTestProvider(
 }
 
 export const TEST_TX_VERSION = process.env.TX_VERSION as SupportedTransactionVersion;
+export const { TEST_WS_URL } = process.env;
 
 export const getTestAccount = (
   provider: ProviderInterface,
@@ -182,9 +183,7 @@ export const describeIfDevnet = describeIf(process.env.IS_DEVNET === 'true');
 export const describeIfTestnet = describeIf(process.env.IS_TESTNET === 'true');
 export const erc20ClassHash = '0x54328a1075b8820eb43caf0caa233923148c983742402dcfc38541dd843d01a';
 export const wrongClassHash = '0x000000000000000000000000000000000000000000000000000000000000000';
-export const devnetETHtokenAddress =
-  '0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7';
-export const devnetSTRKtokenAddress =
+export const ETHtokenAddress = '0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7';
+export const STRKtokenAddress =
   '0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d';
-export const devnetFeeTokenAddress =
-  TEST_TX_VERSION === '0x3' ? devnetSTRKtokenAddress : devnetETHtokenAddress;
+export const devnetFeeTokenAddress = TEST_TX_VERSION === '0x3' ? STRKtokenAddress : ETHtokenAddress;

__tests__/config/helpers/strategyResolver.ts

@@ -87,6 +87,7 @@ class StrategyResolver {
       TEST_ACCOUNT_PRIVATE_KEY: '****',
       INITIAL_BALANCE: process.env.INITIAL_BALANCE,
       TEST_RPC_URL: process.env.TEST_RPC_URL,
+      TEST_WS_URL: process.env.TEST_WS_URL,
       TX_VERSION: process.env.TX_VERSION,
       SPEC_VERSION: process.env.SPEC_VERSION,
     });

__tests__/rpcProvider.test.ts

@@ -27,7 +27,7 @@ import {
   describeIfNotDevnet,
   describeIfRpc,
   describeIfTestnet,
-  devnetETHtokenAddress,
+  ETHtokenAddress,
   getTestAccount,
   waitNextBlock,
 } from './config/fixtures';
@@ -290,7 +290,7 @@ describeIfRpc('RPCProvider', () => {
     beforeAll(async () => {
       // add a Tx to be sure to have at least one Tx in the last block
       const { transaction_hash } = await account.execute({
-        contractAddress: devnetETHtokenAddress,
+        contractAddress: ETHtokenAddress,
         entrypoint: 'transfer',
         calldata: {
           recipient: account.address,

__tests__/utils/ethSigner.test.ts

@@ -24,8 +24,9 @@ import {
   contracts,
   createTestProvider,
   describeIfDevnet,
-  devnetETHtokenAddress,
+  ETHtokenAddress,
   getTestAccount,
+  STRKtokenAddress,
 } from '../config/fixtures';
 
 describe('Ethereum signer', () => {
@@ -150,7 +151,7 @@ describe('Ethereum signer', () => {
         await ethAccount.estimateAccountDeployFee(deployPayload);
       // fund account with ETH
       const { transaction_hash } = await account.execute({
-        contractAddress: devnetETHtokenAddress,
+        contractAddress: ETHtokenAddress,
         entrypoint: 'transfer',
         calldata: {
           recipient: contractETHAccountAddress,
@@ -168,7 +169,7 @@ describe('Ethereum signer', () => {
     });
 
     test('ETH account transaction V2', async () => {
-      const ethContract2 = new Contract(contracts.Erc20.abi, devnetETHtokenAddress, ethAccount);
+      const ethContract2 = new Contract(contracts.Erc20.abi, ETHtokenAddress, ethAccount);
       const respTransfer = await ethContract2
         .withOptions({ maxFee: 1 * 10 ** 16 })
         .transfer(account.address, cairo.uint256(1 * 10 ** 4));
@@ -203,8 +204,6 @@ describe('Ethereum signer', () => {
     let provider: Provider;
     let account: Account;
     let ethAccount: Account;
-    const devnetSTRKtokenAddress =
-      '0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d';
 
     beforeAll(async () => {
       provider = new Provider(await createTestProvider());
@@ -250,7 +249,7 @@ describe('Ethereum signer', () => {
       });
       // fund account with STRK
       const { transaction_hash } = await account.execute({
-        contractAddress: devnetSTRKtokenAddress,
+        contractAddress: STRKtokenAddress,
         entrypoint: 'transfer',
         calldata: {
           recipient: contractETHAccountAddress,
@@ -281,7 +280,7 @@ describe('Ethereum signer', () => {
     });
 
     test('ETH account transaction V3', async () => {
-      const strkContract2 = new Contract(contracts.Erc20.abi, devnetSTRKtokenAddress, ethAccount);
+      const strkContract2 = new Contract(contracts.Erc20.abi, STRKtokenAddress, ethAccount);
       const txCallData = strkContract2.populate('transfer', [
         account.address,
         cairo.uint256(1 * 10 ** 4),

__tests__/utils/utils.test.ts

@@ -1,6 +1,7 @@
 import * as starkCurve from '@scure/starknet';
 
 import { constants, ec, hash, num, stark, units } from '../../src';
+import { ETHtokenAddress } from '../config/fixtures';
 
 const { IS_BROWSER } = constants;
 
@@ -103,19 +104,18 @@ describe('estimatedFeeToMaxFee()', () => {
 });
 
 describe('calculateContractAddressFromHash()', () => {
-  const ethAddress = '0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7';
   const daiAddress = '0x03e85bfbb8e2a42b7bead9e88e9a1b19dbccf661471061807292120462396ec9';
   const factoryAddress = '0x249827618A01858A72B7D04339C47195A324D20D6037033DFE2829F98AFF4FC';
   const classHash = '0x55187E68C60664A947048E0C9E5322F9BF55F7D435ECDCF17ED75724E77368F';
   // Any type of salt can be used. It depends on the dApp what kind of salt it wants to use.
-  const salt = ec.starkCurve.pedersen(ethAddress, daiAddress);
+  const salt = ec.starkCurve.pedersen(ETHtokenAddress, daiAddress);
 
   // This test just shows how to use calculateContractAddressFromHash for new devs
   test('calculated contract address should match the snapshot', () => {
     const res = hash.calculateContractAddressFromHash(
       salt,
       classHash,
-      [ethAddress, daiAddress, factoryAddress],
+      [ETHtokenAddress, daiAddress, factoryAddress],
       factoryAddress
     );
 
@@ -130,7 +130,7 @@ describe('calculateContractAddressFromHash()', () => {
     const res = hash.calculateContractAddressFromHash(
       salt,
       classHash,
-      [ethAddress, daiAddress, factoryAddress],
+      [ETHtokenAddress, daiAddress, factoryAddress],
       factoryAddress
     );
     expect(starkCurveSpy).toHaveBeenCalled();

src/channel/ws_0_8.ts

@@ -505,12 +505,9 @@ export class WebSocketChannel {
   /**
    * subscribe to transaction status
    */
-  public async subscribeTransactionStatus(
-    transactionHash: BigNumberish,
-    blockIdentifier?: SubscriptionBlockIdentifier
-  ) {
+  public async subscribeTransactionStatus(transactionHash: BigNumberish) {
     if (this.subscriptions.get(WSSubscriptions.TRANSACTION_STATUS)) return false;
-    const subId = await this.subscribeTransactionStatusUnmanaged(transactionHash, blockIdentifier);
+    const subId = await this.subscribeTransactionStatusUnmanaged(transactionHash);
     this.subscriptions.set(WSSubscriptions.TRANSACTION_STATUS, subId);
     return subId;
   }