Skip to content

Commit

Permalink
Sep 20, 2024, 2:05 PM
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed Sep 20, 2024
1 parent 8e89ee0 commit 080fa1a
Show file tree
Hide file tree
Showing 40 changed files with 146 additions and 106 deletions.
12 changes: 3 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,14 @@
"build:release": "polkadot-ci-ghact-build"
},
"peerDependencies": {
"@acala-network/api": "^6.1.0",
"@acala-network/chopsticks": "^0.12.1",
"@acala-network/eth-providers": "^2.7.20",
"@acala-network/sdk": "^4.1.9-7",
"@acala-network/sdk-core": "^4.1.9-7",
"@acala-network/sdk-swap": "^4.1.9-13",
"@acala-network/sdk-wallet": "^4.1.5",

"@polkadot/api": "^10",
"ethers": "^5"
},
"resolutions": {
"@acala-network/api": "^6.1.0",
"@acala-network/eth-providers": "^2.7.20",
"@acala-network/sdk": "^4.1.9-7",
"@acala-network/sdk": "4.1.9-13",
"@acala-network/sdk-core": "^4.1.9-7",
"@acala-network/sdk-swap": "^4.1.9-13",
"@acala-network/sdk-wallet": "^4.1.5",
Expand Down Expand Up @@ -97,7 +91,7 @@
"rollup-plugin-dts": "^6.1.0",
"rollup-plugin-typescript2": "^0.36.0",

"typescript": "^4.7.4"
"typescript": "^5.0.0"
},
"stableVersion": "0.1.5-19"
}
115 changes: 77 additions & 38 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions scripts/generate-bridge-document.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import path from 'path';
import { traverseDir } from './traverse-dir';
import { traverseDir } from './traverse-dir.js.js.js';
import { flatten } from 'lodash';
import { writeFileSync, rmSync } from 'fs';

Expand Down Expand Up @@ -96,4 +96,6 @@ function main () {
console.log('done');
}

main();
main();


2 changes: 1 addition & 1 deletion scripts/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ async function run(){
await testAdapters();
}

run()
run()
2 changes: 1 addition & 1 deletion scripts/traverse-dir.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ export function traverseDir (
callback(path);
}
}
}
}
14 changes: 7 additions & 7 deletions src/adapters/acala/acala.spec.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { FixedPointNumber } from "@acala-network/sdk-core";
import { Bridge } from "../../bridge";
import { KaruraAdapter } from "./acala";
import { KusamaAdapter } from "../polkadot";
import { MoonriverAdapter } from "../moonbeam";
import { StatemineAdapter } from "../statemint";
import { Bridge } from "../../bridge.js";
import { KaruraAdapter } from "./acala.js";
import { KusamaAdapter } from "../polkadot.js";
import { MoonriverAdapter } from "../moonbeam.js";
import { StatemineAdapter } from "../statemint.js";
import { SubmittableExtrinsic } from "@polkadot/api/types";
import { ISubmittableResult } from "@polkadot/types/types";
import { ApiPromise, WsProvider } from "@polkadot/api";
import { ApiProvider } from "../../api-provider";
import { ApiProvider } from "../../api-provider.js";
import { firstValueFrom, from } from "rxjs";
import { ChainId } from "../../configs";
import { ChainId } from "../../configs/index.js";
import { u32 } from '@polkadot/types';
import type { AnyNumber, ITuple } from '@polkadot/types-codec/types';

Expand Down
2 changes: 1 addition & 1 deletion src/adapters/acala/acala.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Wallet } from "@acala-network/sdk/dist/esm/wallet";
import { Wallet } from "@acala-network/sdk/wallet/wallet";
import { AnyApi, FixedPointNumber } from "@acala-network/sdk-core";
import {
catchError,
Expand Down
5 changes: 4 additions & 1 deletion src/adapters/astar.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";

import { Storage } from "@acala-network/sdk/utils/storage";
// import { Storage } from "@acala-network/sdk/utils/storage";

// import { Wallet } from '@acala-network/sdk/wallet/wallet.ts';
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/bifrost.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down
2 changes: 1 addition & 1 deletion src/adapters/centrifuge.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down
2 changes: 1 addition & 1 deletion src/adapters/crust.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down
2 changes: 1 addition & 1 deletion src/adapters/darwinia.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down
2 changes: 1 addition & 1 deletion src/adapters/hydradx.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down
2 changes: 1 addition & 1 deletion src/adapters/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export * from "./acala";
export * from "./acala/index.js";
export * from "./astar";
export * from "./bifrost";
export * from "./darwinia";
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/integritee.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down
2 changes: 1 addition & 1 deletion src/adapters/interlay.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down
2 changes: 1 addition & 1 deletion src/adapters/kico.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down
4 changes: 2 additions & 2 deletions src/adapters/kilt.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down Expand Up @@ -192,4 +192,4 @@ export class KiltAdapter extends BaseKiltAdapter {
constructor() {
super(chains.kilt, kiltRouteConfigs, kiltTokensConfig);
}
}
}
2 changes: 1 addition & 1 deletion src/adapters/kylin.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down
2 changes: 1 addition & 1 deletion src/adapters/listen.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down
4 changes: 2 additions & 2 deletions src/adapters/mangata.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down Expand Up @@ -263,4 +263,4 @@ export class MangataAdapter extends BaseMangataAdapter {
super(chains.mangata, mangataRouteConfigs, mangataTokensConfig);
}
}


