Merge pull request #1360 from starknet-io/feat/drop-deprecated

feat: prune deprecated functionalities

Author: tabaktoni

__tests__/account.starknetId.test.ts

@@ -46,39 +46,36 @@ describe('deploy and test Wallet', () => {
     });
     multicallAddress = multicallResponse.deploy.contract_address;
 
-    const { transaction_hash } = await account.execute(
-      [
-        {
-          contractAddress: devnetERC20Address,
-          entrypoint: 'approve',
-          calldata: [namingAddress, 0, 1], // Price of domain
-        },
-        {
-          contractAddress: identityAddress,
-          entrypoint: 'mint',
-          calldata: ['1'], // TokenId
-        },
-        {
-          contractAddress: namingAddress,
-          entrypoint: 'buy',
-          calldata: [
-            '1', // Starknet id linked
-            '1499554868251', // Domain encoded "fricoben"
-            '62', // days
-            '0', // resolver
-            0, // sponsor
-            0,
-            0,
-          ],
-        },
-        {
-          contractAddress: identityAddress,
-          entrypoint: 'set_main_id',
-          calldata: ['1'],
-        },
-      ],
-      undefined
-    );
+    const { transaction_hash } = await account.execute([
+      {
+        contractAddress: devnetERC20Address,
+        entrypoint: 'approve',
+        calldata: [namingAddress, 0, 1], // Price of domain
+      },
+      {
+        contractAddress: identityAddress,
+        entrypoint: 'mint',
+        calldata: ['1'], // TokenId
+      },
+      {
+        contractAddress: namingAddress,
+        entrypoint: 'buy',
+        calldata: [
+          '1', // Starknet id linked
+          '1499554868251', // Domain encoded "fricoben"
+          '62', // days
+          '0', // resolver
+          0, // sponsor
+          0,
+          0,
+        ],
+      },
+      {
+        contractAddress: identityAddress,
+        entrypoint: 'set_main_id',
+        calldata: ['1'],
+      },
+    ]);
 
     await provider.waitForTransaction(transaction_hash);
   });
