starknet 3.9.0 → 3.10.0

package/__tests__/accountContract.test.ts

@@ -1,4 +1,11 @@
 import { Contract, defaultProvider, ec, hash, number, stark } from '../src';
+import { StarknetChainId } from '../src/constants';
+import {
+  calculcateTransactionHash,
+  getSelectorFromName,
+  transactionVersion,
+} from '../src/utils/hash';
+import { fromCallsToExecuteCalldataWithNonce } from '../src/utils/transaction';
 import { compiledArgentAccount, compiledErc20 } from './fixtures';
 
 describe('getStarkAccountFromPrivateKey()', () => {
@@ -20,6 +27,41 @@ describe('getStarkAccountFromPrivateKey()', () => {
   });
 });
 
+test('build tx', async () => {
+  const privateKey = '0x1B69B4BE052FAB1';
+  const keyPair = ec.getKeyPair(privateKey);
+  const address = ec.getStarkKey(keyPair);
+
+  expect(address).toBe('0x04024999b9574cb7623679ce049a609db62a95098982c5b28ac61abdebd1c82b');
+
+  const selector = hash.getSelectorFromName('transfer');
+
+  expect(selector).toMatchInlineSnapshot();
+
+  const calls = [{ contractAddress: '1', entrypoint: 'transfer', calldata: ['6', '7'] }];
+  const calldata = fromCallsToExecuteCalldataWithNonce(calls, 0);
+
+  const msgHash = calculcateTransactionHash(
+    address,
+    transactionVersion,
+    getSelectorFromName('__execute__'),
+    calldata,
+    0,
+    StarknetChainId.TESTNET
+  );
+  expect(number.toBN(msgHash).toString()).toMatchInlineSnapshot(
+    `"235855380881994314533025886817815774848495061484535023348790852315407085619"`
+  );
+
+  const [r, s] = ec.sign(keyPair, msgHash);
+  expect(r.toString()).toMatchInlineSnapshot(
+    `"181489288548431284937202760565682158657883789985879744111612429574110648095"`
+  );
+  expect(s.toString()).toMatchInlineSnapshot(
+    `"2055384802167699202203509702082340762385659879831017273872106910763470114538"`
+  );
+});
+
 describe('deploy and test Wallet', () => {
   const privateKey = stark.randomAddress();
 
@@ -64,35 +106,3 @@ describe('deploy and test Wallet', () => {
     expect(res).toStrictEqual(number.toBN(1000));
   });
 });
-
-test('build tx', async () => {
-  const privateKey = '0x1B69B4BE052FAB1';
-  const keyPair = ec.getKeyPair(privateKey);
-  const address = ec.getStarkKey(keyPair);
-
-  expect(address).toBe('0x04024999b9574cb7623679ce049a609db62a95098982c5b28ac61abdebd1c82b');
-
-  const selector = hash.getSelectorFromName('transfer');
-
-  expect(selector).toBe(
-    number.toHex(
-      number.toBN('232670485425082704932579856502088130646006032362877466777181098476241604910')
-    )
-  );
-
-  const calls = [{ contractAddress: '1', entrypoint: 'transfer', calldata: ['6', '7'] }];
-  const msgHash = hash.hashMulticall(address, calls, '0', '0');
-  expect(number.toBN(msgHash).toString()).toStrictEqual(
-    number
-      .toBN('533725737276146993132325070982049323585915612981489962412873515411469143806')
-      .toString()
-  );
-
-  const [r, s] = ec.sign(keyPair, msgHash);
-  expect(r.toString()).toBe(
-    '3081830197073374427897814075820860503521735760640862828374253887454357679197'
-  );
-  expect(s.toString()).toBe(
-    '384293936273611705317490990661155378189310283917528660618713929845936492551'
-  );
-});

package/__tests__/contract.test.ts

@@ -4,8 +4,12 @@ import { Account, Contract, ContractFactory, Provider, defaultProvider, ec, star
 import { getSelectorFromName } from '../src/utils/hash';
 import { BigNumberish, toBN } from '../src/utils/number';
 import { compileCalldata } from '../src/utils/stark';
-import { ACCOUNT_ADDRESS, PRIVATE_KEY } from './constancts';
-import { compiledErc20, compiledMulticall, compiledTypeTransformation } from './fixtures';
+import {
+  compiledArgentAccount,
+  compiledErc20,
+  compiledMulticall,
+  compiledTypeTransformation,
+} from './fixtures';
 
 describe('class Contract {}', () => {
   const wallet = stark.randomAddress();
@@ -204,21 +208,29 @@ describe('class Contract {}', () => {
   });
 
   describe('Contract interaction with Account', () => {
-    const starkKeyPair = ec.getKeyPair(PRIVATE_KEY);
     let account: Account;
     let erc20: Contract;
     let erc20Address: string;
 
     beforeAll(async () => {
-      account = new Account(defaultProvider, ACCOUNT_ADDRESS, starkKeyPair);
+      const starkKeyPair = ec.genKeyPair();
+      const starkKeyPub = ec.getStarkKey(starkKeyPair);
+      const { address } = await defaultProvider.deployContract({
+        contract: compiledArgentAccount,
+        addressSalt: starkKeyPub,
+      });
+      expect(address).toBeDefined();
+      account = new Account(defaultProvider, address, starkKeyPair);
+      const accountContract = new Contract(compiledArgentAccount.abi, address);
+      await accountContract.initialize(starkKeyPub, '0');
 
       const erc20Response = await defaultProvider.deployContract({
         contract: compiledErc20,
       });
       erc20Address = erc20Response.address;
       erc20 = new Contract(compiledErc20.abi, erc20Address, defaultProvider);
-      await defaultProvider.waitForTransaction(erc20Response.transaction_hash);
       expect(erc20Response.code).toBe('TRANSACTION_RECEIVED');
+      await defaultProvider.waitForTransaction(erc20Response.transaction_hash);
 
       const mintResponse = await erc20.mint(account.address, '1000');
 
@@ -251,7 +263,9 @@ describe('class Contract {}', () => {
     });
 
     test('invoke contract by wallet owner', async () => {
-      const { transaction_hash, code } = await erc20.transfer(toBN(erc20Address).toString(), 10);
+      const { transaction_hash, code } = await erc20.transfer(erc20Address, 10, {
+        maxFee: 0,
+      });
       expect(code).toBe('TRANSACTION_RECEIVED');
       await defaultProvider.waitForTransaction(transaction_hash);
       const { res } = await erc20.balance_of(account.address);