Skip to content

Commit 531246c

Browse files
JuaniRiosJuaniRios
committed
WETH integration test
1 parent dea4de5 commit 531246c

20 files changed

+406
-219
lines changed

‎integration-tests/chopsticks/README.md

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ To install dependencies:
66
bun install
77
```
88

9+
```bash
10+
bun papi
11+
```
12+
913
To start the chains:
1014

1115
```bash

‎integration-tests/chopsticks/bun.lockb

100644100755
File mode changed.

‎integration-tests/chopsticks/overrides/polimec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { INITIAL_BALANCES } from '@/constants';
2-
import { Accounts, Assets } from '@/types';
2+
import { Accounts, Asset } from '@/types';
33

44
export const POLIMEC_WASM =
55
'../../target/release/wbuild/polimec-runtime/polimec_runtime.compact.compressed.wasm';
@@ -21,19 +21,19 @@ export const polimec_storage = {
2121
ForeignAssets: {
2222
Account: [
2323
[
24-
[Assets.USDC, Accounts.BOB],
24+
[Asset.USDC, Accounts.BOB],
2525
{
2626
balance: INITIAL_BALANCES.USDC,
2727
},
2828
],
2929
[
30-
[Assets.USDT, Accounts.BOB],
30+
[Asset.USDT, Accounts.BOB],
3131
{
3232
balance: INITIAL_BALANCES.USDT,
3333
},
3434
],
3535
[
36-
[Assets.DOT, Accounts.BOB],
36+
[Asset.DOT, Accounts.BOB],
3737
{
3838
balance: INITIAL_BALANCES.DOT,
3939
},

‎integration-tests/chopsticks/overrides/polkadot-hub.ts

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { INITIAL_BALANCES } from '@/constants';
2-
import { Accounts, Assets } from '@/types';
2+
import { Accounts, Asset } from '@/types';
33

44
export const polkadot_hub_storage = {
55
System: {
@@ -18,24 +18,17 @@ export const polkadot_hub_storage = {
1818
Assets: {
1919
Account: [
2020
[
21-
[Assets.USDT, Accounts.ALICE],
21+
[Asset.USDT, Accounts.ALICE],
2222
{
2323
balance: INITIAL_BALANCES.USDT,
2424
},
2525
],
2626
[
27-
[Assets.USDC, Accounts.ALICE],
27+
[Asset.USDC, Accounts.ALICE],
2828
{
2929
balance: INITIAL_BALANCES.USDC,
3030
},
3131
],
32-
[
33-
[Assets.UNKNOWN, Accounts.ALICE],
34-
{
35-
balance: INITIAL_BALANCES.USDT,
36-
},
37-
],
3832
],
3933
},
40-
// TODO: Add the foreignAssets storage to give to ALICE WETH = INITIAL_BALANCES.WETH
4134
} as const;

‎integration-tests/chopsticks/src/managers/BaseManager.ts

+28-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
import { DERIVE_PATHS } from '@/constants';
2-
import type { Accounts, ChainClient, ChainToDefinition, Chains } from '@/types';
2+
import {
3+
type Accounts,
4+
type Asset,
5+
AssetLocation,
6+
type AssetSourceRelation,
7+
type ChainClient,
8+
type ChainToDefinition,
9+
Chains,
10+
} from '@/types';
311
import { sr25519CreateDerive } from '@polkadot-labs/hdkd';
412
import { DEV_PHRASE, entropyToMiniSecret, mnemonicToEntropy } from '@polkadot-labs/hdkd-helpers';
513
import type { PolkadotSigner, TypedApi } from 'polkadot-api';
@@ -67,19 +75,32 @@ export abstract class BaseChainManager {
6775
return events[0]?.payload.actual_fee || 0n;
6876
}
6977

70-
async getNativeBalanceOf(account: Accounts) {
71-
const api = this.getApi(this.getChainType());
72-
const balance = await api.query.System.Account.getValue(account);
73-
return balance.data.free;
78+
// Make sure to override this in the other managers
79+
abstract getAssetSourceRelation(asset: Asset): AssetSourceRelation | undefined;
80+
81+
async getAssetBalanceOf(account: Accounts, asset: Asset): Promise<bigint> {
82+
const chain = this.getChainType();
83+
const api = this.getApi(chain);
84+
const asset_source_relation = this.getAssetSourceRelation(asset);
85+
const asset_location = AssetLocation(asset, asset_source_relation);
86+
const account_balances_result = await api.apis.FungiblesApi.query_account_balances(account);
87+
88+
if (account_balances_result.success === true && account_balances_result.value.type === 'V4') {
89+
const assets = account_balances_result.value.value;
90+
for (const asset of assets) {
91+
if (asset.id === asset_location && asset.fun.type === 'Fungible') {
92+
return asset.fun.value;
93+
}
94+
}
95+
}
96+
return 0n;
7497
}
7598

7699
// @ts-expect-error - TODO: Not sure which is the correct type for this
77100
abstract getXcmPallet();
78101

79102
abstract getChainType(): Chains;
80103

81-
abstract getAssetBalanceOf(account: Accounts, asset: number): Promise<bigint>;
82-
83104
abstract connect(): void;
84105

85106
abstract disconnect(): void;

‎integration-tests/chopsticks/src/managers/PolimecManager.ts

+28-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { type Accounts, type Assets, Chains } from '@/types';
1+
import { type Accounts, Asset, AssetLocation, AssetSourceRelation, Chains } from '@/types';
22
import { polimec } from '@polkadot-api/descriptors';
33
import { createClient } from 'polkadot-api';
44
import { getWsProvider } from 'polkadot-api/ws-provider/web';
@@ -34,10 +34,34 @@ export class PolimecManager extends BaseChainManager {
3434
return '58kXueYKLr5b8yCeY3Gd1nLQX2zSJLXjfMzTAuksNq25CFEL' as Accounts;
3535
}
3636

37-
async getAssetBalanceOf(account: Accounts, asset: Assets) {
37+
getAssetSourceRelation(asset: Asset): AssetSourceRelation | undefined {
38+
switch (asset) {
39+
case Asset.DOT:
40+
return AssetSourceRelation.Parent;
41+
case Asset.USDT:
42+
return AssetSourceRelation.Sibling;
43+
case Asset.USDC:
44+
return AssetSourceRelation.Sibling;
45+
case Asset.WETH:
46+
return undefined;
47+
}
48+
}
49+
50+
async getAssetBalanceOf(account: Accounts, asset: Asset): Promise<bigint> {
3851
const api = this.getApi(Chains.Polimec);
39-
const balance = await api.query.ForeignAssets.Account.getValue(asset, account);
40-
return balance?.balance || 0n;
52+
const asset_source_relation = this.getAssetSourceRelation(asset);
53+
const asset_location = AssetLocation(asset, asset_source_relation);
54+
const account_balances_result = await api.apis.FungiblesApi.query_account_balances(account);
55+
56+
if (account_balances_result.success === true && account_balances_result.value.type === 'V4') {
57+
const assets = account_balances_result.value.value;
58+
for (const asset of assets) {
59+
if (asset.id === asset_location && asset.fun.type === 'Fungible') {
60+
return asset.fun.value;
61+
}
62+
}
63+
}
64+
return 0n;
4165
}
4266

4367
async getXcmFee() {

‎integration-tests/chopsticks/src/managers/PolkadotHubManager.ts

+27-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { type Accounts, type Assets, Chains } from '@/types';
1+
import { type Accounts, Asset, AssetLocation, AssetSourceRelation, Chains } from '@/types';
22
import { pah } from '@polkadot-api/descriptors';
33
import { createClient } from 'polkadot-api';
44
import { getWsProvider } from 'polkadot-api/ws-provider/web';
@@ -30,12 +30,34 @@ export class PolkadotHubManager extends BaseChainManager {
3030
return api.tx.PolkadotXcm;
3131
}
3232

33-
async getAssetBalanceOf(account: Accounts, asset: Assets) {
34-
const api = this.getApi(Chains.PolkadotHub);
35-
const balance = await api.query.Assets.Account.getValue(asset, account);
36-
return balance?.balance || 0n;
33+
getAssetSourceRelation(asset: Asset): AssetSourceRelation | undefined {
34+
switch (asset) {
35+
case Asset.DOT:
36+
return AssetSourceRelation.Parent;
37+
case Asset.USDT:
38+
return AssetSourceRelation.Self;
39+
case Asset.USDC:
40+
return AssetSourceRelation.Self;
41+
case Asset.WETH:
42+
return undefined;
43+
}
3744
}
45+
async getAssetBalanceOf(account: Accounts, asset: Asset): Promise<bigint> {
46+
const api = this.getApi(Chains.PolkadotHub);
47+
const asset_source_relation = this.getAssetSourceRelation(asset);
48+
const asset_location = AssetLocation(asset, asset_source_relation);
49+
const account_balances_result = await api.apis.FungiblesApi.query_account_balances(account);
3850

51+
if (account_balances_result.success === true && account_balances_result.value.type === 'V4') {
52+
const assets = account_balances_result.value.value;
53+
for (const asset of assets) {
54+
if (asset.id === asset_location && asset.fun.type === 'Fungible') {
55+
return asset.fun.value;
56+
}
57+
}
58+
}
59+
return 0n;
60+
}
3961
async getSwapCredit() {
4062
const api = this.getApi(Chains.PolkadotHub);
4163
const events = await api.event.AssetConversion.SwapCreditExecuted.pull();

‎integration-tests/chopsticks/src/managers/PolkadotManager.ts

+22-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { type Accounts, Chains } from '@/types';
1+
import { type Accounts, Asset, AssetSourceRelation, Chains } from '@/types';
22
import { polkadot } from '@polkadot-api/descriptors';
33
import { createClient } from 'polkadot-api';
44
import { getWsProvider } from 'polkadot-api/ws-provider/web';
@@ -30,8 +30,27 @@ export class PolkadotManager extends BaseChainManager {
3030
return api.tx.XcmPallet;
3131
}
3232

33-
async getAssetBalanceOf(_account: Accounts, _asset: number): Promise<bigint> {
34-
throw new Error('Polkadot does not support assets');
33+
getAssetSourceRelation(asset: Asset): AssetSourceRelation | undefined {
34+
switch (asset) {
35+
case Asset.DOT:
36+
return AssetSourceRelation.Self;
37+
case Asset.USDT:
38+
return undefined;
39+
case Asset.USDC:
40+
return undefined;
41+
case Asset.WETH:
42+
return undefined;
43+
}
44+
}
45+
46+
async getAssetBalanceOf(account: Accounts, asset: Asset): Promise<bigint> {
47+
const api = this.getApi(this.getChainType());
48+
if (asset === Asset.DOT) {
49+
const balance = await api.query.System.Account.getValue(account);
50+
return balance.data.free;
51+
} else {
52+
return 0n
53+
}
3554
}
3655

3756
async getXcmFee() {

‎integration-tests/chopsticks/src/setup.ts

+1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ export class ChainSetup {
8080
'wasm-override': POLIMEC_WASM,
8181
'import-storage': polimec_storage,
8282
'build-block-mode': BuildBlockMode.Instant,
83+
'runtime-log-level': 3,
8384
});
8485
}
8586

‎integration-tests/chopsticks/src/tests/hub.test.ts

+37-27
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { TRANSFER_AMOUNTS } from '@/constants';
33
import { createChainManager } from '@/managers/Factory';
44
import { ChainSetup } from '@/setup';
55
import { HubToPolimecTransfer } from '@/transfers/HubToPolimec';
6-
import { Accounts, Assets, Chains } from '@/types';
6+
import { Accounts, Asset, AssetSourceRelation, Chains } from '@/types';
77

88
describe('Polkadot Hub -> Polimec Transfer Tests', () => {
99
const sourceManager = createChainManager(Chains.PolkadotHub);
@@ -18,33 +18,43 @@ describe('Polkadot Hub -> Polimec Transfer Tests', () => {
1818
});
1919
afterAll(async () => await chainSetup.cleanup());
2020

21-
test('Send DOT to Polimec', () =>
22-
transferTest.testTransfer({
23-
amount: TRANSFER_AMOUNTS.NATIVE,
24-
account: Accounts.ALICE,
25-
asset: Assets.DOT,
26-
}));
27-
28-
test('Send USDt to Polimec', () =>
29-
transferTest.testTransfer({
30-
amount: TRANSFER_AMOUNTS.TOKENS,
31-
account: Accounts.ALICE,
32-
asset: Assets.USDT,
33-
}));
34-
35-
test('Send USDC to Polimec', () =>
36-
transferTest.testTransfer({
37-
amount: TRANSFER_AMOUNTS.TOKENS,
38-
account: Accounts.ALICE,
39-
asset: Assets.USDC,
40-
}));
41-
42-
test('Send Unknown Asset to Polimec', () =>
43-
expect(() =>
21+
test(
22+
'Send DOT to Polimec',
23+
() =>
4424
transferTest.testTransfer({
45-
amount: TRANSFER_AMOUNTS.TOKENS,
25+
amount: TRANSFER_AMOUNTS.NATIVE,
4626
account: Accounts.ALICE,
47-
asset: Assets.UNKNOWN,
27+
asset: Asset.DOT,
28+
assetSourceRelation: AssetSourceRelation.Parent,
4829
}),
49-
).toThrow());
30+
{ timeout: 25000 },
31+
);
32+
//
33+
// test('Send USDT to Polimec', () =>
34+
// transferTest.testTransfer({
35+
// amount: TRANSFER_AMOUNTS.TOKENS,
36+
// account: Accounts.ALICE,
37+
// asset: Asset.USDT,
38+
// assetSourceRelation: AssetSourceRelation.Self,
39+
// }), {timeout: 25000});
40+
//
41+
// test('Send USDC to Polimec', () =>
42+
// transferTest.testTransfer({
43+
// amount: TRANSFER_AMOUNTS.TOKENS,
44+
// account: Accounts.ALICE,
45+
// asset: Asset.USDC,
46+
// assetSourceRelation: AssetSourceRelation.Self,
47+
// }), {timeout: 25000});
48+
49+
// test(
50+
// 'Send WETH to Polimec',
51+
// () =>
52+
// transferTest.testTransfer({
53+
// amount: TRANSFER_AMOUNTS.BRIDGED,
54+
// account: Accounts.ALICE,
55+
// asset: Asset.WETH,
56+
// assetSourceRelation: undefined,
57+
// }),
58+
// { timeout: 25000 },
59+
// );
5060
});

0 commit comments

Comments
 (0)