Skip to content

Commit 129619f

Browse files
JuaniRioslrazovic
JuaniRios
authored and
lrazovic
committed
Replace WETH with ETH
1 parent c121786 commit 129619f

File tree

30 files changed

+106
-166
lines changed

30 files changed

+106
-166
lines changed

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

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,17 @@ const dot_location = {
2323
},
2424
};
2525

26-
export const weth_location = {
26+
export const eth_location = {
2727
parents: 2,
2828
interior: {
29-
x2: [
29+
x1: [
3030
{
3131
globalConsensus: {
3232
ethereum: {
3333
chainId: 1n,
3434
},
3535
},
3636
},
37-
{
38-
accountKey20: {
39-
key: WETH_ADDRESS,
40-
},
41-
},
4237
],
4338
},
4439
};
@@ -81,7 +76,7 @@ export const polimec_storage = {
8176
// Note: We can remove Asset and Metadata from the storage override as soon we set them on-chain.
8277
Asset: [
8378
[
84-
[weth_location],
79+
[eth_location],
8580
{
8681
owner: Accounts.ALICE,
8782
issuer: Accounts.ALICE,
@@ -98,8 +93,6 @@ export const polimec_storage = {
9893
},
9994
],
10095
],
101-
Metadata: [
102-
[[weth_location], { symbol: 'Wrapped Ether', name: 'WETH', decimals: 18, isFrozen: false }],
103-
],
96+
Metadata: [[[eth_location], { symbol: 'Ether', name: 'ETH', decimals: 18, isFrozen: false }]],
10497
},
10598
} as const;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { INITIAL_BALANCES } from '@/constants';
22
import { Accounts, Asset } from '@/types';
3-
import { weth_location } from './polimec';
3+
import { eth_location } from './polimec';
44

55
export const polkadot_hub_storage = {
66
System: {
@@ -35,7 +35,7 @@ export const polkadot_hub_storage = {
3535
ForeignAssets: {
3636
Account: [
3737
[
38-
[weth_location, Accounts.POLIMEC],
38+
[eth_location, Accounts.POLIMEC],
3939
{
4040
balance: INITIAL_BALANCES.WETH,
4141
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ export const DERIVE_PATHS = {
2323
export const WETH_ADDRESS = '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2';
2424
export const DEFAULT_TOPIC = FixedSizeBinary.fromArray(Array(32).fill(1));
2525
export const FEE_AMOUNT = 40_000_000_000n;
26-
export const WETH_AMOUNT = 15_000_000_000_000n;
26+
export const ETH_AMOUNT = 15_000_000_000_000n;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,12 @@ export class BridgerHubManagaer extends BaseChainManager {
4646
return AssetSourceRelation.Sibling;
4747
case Asset.USDC:
4848
return AssetSourceRelation.Sibling;
49-
case Asset.WETH:
49+
case Asset.ETH:
5050
// TODO: Check it Placeholder
5151
return AssetSourceRelation.Self;
5252
}
53+
54+
return AssetSourceRelation.Self;
5355
}
5456

5557
// Note: On BridgeHub, there should be no balance for any asset.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export class PolimecManager extends BaseChainManager {
4747
return AssetSourceRelation.Sibling;
4848
case Asset.USDC:
4949
return AssetSourceRelation.Sibling;
50-
case Asset.WETH:
50+
case Asset.ETH:
5151
// Placeholder
5252
return AssetSourceRelation.Self;
5353
case Asset.PLMC:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export class PolkadotHubManager extends BaseChainManager {
4343
return AssetSourceRelation.Self;
4444
case Asset.USDC:
4545
return AssetSourceRelation.Self;
46-
case Asset.WETH:
46+
case Asset.ETH:
4747
// This is not actually used, so we use Self as a placeholder
4848
return AssetSourceRelation.Self;
4949
case Asset.PLMC:

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,12 @@ export class PolkadotManager extends BaseChainManager {
4444
case Asset.USDC:
4545
// Placeholder
4646
return AssetSourceRelation.Self;
47-
case Asset.WETH:
47+
case Asset.ETH:
4848
// Placeholder
4949
return AssetSourceRelation.Self;
5050
}
51+
52+
return AssetSourceRelation.Self;
5153
}
5254

5355
async getAssetBalanceOf(account: Accounts, asset: Asset): Promise<bigint> {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ describe('Bridge Hub -> Polimec Transfer Tests', () => {
2222
afterAll(async () => await chainSetup.cleanup());
2323

2424
test(
25-
'Send WETH to Polimec',
25+
'Send ETH to Polimec',
2626
() =>
2727
transferTest.testTransfer({
2828
account: Accounts.ALICE,
29-
assets: [[Asset.WETH, TRANSFER_AMOUNTS.BRIDGED, AssetSourceRelation.Self]],
29+
assets: [[Asset.ETH, TRANSFER_AMOUNTS.BRIDGED, AssetSourceRelation.Self]],
3030
}),
31-
{ timeout: 25000 },
31+
{ timeout: 40000 },
3232
);
3333
});

‎integration-tests/chopsticks/src/transfers/BridgeToPolimec.ts

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expect } from 'bun:test';
2-
import { DEFAULT_TOPIC, FEE_AMOUNT, WETH_ADDRESS, WETH_AMOUNT } from '@/constants';
2+
import { DEFAULT_TOPIC, ETH_AMOUNT, FEE_AMOUNT, WETH_ADDRESS } from '@/constants';
33
import type { BridgerHubManagaer } from '@/managers/BridgeHubManager';
44
import type { PolimecManager } from '@/managers/PolimecManager';
55
import type { PolkadotHubManager } from '@/managers/PolkadotHubManager';
@@ -102,7 +102,10 @@ export class BridgeToPolimecTransfer extends BaseTransferTest {
102102
(event) => event.type === 'ForeignAssets' && event.value.type === 'Issued',
103103
);
104104

105-
// TODO: Check why we have 3 events instead of 2 (WETH + DOT). Curently we have 3 events (WETH + DOT + DOT)
105+
console.log('Issued Events on Destination: \n');
106+
console.dir(issuedEventsOnDest, { depth: null });
107+
108+
// TODO: Check why we have 3 events instead of 2 (ETH + DOT). Curently we have 3 events (ETH + DOT + DOT)
106109
expect(issuedEventsOnDest.length).toBe(3);
107110

108111
return { sourceBlock, destBlock };
@@ -147,15 +150,11 @@ export class BridgeToPolimecTransfer extends BaseTransferTest {
147150
{
148151
id: XcmV3MultiassetAssetId.Concrete({
149152
parents: 2,
150-
interior: XcmV3Junctions.X2([
153+
interior: XcmV3Junctions.X1(
151154
XcmV3Junction.GlobalConsensus(XcmV3JunctionNetworkId.Ethereum({ chain_id: 1n })),
152-
XcmV3Junction.AccountKey20({
153-
network: undefined,
154-
key: FixedSizeBinary.fromHex(WETH_ADDRESS),
155-
}),
156-
]),
155+
),
157156
}),
158-
fun: XcmV3MultiassetFungibility.Fungible(WETH_AMOUNT),
157+
fun: XcmV3MultiassetFungibility.Fungible(ETH_AMOUNT),
159158
},
160159
]),
161160

@@ -190,15 +189,11 @@ export class BridgeToPolimecTransfer extends BaseTransferTest {
190189
{
191190
id: XcmV3MultiassetAssetId.Concrete({
192191
parents: 2,
193-
interior: XcmV3Junctions.X2([
192+
interior: XcmV3Junctions.X1(
194193
XcmV3Junction.GlobalConsensus(XcmV3JunctionNetworkId.Ethereum({ chain_id: 1n })),
195-
XcmV3Junction.AccountKey20({
196-
network: undefined,
197-
key: FixedSizeBinary.fromHex(WETH_ADDRESS),
198-
}),
199-
]),
194+
),
200195
}),
201-
fun: XcmV3MultiassetFungibility.Fungible(WETH_AMOUNT),
196+
fun: XcmV3MultiassetFungibility.Fungible(ETH_AMOUNT),
202197
},
203198
]),
204199
dest: {
@@ -250,15 +245,11 @@ export class BridgeToPolimecTransfer extends BaseTransferTest {
250245
{
251246
id: XcmV3MultiassetAssetId.Concrete({
252247
parents: 2,
253-
interior: XcmV3Junctions.X2([
248+
interior: XcmV3Junctions.X1(
254249
XcmV3Junction.GlobalConsensus(XcmV3JunctionNetworkId.Ethereum({ chain_id: 1n })),
255-
XcmV3Junction.AccountKey20({
256-
network: undefined,
257-
key: FixedSizeBinary.fromHex(WETH_ADDRESS),
258-
}),
259-
]),
250+
),
260251
}),
261-
fun: XcmV3MultiassetFungibility.Fungible(WETH_AMOUNT),
252+
fun: XcmV3MultiassetFungibility.Fungible(ETH_AMOUNT),
262253
},
263254
]),
264255

‎integration-tests/chopsticks/src/transfers/PolimecToHub.ts

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -64,26 +64,6 @@ export class PolimecToHubTransfer extends BaseTransferTest {
6464
return { asset_balances: [{ source, destination }] };
6565
}
6666

67-
// verifyFinalBalances(
68-
// initialBalances: BalanceCheck[],
69-
// finalBalances: BalanceCheck[],
70-
// options: TransferOptions,
71-
// ) {
72-
// // TODO: At the moment we exclude fees from the balance check since the PAPI team is wotking on some utilies to calculate fees.
73-
// const initialBalance =
74-
// options.assets[0][0] === Asset.DOT
75-
// ? INITIAL_BALANCES.DOT
76-
// : options.assets[0][0] === Asset.USDT
77-
// ? INITIAL_BALANCES.USDT
78-
// : INITIAL_BALANCES.USDC;
79-
// for (let i = 0; i < options.assets.length; i++) {
80-
// expect(initialBalances[i].destination).toBe(0n);
81-
// expect(initialBalances[i].source).toBe(initialBalance);
82-
// expect(finalBalances[i].source).toBeLessThan(initialBalances[i].source);
83-
// expect(finalBalances[i].destination).toBeGreaterThan(initialBalances[i].destination);
84-
// }
85-
// }
86-
8767
async verifyFinalBalances(
8868
assetInitialBalances: PolimecBalanceCheck[],
8969
assetFinalBalances: PolimecBalanceCheck[],

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export enum Asset {
9696
DOT = 10,
9797
USDC = 1337,
9898
USDT = 1984,
99-
WETH = 10000,
99+
ETH = 10000,
100100
PLMC = 3344,
101101
}
102102

@@ -160,13 +160,12 @@ export function NativeAssetLocation(
160160
}
161161
}
162162

163-
export function EthereumAssetLocation(contract_address: FixedSizeBinary<20>): XcmVersionedLocation {
163+
export function EthereumLocation(): XcmVersionedLocation {
164164
return XcmVersionedLocation.V4({
165165
parents: 2,
166-
interior: XcmV3Junctions.X2([
166+
interior: XcmV3Junctions.X1(
167167
XcmV3Junction.GlobalConsensus(XcmV3JunctionNetworkId.Ethereum({ chain_id: 1n })),
168-
XcmV3Junction.AccountKey20({ network: undefined, key: contract_address }),
169-
]),
168+
),
170169
});
171170
}
172171

@@ -175,8 +174,8 @@ export function AssetLocation(
175174
assetSourceRelation: AssetSourceRelation,
176175
): XcmVersionedLocation {
177176
const baseLocation =
178-
asset === Asset.WETH
179-
? EthereumAssetLocation(FixedSizeBinary.fromHex(WETH_ADDRESS))
177+
asset === Asset.ETH
178+
? EthereumLocation()
180179
: asset === Asset.DOT || asset === Asset.PLMC
181180
? NativeAssetLocation(assetSourceRelation, asset)
182181
: AssetHubAssetLocation(BigInt(asset), assetSourceRelation);

‎integration-tests/src/constants.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ pub mod polimec {
318318
let usdc = (AcceptedFundingAsset::USDC.id(), prices.usdc);
319319
let usdt = (AcceptedFundingAsset::USDT.id(), prices.usdt);
320320
let plmc = (Location::here(), prices.plmc);
321-
let weth = (AcceptedFundingAsset::WETH.id(), prices.weth);
321+
let weth = (AcceptedFundingAsset::ETH.id(), prices.weth);
322322

323323
let values: BoundedVec<(Location, FixedU128), <PolimecRuntime as orml_oracle::Config>::MaxFeedValues> =
324324
vec![dot, usdc, usdt, plmc, weth].try_into().expect("benchmarks can panic");
@@ -356,7 +356,7 @@ pub mod polimec {
356356
let dot_asset_id = AcceptedFundingAsset::DOT.id();
357357
let usdt_asset_id = AcceptedFundingAsset::USDT.id();
358358
let usdc_asset_id = AcceptedFundingAsset::USDC.id();
359-
let weth_asset_id = AcceptedFundingAsset::WETH.id();
359+
let weth_asset_id = AcceptedFundingAsset::ETH.id();
360360

361361
let mut funded_accounts = vec![(
362362
PolimecNet::sovereign_account_id_of((Parent, xcm::prelude::Parachain(1000)).into()),

‎integration-tests/src/tests/defaults.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ use pallet_funding::{
2323

2424
use macros::generate_accounts;
2525
use polimec_common::{
26-
assets::AcceptedFundingAsset::{DOT, USDC, USDT, WETH},
27-
ProvideAssetPrice, USD_DECIMALS, USD_UNIT,
26+
assets::AcceptedFundingAsset::{DOT, USDC, USDT, ETH},
27+
ProvideAssetPrice, USD_DECIMALS, USD_UNIT,
2828
};
2929
use polimec_runtime::AccountId;
3030
use sp_runtime::traits::ConstU32;
@@ -71,7 +71,7 @@ pub fn default_project_metadata(issuer: AccountId) -> ProjectMetadataOf<polimec_
7171
retail: TicketSize::new(100 * USD_UNIT, None),
7272
phantom: Default::default(),
7373
},
74-
participation_currencies: vec![USDT, USDC, DOT, WETH].try_into().unwrap(),
74+
participation_currencies: vec![USDT, USDC, DOT, ETH].try_into().unwrap(),
7575
funding_destination_account: issuer,
7676
policy_ipfs_cid: Some(ipfs_hash()),
7777
participants_account_type: ParticipantsAccountType::Polkadot,

‎integration-tests/src/tests/evaluator_slash_sideffects.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,12 @@ fn evaluator_slash_reduces_vesting_schedules() {
115115
assert_eq!(ProjectStatus::AuctionRound, inst.go_to_next_state(project_id));
116116
assert_eq!(ProjectStatus::FundingFailed, inst.go_to_next_state(project_id));
117117
assert_eq!(ProjectStatus::SettlementStarted(FundingOutcome::Failure), inst.go_to_next_state(project_id));
118-
assert_eq!(inst.current_block(), BlockNumberFor::<PolimecRuntime>::from(25u32));
119118

120-
// All schedules start at block 5, and funding ended at block 25
121-
const TIME_PASSED: u128 = 20u128;
119+
const END_BLOCK: u32 = 18;
120+
assert_eq!(inst.current_block(), BlockNumberFor::<PolimecRuntime>::from(END_BLOCK));
121+
122+
// All schedules start at block 5, and funding ended at block 18
123+
const TIME_PASSED: u128 = 13u128;
122124

123125
let alice_account_data = Account::<PolimecRuntime>::get(&alice.clone()).data;
124126
assert_eq!(
@@ -177,9 +179,9 @@ fn evaluator_slash_reduces_vesting_schedules() {
177179
assert_eq!(
178180
alice_schedules,
179181
vec![
180-
VestingInfo::new(new_lock_1, new_per_block_1, 25),
181-
VestingInfo::new(new_lock_3, new_per_block_3, 25),
182-
VestingInfo::new(new_lock_4, new_per_block_4, 25),
182+
VestingInfo::new(new_lock_1, new_per_block_1, END_BLOCK),
183+
VestingInfo::new(new_lock_3, new_per_block_3, END_BLOCK),
184+
VestingInfo::new(new_lock_4, new_per_block_4, END_BLOCK),
183185
]
184186
);
185187
assert_eq!(alice_account_data, AccountData { free, reserved, frozen, flags: Default::default() });

‎integration-tests/src/tests/oracle.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use sp_runtime::{bounded_vec, BoundedVec, FixedU128};
2121
use std::collections::BTreeMap;
2222
use tests::defaults::*;
2323

24-
use AcceptedFundingAsset::{DOT, USDC, USDT, WETH};
24+
use AcceptedFundingAsset::{DOT, USDC, USDT, ETH};
2525

2626
fn values(
2727
values: [f64; 5],
@@ -31,7 +31,7 @@ fn values(
3131
(DOT.id(), FixedU128::from_float(dot)),
3232
(USDC.id(), FixedU128::from_float(usdc)),
3333
(USDT.id(), FixedU128::from_float(usdt)),
34-
(WETH.id(), FixedU128::from_float(weth)),
34+
(ETH.id(), FixedU128::from_float(weth)),
3535
(Location::here(), FixedU128::from_float(plmc))
3636
]
3737
}
@@ -56,7 +56,7 @@ fn members_can_feed_data() {
5656
(DOT.id(), FixedU128::from_float(4.84)),
5757
(USDC.id(), FixedU128::from_float(1.0)),
5858
(USDT.id(), FixedU128::from_float(1.0)),
59-
(WETH.id(), FixedU128::from_float(2500.0)),
59+
(ETH.id(), FixedU128::from_float(2500.0)),
6060
(Location::here(), FixedU128::from_float(0.4)),
6161
]);
6262

@@ -102,7 +102,7 @@ fn data_is_correctly_combined() {
102102
(DOT.id(), FixedU128::from_float(2.0)),
103103
(USDC.id(), FixedU128::from_float(1.0)),
104104
(USDT.id(), FixedU128::from_float(1.1)),
105-
(WETH.id(), FixedU128::from_float(2500.0)),
105+
(ETH.id(), FixedU128::from_float(2500.0)),
106106
(Location::here(), FixedU128::from_float(0.22222)),
107107
]);
108108

0 commit comments

Comments
 (0)