1
1
import { AcalaEvmTX , parseTransaction , serializeTransaction , signTransaction } from '@acala-network/eth-transactions' ;
2
2
import { BigNumber } from '@ethersproject/bignumber' ;
3
3
import { Contract } from '@ethersproject/contracts' ;
4
- import { EvmRpcProvider } from '../../rpc-provider' ;
5
4
import { Interface , parseUnits } from 'ethers/lib/utils' ;
6
5
import { Wallet } from '@ethersproject/wallet' ;
7
6
import { afterAll , beforeAll , describe , expect , it } from 'vitest' ;
8
- import { calcEthereumTransactionParams , sendTx , sleep } from '../../utils' ;
9
- import { computeDefaultSubstrateAddress } from '../../utils/address' ;
10
7
import { createTestPairs } from '@polkadot/keyring/testingPairs' ;
11
8
import ACAABI from '@acala-network/contracts/build/contracts/Token.json' ;
12
9
import ADDRESS from '@acala-network/contracts/utils/MandalaAddress' ;
13
10
import dotenv from 'dotenv' ;
11
+
12
+ import { EvmRpcProvider } from '../../rpc-provider' ;
13
+ import { calcEthereumTransactionParams , sendTx , sleep } from '../../utils' ;
14
+ import { computeDefaultSubstrateAddress } from '../../utils/address' ;
14
15
import evmAccounts from '../evmAccounts' ;
15
- import type { UInt } from '@polkadot/types' ;
16
16
17
17
dotenv . config ( ) ;
18
18
@@ -38,8 +38,8 @@ describe('transaction tests', () => {
38
38
await provider . isReady ( ) ;
39
39
40
40
chainId = await provider . chainId ( ) ;
41
- storageByteDeposit = ( provider . api . consts . evm . storageDepositPerByte as UInt ) . toBigInt ( ) ;
42
- txFeePerGas = ( provider . api . consts . evm . txFeePerGas as UInt ) . toBigInt ( ) ;
41
+ storageByteDeposit = provider . api . consts . evm . storageDepositPerByte . toBigInt ( ) ;
42
+ txFeePerGas = provider . api . consts . evm . txFeePerGas . toBigInt ( ) ;
43
43
44
44
( { txGasLimit, txGasPrice } = calcEthereumTransactionParams ( {
45
45
gasLimit : 2100001n ,
@@ -167,7 +167,7 @@ describe('transaction tests', () => {
167
167
...partialDeployTx ,
168
168
type : 0 ,
169
169
} ) ;
170
- const receipt = await response . wait ( 0 ) ;
170
+ const receipt = await response . wait ( ) ;
171
171
172
172
expect ( receipt . type ) . equal ( 0 ) ;
173
173
expect ( receipt . status ) . equal ( 1 ) ;
@@ -195,7 +195,7 @@ describe('transaction tests', () => {
195
195
expect ( parsedTx . maxFeePerGas ) . equal ( undefined ) ;
196
196
197
197
const response = await provider . sendTransaction ( rawTx ) ;
198
- const receipt = await response . wait ( 0 ) ;
198
+ const receipt = await response . wait ( ) ;
199
199
200
200
expect ( receipt . type ) . equal ( 0 ) ; // TODO: should be null, need to fix getPartialTransactionReceipt
201
201
expect ( receipt . status ) . equal ( 1 ) ;
@@ -283,7 +283,7 @@ describe('transaction tests', () => {
283
283
const acaContract = new Contract ( ADDRESS . ACA , ACAABI . abi , wallet1 ) ;
284
284
const iface = new Interface ( ACAABI . abi ) ;
285
285
const queryBalance = async ( addr : string ) : Promise < BigNumber > => acaContract . balanceOf ( addr ) ;
286
- const transferAmount = parseUnits ( '100 ' , ACADigits ) ;
286
+ const transferAmount = parseUnits ( '1.243 ' , ACADigits ) ;
287
287
let partialTransferTX : any ;
288
288
289
289
beforeAll ( ( ) => {
@@ -302,24 +302,6 @@ describe('transaction tests', () => {
302
302
expect ( computeDefaultSubstrateAddress ( account2 . evmAddress ) ) . to . equal ( account2 . defaultSubstrateAddress ) ;
303
303
} ) ;
304
304
305
- describe ( 'with provider' , ( ) => {
306
- it ( 'has correct balance after transfer' , async ( ) => {
307
- const pairs = createTestPairs ( ) ;
308
- const alice = pairs . alice ;
309
-
310
- const oneAca = 10n ** BigInt ( ACADigits ) ;
311
- const amount = 1000n * oneAca ;
312
- const balance = await queryBalance ( account1 . evmAddress ) ;
313
-
314
- const extrinsic = provider . api . tx . balances . transfer ( account1 . defaultSubstrateAddress , amount ) ;
315
- await extrinsic . signAsync ( alice ) ;
316
- await sendTx ( provider . api , extrinsic ) ;
317
-
318
- const _balance = await queryBalance ( account1 . evmAddress ) ;
319
- expect ( _balance . sub ( balance ) . toBigInt ( ) ) . equal ( amount ) ;
320
- } ) ;
321
- } ) ;
322
-
323
305
describe ( 'with legacy EIP-155 signature' , ( ) => {
324
306
it ( 'has correct balance after transfer' , async ( ) => {
325
307
const _balance1 = await queryBalance ( account1 . evmAddress ) ;
@@ -334,7 +316,7 @@ describe('transaction tests', () => {
334
316
const _parsedTx = parseTransaction ( rawTx ) ;
335
317
336
318
const response = await provider . sendTransaction ( rawTx ) ;
337
- const _receipt = await response . wait ( 0 ) ;
319
+ const _receipt = await response . wait ( ) ;
338
320
339
321
const __balance1 = await queryBalance ( account1 . evmAddress ) ;
340
322
const _balance2 = await queryBalance ( account2 . evmAddress ) ;
0 commit comments