@@ -102,21 +99,18 @@ describe('deploy and test Wallet', () => {
   describe('Test getStarkProfile', () => {
     beforeAll(async () => {
       // Add verifier data
-      const { transaction_hash: transaction_hash_verifier } = await account.execute(
-        [
-          {
-            contractAddress: identityAddress,
-            entrypoint: 'set_verifier_data',
-            calldata: [
-              '1', // token_id
-              shortString.encodeShortString('discord'), // field
-              123, // value
-              0,
-            ],
-          },
-        ],
-        undefined
-      );
+      const { transaction_hash: transaction_hash_verifier } = await account.execute([
+        {
+          contractAddress: identityAddress,
+          entrypoint: 'set_verifier_data',
+          calldata: [
+            '1', // token_id
+            shortString.encodeShortString('discord'), // field
+            123, // value
+            0,
+          ],
+        },
+      ]);
       await provider.waitForTransaction(transaction_hash_verifier);
     });
 

__tests__/account.test.ts

@@ -7,7 +7,6 @@ import {
   DeclareDeployUDCResponse,
   Provider,
   ProviderInterface,
-  RpcError,
   TransactionType,
   cairo,
   constants,
@@ -363,29 +362,6 @@ describe('deploy and test Wallet', () => {
     expect(balance.low).toStrictEqual(toBigInt(990));
   });
 
-  test('execute with and without deprecated abis parameter', async () => {
-    const transaction = {
-      contractAddress: erc20Address,
-      entrypoint: 'transfer',
-      calldata: [erc20.address, '10', '0'],
-    };
-    const details: Parameters<(typeof account)['execute']>[2] = { nonce: 0 };
-
-    let error1: RpcError | undefined;
-    // eslint-disable-next-line no-return-assign
-    await account.execute(transaction, details).catch((e) => (error1 = e));
-    expect(error1).toBeDefined();
-    expect(error1).toBeInstanceOf(RpcError);
-    expect(error1!.isType('TRANSACTION_EXECUTION_ERROR')).toBe(true);
-
-    let error2: RpcError | undefined;
-    // eslint-disable-next-line no-return-assign
-    await account.execute(transaction, undefined, details).catch((e) => (error2 = e));
-    expect(error2).toBeDefined();
-    expect(error2).toBeInstanceOf(RpcError);
-    expect(error2!.isType('TRANSACTION_EXECUTION_ERROR')).toBe(true);
-  });
-
   test('execute with custom nonce', async () => {
     const result = await account.getNonce();
     const nonce = toBigInt(result);
@@ -395,7 +371,6 @@ describe('deploy and test Wallet', () => {
         entrypoint: 'transfer',
         calldata: [account.address, '10', '0'],
       },
-      undefined,
       { nonce }
     );
 
@@ -433,14 +408,14 @@ describe('deploy and test Wallet', () => {
       const r2 = toBigInt(r) + 123n;
 
       const signature2 = new Signature(toBigInt(r2.toString()), toBigInt(s));
-
       if (!signature2) return;
 
-      const verifMessageResponse: boolean = await account.verifyMessage(
+      const verifyMessageResponse: boolean = await account.verifyMessageInStarknet(
         typedDataExample,
-        signature2
+        signature2,
+        account.address
       );
-      expect(verifMessageResponse).toBe(false);
+      expect(verifyMessageResponse).toBe(false);
 
       const wrongAccount = new Account(
         provider,
@@ -449,14 +424,17 @@ describe('deploy and test Wallet', () => {
         undefined,
         TEST_TX_VERSION
       ); // non existing account
-      await expect(wrongAccount.verifyMessage(typedDataExample, signature2)).rejects.toThrow();
+      await expect(
+        wrongAccount.verifyMessageInStarknet(typedDataExample, signature2, wrongAccount.address)
+      ).rejects.toThrow();
     });
 
     test('sign and verify message', async () => {
       const signature = await account.signMessage(typedDataExample);
-      const verifMessageResponse: boolean = await account.verifyMessage(
+      const verifMessageResponse: boolean = await account.verifyMessageInStarknet(
         typedDataExample,
-        signature
+        signature,
+        account.address
       );
       expect(verifMessageResponse).toBe(true);
     });

__tests__/cairov24onward.test.ts

@@ -176,8 +176,8 @@ describe('Cairo v2.4 onwards', () => {
 
     test('Tuple ((u256,(u16,Order2)), u8)', async () => {
       type Order2 = {
-        p1: num.BigNumberish;
-        p2: num.BigNumberish[];
+        p1: BigNumberish;
+        p2: BigNumberish[];
       };
       const myOrder2: Order2 = { p1: 100, p2: [5, 6, 7] };
       const calldata9 = myCallData.compile('get_tuple9', {

__tests__/rpcProvider.test.ts

@@ -326,11 +326,6 @@ describeIfRpc('RPCProvider', () => {
       expect(transaction).toHaveProperty('transaction_hash');
     });
 
-    test('getPendingTransactions', async () => {
-      const transactions = await rpcProvider.getPendingTransactions();
-      expect(Array.isArray(transactions)).toBe(true);
-    });
-
     test('getSyncingStats', async () => {
       const syncingStats = await rpcProvider.getSyncingStats();
       expect(syncingStats).toMatchSchemaRef('GetSyncingStatsResponse');

__tests__/transactionReceipt.test.ts

@@ -33,7 +33,7 @@ describe('Transaction receipt utility - RPC 0.7 - V2', () => {
 
   test('test for Success variant', async () => {
     const myCall: Call = contract.populate('test_fail', { p1: 100 });
-    const res = await account.execute(myCall, undefined, { maxFee: 1 * 10 ** 15 }); // maxFee needed to not throw error in getEstimateFee
+    const res = await account.execute(myCall, { maxFee: 1 * 10 ** 15 }); // maxFee needed to not throw error in getEstimateFee
     const txR = await provider.waitForTransaction(res.transaction_hash);
     expect(txR.value).toHaveProperty('execution_status', TransactionExecutionStatus.SUCCEEDED);
     expect(txR.statusReceipt).toBe('success');
@@ -54,7 +54,7 @@ describe('Transaction receipt utility - RPC 0.7 - V2', () => {
 
   test('test for Reverted variant', async () => {
     const myCall: Call = contract.populate('test_fail', { p1: 10 }); // reverted if not 100
-    const res = await account.execute(myCall, undefined, { maxFee: 1 * 10 ** 15 }); // maxFee needed to not throw error in getEstimateFee
+    const res = await account.execute(myCall, { maxFee: 1 * 10 ** 15 }); // maxFee needed to not throw error in getEstimateFee
     const txR = await provider.waitForTransaction(res.transaction_hash);
     expect(txR.value).toHaveProperty('execution_status', TransactionExecutionStatus.REVERTED);
     expect(txR.statusReceipt).toBe('reverted');

__tests__/utils/ellipticalCurve.test.ts

@@ -2,7 +2,7 @@ import { constants, ec } from '../../src';
 import { StarknetChainId } from '../../src/global/constants';
 import { computeHashOnElements } from '../../src/utils/hash';
 import { calculateTransactionHash } from '../../src/utils/hash/transactionHash/v2';
-import { fromCallsToExecuteCalldataWithNonce } from '../../src/utils/transaction';
+import { fromCallsToExecuteCalldata } from '../../src/utils/transaction';
 
 test('getKeyPair()', () => {
   const privateKey = '0x019800ea6a9a73f94aee6a3d2edf018fc770443e90c7ba121e8303ec6b349279';
@@ -46,7 +46,7 @@ test('hashMessage()', () => {
   ];
   const nonce = '3';
   const maxFee = '0';
-  const calldata = fromCallsToExecuteCalldataWithNonce(transactions, nonce);
+  const calldata = [...fromCallsToExecuteCalldata(transactions), nonce];
 
   const hashMsg = calculateTransactionHash(
     account,

__tests__/utils/ethSigner.test.ts

@@ -286,7 +286,7 @@ describe('Ethereum signer', () => {
         cairo.uint256(1 * 10 ** 4),
       ]);
       const feeTransfer = await ethAccount.estimateInvokeFee(txCallData);
-      const respTransfer = await ethAccount.execute(txCallData, undefined, {
+      const respTransfer = await ethAccount.execute(txCallData, {
         resourceBounds: {
           l2_gas: { max_amount: '0x0', max_price_per_unit: '0x0' },
           l1_gas: {

__tests__/utils/merkle.test.ts

@@ -1,6 +1,6 @@
+import { BigNumberish } from '../../src';
 import { computePedersenHash, computePoseidonHash } from '../../src/utils/hash';
 import { MerkleTree, proofMerklePath } from '../../src/utils/merkle';
-import { BigNumberish } from '../../src/utils/num';
 
 type RawHashMethod = (a: BigNumberish, b: BigNumberish) => string;
 

__tests__/utils/transaction.test.ts

@@ -1,42 +1,5 @@
-import { Call, CallStruct } from '../../src/types';
-import {
-  fromCallsToExecuteCalldata_cairo1,
-  transformCallsToMulticallArrays_cairo1,
-} from '../../src/utils/transaction';
-
-describe('transformCallsToMulticallArrays_cairo1', () => {
-  it('should return an empty array when given an empty input', () => {
-    expect(transformCallsToMulticallArrays_cairo1([])).toEqual([]);
-  });
-
-  it('should transform a list of calls into an array of call structs', () => {
-    const calls: Call[] = [
-      {
-        contractAddress: '0x123',
-        entrypoint: 'transfer',
-        calldata: [10],
-      },
-      {
-        contractAddress: '0x456',
-        entrypoint: 'mint',
-        calldata: ['0x2000', BigInt(10000000)],
-      },
-    ];
-    const expected: CallStruct[] = [
-      {
-        to: '291',
-        selector: '232670485425082704932579856502088130646006032362877466777181098476241604910',
-        calldata: ['10'],
-      },
-      {
-        to: '1110',
-        selector: '1329909728320632088402217562277154056711815095720684343816173432540100887380',
-        calldata: ['8192', '10000000'],
-      },
-    ];
-    expect(transformCallsToMulticallArrays_cairo1(calls)).toEqual(expected);
-  });
-});
+import { Call } from '../../src/types';
+import { fromCallsToExecuteCalldata_cairo1 } from '../../src/utils/transaction';
 
 describe('fromCallsToExecuteCalldata_cairo1', () => {
   it('should return an array with a length of one when given an empty input', () => {

__tests__/utils/typedData.test.ts

@@ -12,6 +12,7 @@ import {
   Account,
   BigNumberish,
   StarknetDomain,
+  TypedDataRevision,
   num,
   stark,
   typedData,
@@ -22,7 +23,6 @@ import { PRIME } from '../../src/global/constants';
 import { getSelectorFromName } from '../../src/utils/hash';
 import { MerkleTree } from '../../src/utils/merkle';
 import {
-  TypedDataRevision,
   encodeType,
   encodeValue,
   getMessageHash,