Skip to content

Commit 4772cad

Browse files
barnjaminbarnjamin
authored
Rando fixes (#381)
1 parent a7d7060 commit 4772cad

File tree

30 files changed

+453
-74
lines changed

30 files changed

+453
-74
lines changed

‎platforms/aptos/__tests__/integration/tokenBridge.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
import "@wormhole-foundation/connect-sdk-aptos-core";
1212
import "@wormhole-foundation/connect-sdk-aptos-tokenbridge";
1313

14-
import { APTOS_COIN, AptosChains, AptosPlatform, AptosPlatformType } from "../../src/";
14+
import { APTOS_COIN, AptosChains, AptosPlatform } from "../../src/";
1515

1616
import { describe, expect, test } from "@jest/globals";
1717

@@ -56,7 +56,7 @@ afterEach(async () => {
5656
describe("TokenBridge Tests", () => {
5757
const p = new AptosPlatform(network, configs);
5858

59-
let tb: TokenBridge<TNet, AptosPlatformType, AptosChains>;
59+
let tb: TokenBridge<TNet, AptosChains>;
6060

6161
test("Create TokenBridge", async () => {
6262
const rpc = p.getRpc("Aptos");

‎platforms/aptos/__tests__/unit/address.test.ts

+14-18
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
import { APTOS_COIN, AptosAddress } from "../../src";
22

3-
describe("Cosmwasm Address Tests", () => {
4-
describe("Parse Address", () => {
5-
test("An address parses", () => {
6-
let address = new AptosAddress(
7-
APTOS_COIN,
8-
);
9-
expect(address).toBeTruthy();
10-
expect(address.toString()).toEqual(APTOS_COIN)
3+
describe("Aptos Address Tests", () => {
4+
describe("Parse Address", () => {
5+
test("An address parses", () => {
6+
let address = new AptosAddress(APTOS_COIN);
7+
expect(address).toBeTruthy();
8+
expect(address.toString()).toEqual(APTOS_COIN);
119

12-
const acctAddress = "0xc90949fd7ff3c13fd0b586a10547b5ca1212edc2c170e368d1dea00c01fea62b"
13-
address = new AptosAddress(
14-
acctAddress
15-
);
16-
expect(address).toBeTruthy();
17-
expect(address.toString()).toEqual(acctAddress)
18-
});
10+
const acctAddress = "0xc90949fd7ff3c13fd0b586a10547b5ca1212edc2c170e368d1dea00c01fea62b";
11+
address = new AptosAddress(acctAddress);
12+
expect(address).toBeTruthy();
13+
expect(address.toString()).toEqual(acctAddress);
14+
});
1915

20-
test("An invalid address is rejected", () => {
21-
expect(() => new AptosAddress("bogus")).toThrow();
22-
});
16+
test("An invalid address is rejected", () => {
17+
expect(() => new AptosAddress("bogus")).toThrow();
2318
});
19+
});
2420
});

‎platforms/aptos/src/platform.ts

+13-29
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import {
2-
StaticPlatformMethods,
32
Chain,
3+
ChainsConfig,
44
Network,
55
PlatformContext,
6+
StaticPlatformMethods,
67
Wormhole,
7-
ChainsConfig,
8-
networkPlatformConfigs,
98
isNative,
9+
networkPlatformConfigs,
1010
} from "@wormhole-foundation/connect-sdk";
1111
import { AptosClient } from "aptos";
1212
import { AptosChain } from "./chain";
@@ -22,6 +22,7 @@ import {
2222
decimals as nativeDecimals,
2323
} from "@wormhole-foundation/connect-sdk";
2424
import { CoinClient, Types } from "aptos";
25+
import { AptosAddress } from "./address";
2526
import { APTOS_COIN, APTOS_SEPARATOR } from "./constants";
2627
import { AnyAptosAddress } from "./types";
2728

@@ -64,7 +65,7 @@ export class AptosPlatform<N extends Network>
6465
return native == tokenId;
6566
}
6667

67-
static isSupportedChain<C extends AptosChains>(chain: C): boolean {
68+
static isSupportedChain(chain: Chain): boolean {
6869
const platform = chainToPlatform(chain);
6970
return platform === AptosPlatform._platform;
7071
}
@@ -115,31 +116,14 @@ export class AptosPlatform<N extends Network>
115116
walletAddress: string,
116117
tokens: AnyAptosAddress[],
117118
): Promise<Balances> {
118-
return {};
119-
// const tb = await AptosPlatform.getTokenBridge(rpc);
120-
// const addresses = await Promise.all(
121-
// tokens.map((tokenId) => await tb.getOriginalAsset(tokenId)),
122-
// );
123-
124-
// let coinBalances: CoinBalance[] = [];
125-
// let offset = 0;
126-
// const limit = 100;
127-
// while (true) {
128-
// const result = await this.fetchCurrentCoins(walletAddress, offset, limit);
129-
// coinBalances = [...coinBalances, ...result.data.current_coin_balances];
130-
// if (result.data.current_coin_balances.length < limit) {
131-
// break;
132-
// }
133-
// offset += result.data.current_coin_balances.length;
134-
// }
135-
136-
// return addresses.map((address) =>
137-
// !address
138-
// ? null
139-
// : BigNumber.from(
140-
// coinBalances.find((bal) => bal.coin_type === address)?.amount || 0,
141-
// ),
142-
// );
119+
const balancesArr = await Promise.all(
120+
tokens.map(async (token) => {
121+
const balance = await this.getBalance(chain, rpc, walletAddress, token);
122+
const address = isNative(token) ? "native" : new AptosAddress(token).toString();
123+
return { [address]: balance };
124+
}),
125+
);
126+
return balancesArr.reduce((obj, item) => Object.assign(obj, item), {});
143127
}
144128

145129
static async sendWait(chain: Chain, rpc: AptosClient, stxns: SignedTx[]): Promise<TxHash[]> {

‎platforms/evm/__tests__/integration/tokenBridge.test.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ const recipient: ChainAddress = {
114114

115115
describe('TokenBridge Tests', () => {
116116
const p = new EvmPlatform(network, configs);
117-
let tb: TokenBridge<typeof network, 'Evm', EvmChains>;
117+
let tb: TokenBridge<typeof network, EvmChains>;
118118

119119
test('Create TokenBridge', async () => {
120120
const rpc = p.getRpc('Ethereum');
@@ -220,9 +220,9 @@ describe('TokenBridge Tests', () => {
220220
expect(allTxns).toHaveLength(1);
221221
const [attestTx] = allTxns;
222222
expect(attestTx).toBeTruthy();
223-
expect(attestTx.chain).toEqual(chain);
223+
expect(attestTx!.chain).toEqual(chain);
224224

225-
const { transaction } = attestTx;
225+
const { transaction } = attestTx!;
226226
expect(transaction.chainId).toEqual(
227227
nativeChainIds.networkChainToNativeChainId.get(network, chain),
228228
);
@@ -254,9 +254,9 @@ describe('TokenBridge Tests', () => {
254254
expect(allTxns).toHaveLength(1);
255255
const [attestTx] = allTxns;
256256
expect(attestTx).toBeTruthy();
257-
expect(attestTx.chain).toEqual(chain);
257+
expect(attestTx!.chain).toEqual(chain);
258258

259-
const { transaction } = attestTx;
259+
const { transaction } = attestTx!;
260260
expect(transaction.chainId).toEqual(
261261
nativeChainIds.networkChainToNativeChainId.get(network, chain),
262262
);
@@ -284,9 +284,9 @@ describe('TokenBridge Tests', () => {
284284

285285
const [xferTx] = allTxns;
286286
expect(xferTx).toBeTruthy();
287-
expect(xferTx.chain).toEqual(chain);
287+
expect(xferTx!.chain).toEqual(chain);
288288

289-
const { transaction } = xferTx;
289+
const { transaction } = xferTx!;
290290
expect(transaction.chainId).toEqual(
291291
nativeChainIds.networkChainToNativeChainId.get(network, chain),
292292
);
@@ -310,12 +310,12 @@ describe('TokenBridge Tests', () => {
310310

311311
const [approveTx, xferTx] = allTxns;
312312
expect(approveTx).toBeTruthy();
313-
const { transaction: approveTransaction } = approveTx;
313+
const { transaction: approveTransaction } = approveTx!;
314314
expect(approveTransaction.to).toEqual(realWrappedAddress.toString());
315315

316316
expect(xferTx).toBeTruthy();
317-
expect(xferTx.chain).toEqual(chain);
318-
const { transaction: xferTransaction } = xferTx;
317+
expect(xferTx!.chain).toEqual(chain);
318+
const { transaction: xferTransaction } = xferTx!;
319319
expect(xferTransaction.to).toEqual(tbAddress.toString());
320320
expect(xferTransaction.chainId).toEqual(
321321
nativeChainIds.networkChainToNativeChainId.get(network, chain),

‎platforms/evm/src/platform.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,9 @@ export class EvmPlatform<N extends Network>
148148
return await rpc.getBlockNumber();
149149
}
150150
static async getLatestFinalizedBlock(rpc: Provider): Promise<number> {
151-
throw new Error('Not implemented');
151+
const block = await rpc.getBlock('finalized');
152+
if (!block) throw new Error('Could not get finalized block');
153+
return block?.number;
152154
}
153155

154156
// Look up the Wormhole Canonical Network and Chain from the EVM chainId

‎platforms/sui/__tests__/integration/fixtures/TokenBridge_Tests_Create_TokenBridge.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎platforms/sui/__tests__/integration/fixtures/TokenBridge_Tests_Create_TokenBridge_Transactions_Token_Transfer_Transactions_Transfer_Native.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎platforms/sui/__tests__/integration/fixtures/TokenBridge_Tests_Create_TokenBridge_Transactions_Token_Transfer_Transactions_Transfer_Token.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎platforms/sui/__tests__/integration/fixtures/TokenBridge_Tests_Create_Token_Attestation_Transactions_Create_Attestation.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎platforms/sui/__tests__/integration/fixtures/TokenBridge_Tests_Create_Token_Attestation_Transactions_Submit_Attestation.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎platforms/sui/__tests__/integration/fixtures/TokenBridge_Tests_Get_Wrapped_Asset_Details_getOriginalAsset_Bogus.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎platforms/sui/__tests__/integration/fixtures/TokenBridge_Tests_Get_Wrapped_Asset_Details_getOriginalAsset_Real_Not_Wrapped.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎platforms/sui/__tests__/integration/fixtures/TokenBridge_Tests_Get_Wrapped_Asset_Details_getOriginalAsset_Real_Wrapped.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎platforms/sui/__tests__/integration/fixtures/TokenBridge_Tests_Get_Wrapped_Asset_Details_getWrappedAsset_Bogus.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎platforms/sui/__tests__/integration/fixtures/TokenBridge_Tests_Get_Wrapped_Asset_Details_getWrappedAsset_Real_Not_Wrapped.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎platforms/sui/__tests__/integration/fixtures/TokenBridge_Tests_Get_Wrapped_Asset_Details_getWrappedAsset_Real_Wrapped.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎platforms/sui/__tests__/integration/fixtures/TokenBridge_Tests_Get_Wrapped_Asset_Details_hasWrappedAsset_Bogus.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎platforms/sui/__tests__/integration/fixtures/TokenBridge_Tests_Get_Wrapped_Asset_Details_hasWrappedAsset_Real_Not_Wrapped.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎platforms/sui/__tests__/integration/fixtures/TokenBridge_Tests_Get_Wrapped_Asset_Details_hasWrappedAsset_Real_Wrapped.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎platforms/sui/__tests__/integration/fixtures/TokenBridge_Tests_Get_Wrapped_Asset_Details_isWrappedAsset_Bogus.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎platforms/sui/__tests__/integration/fixtures/TokenBridge_Tests_Get_Wrapped_Asset_Details_isWrappedAsset_Real_Not_Wrapped.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎platforms/sui/__tests__/integration/fixtures/TokenBridge_Tests_Get_Wrapped_Asset_Details_isWrappedAsset_Real_Wrapped.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

0 commit comments

Comments
 (0)