2 changes: 1 addition & 1 deletion src/adapters/manta.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down
2 changes: 1 addition & 1 deletion src/adapters/moonbeam.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { SubmittableExtrinsic } from "@polkadot/api/types";
import { ISubmittableResult } from "@polkadot/types/types";

Expand Down
4 changes: 2 additions & 2 deletions src/adapters/nodle.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down Expand Up @@ -192,4 +192,4 @@ export class NodleAdapter extends BaseNodleAdapter {
constructor() {
super(chains.nodle, nodleRouteConfigs, nodleTokensConfig);
}
}
}
2 changes: 1 addition & 1 deletion src/adapters/oak.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down
2 changes: 1 addition & 1 deletion src/adapters/parallel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down
4 changes: 2 additions & 2 deletions src/adapters/pendulum.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down Expand Up @@ -192,4 +192,4 @@ export class PendulumAdapter extends BasePendulumAdapter {
constructor() {
super(chains.pendulum, pendulumRouteConfigs, pendulumTokensConfig);
}
}
}
2 changes: 1 addition & 1 deletion src/adapters/phala.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down
2 changes: 1 addition & 1 deletion src/adapters/polkadot.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down
2 changes: 1 addition & 1 deletion src/adapters/robonomics.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down
4 changes: 2 additions & 2 deletions src/adapters/statemint.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
// import { Storage } from "@acala-network/sdk/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down
4 changes: 2 additions & 2 deletions src/adapters/subsocial.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down Expand Up @@ -192,4 +192,4 @@ export class SubsocialAdapter extends BaseSubsocialAdapter {
constructor() {
super(chains.subsocial, subsocialRouteConfigs, subsocialTokensConfig);
}
}
}
2 changes: 1 addition & 1 deletion src/adapters/tinkernet.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down
2 changes: 1 addition & 1 deletion src/adapters/unique.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down
2 changes: 1 addition & 1 deletion src/adapters/zeitgeist.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Storage } from "@acala-network/sdk/dist/esm/utils/storage";
import { Storage } from "@acala-network/sdk/utils/storage";
import { AnyApi, FixedPointNumber as FN } from "@acala-network/sdk-core";
import { combineLatest, map, Observable } from "rxjs";

Expand Down
4 changes: 3 additions & 1 deletion src/custom-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -235,4 +235,6 @@ export function createTokenDataFromAsset(asset: MyAssetRegistryObject): TokenDat

}
return tokenData
}
}


18 changes: 9 additions & 9 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export * from "./bridge";
export * from "./cross-chain-router";
export * from "./api-provider";
export * from "./adapters";
export * from "./configs/index";
export * from "./types";
export * from "./errors";
export * from "./utils/index";
export * from "./custom-utils";
export * from "./bridge.js";
export * from "./cross-chain-router.js";
export * from "./api-provider.js";
export * from "./adapters/index.js";
export * from "./configs/index.js";
export * from "./types.js";
export * from "./errors.js";
export * from "./utils/index.js";
export * from "./custom-utils.js";
2 changes: 1 addition & 1 deletion src/support-bridges.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1765,4 +1765,4 @@
}
]
]


2 changes: 1 addition & 1 deletion src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,4 @@ export interface MyAsset {
contractAddress?: string;
}

export type Relay = "kusama" | "polkadot"
export type Relay = "kusama" | "polkadot"
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"typeRoots": ["./node_modules/@polkadot/ts", "./node_modules/@types"],
"jsx": "preserve",
"noImplicitReturns": true,
"moduleResolution": "node",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"experimentalDecorators": true,
Expand Down

0 comments on commit 080fa1a

Please sign in to comment.