Skip to content

Commit

Permalink
feat: enable p2e eth bridge
Browse files Browse the repository at this point in the history
Signed-off-by: Norman Meier <[email protected]>
  • Loading branch information
n0izn0iz committed Feb 2, 2024
1 parent b34701e commit be1c93e
Show file tree
Hide file tree
Showing 6 changed files with 208 additions and 24 deletions.
30 changes: 13 additions & 17 deletions .github/workflows/mobile-build-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,45 +8,41 @@ on:

jobs:
build:
runs-on: macos-13
runs-on: macos-14
continue-on-error: true
steps:
- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: "15.1.0"
- name: Select xcode
run: sudo xcode-select -s /Applications/Xcode_15.2.app

- uses: actions/checkout@v3

- uses: actions/setup-go@v3
with:
go-version: "1.19"

- name: Select xcode
run: sudo xcode-select -s /Applications/Xcode_15.1.app

- uses: actions/checkout@v3

- uses: actions/setup-node@v3
with:
cache: "yarn"
node-version: 18

- name: Fix package.json
run: yarn remove @lottiefiles/react-lottie-player
- name: Setup EAS
uses: expo/expo-github-action@v8
with:
eas-version: 7.1.2
token: ${{ secrets.EXPO_TOKEN }}

- name: Install node modules
run: yarn install

- name: Fix package.json
run: yarn remove @lottiefiles/react-lottie-player

- name: Fix gitignore
run: npx tsx ./packages/scripts/app-build/fixGitignore.ts

- name: Build ios weshframework
run: make check-ios-weshframework

- name: Setup EAS
uses: expo/expo-github-action@v8
with:
eas-version: latest
token: ${{ secrets.EXPO_TOKEN }}

- name: Build ios
run: eas build --local --non-interactive --platform=ios

Expand Down
163 changes: 163 additions & 0 deletions .yarn/patches/@axelar-network-axelarjs-sdk-npm-0.13.9-617166d9cd.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
diff --git a/dist/src/libs/AxelarQueryAPI.d.ts b/dist/src/libs/AxelarQueryAPI.d.ts
index 52f6cba9d9df34d7857509b7fc573c7f0bc0fbde..b51235a19f95de239b5ba4862f37b0d6e0fb2e2e 100644
--- a/dist/src/libs/AxelarQueryAPI.d.ts
+++ b/dist/src/libs/AxelarQueryAPI.d.ts
@@ -2,7 +2,7 @@ import { RestService } from "../services";
import { AxelarQueryAPIConfig, BaseFeeResponse, Environment } from "./types";
import { EvmChain } from "../constants/EvmChain";
import { GasToken } from "../constants/GasToken";
-import { FeeInfoResponse, TransferFeeResponse } from "@axelar-network/axelarjs-types/axelar/nexus/v1beta1/query";
+import { FeeInfoResponse, TransferFeeResponse } from "@axelar-network/axelarjs-types/build/commonjs/axelar/nexus/v1beta1/query";
import { BigNumber, BigNumberish } from "ethers";
interface TranslatedTransferRateLimitResponse {
incoming: string;
@@ -49,7 +49,7 @@ export declare class AxelarQueryAPI {
* @returns
*/
getFeeForChainAndAsset(chainId: string, assetDenom: string): Promise<FeeInfoResponse>;
- getEVMEvent(sourceChainId: string, srcTxHash: string, srcEventId: number): Promise<import("@axelar-network/axelarjs-types/axelar/evm/v1beta1/query").EventResponse | undefined>;
+ getEVMEvent(sourceChainId: string, srcTxHash: string, srcEventId: number): Promise<import("@axelar-network/axelarjs-types/build/commonjs/axelar/evm/v1beta1/query").EventResponse | undefined>;
getConfirmationHeight(chain: string): Promise<number>;
/**
* Gest the transfer fee for a given transaction
diff --git a/dist/src/libs/AxelarQueryAPI.js b/dist/src/libs/AxelarQueryAPI.js
index 87dc869dd7840bce4c448163e1619a66d88b061b..a17f277cbc1cb6ee7a42b0123292194833ba1f82 100644
--- a/dist/src/libs/AxelarQueryAPI.js
+++ b/dist/src/libs/AxelarQueryAPI.js
@@ -20,7 +20,7 @@ const services_1 = require("../services");
const constants_2 = require("../constants");
const AxelarQueryClient_1 = require("./AxelarQueryClient");
const cross_fetch_1 = __importDefault(require("cross-fetch"));
-const query_1 = require("@axelar-network/axelarjs-types/axelar/nexus/v1beta1/query");
+const query_1 = require("@axelar-network/axelarjs-types/build/commonjs/axelar/nexus/v1beta1/query");
const utils_2 = require("../utils");
const chains_1 = require("../chains");
const s3_1 = __importDefault(require("./TransactionRecoveryApi/constants/s3"));
diff --git a/dist/src/libs/AxelarQueryClient/types/index.d.ts b/dist/src/libs/AxelarQueryClient/types/index.d.ts
index dadb87a4701f08b9726fa0aeafff6dea4a66278c..9446e9efad8c430eb39114c2b3760b258428cfb8 100644
--- a/dist/src/libs/AxelarQueryClient/types/index.d.ts
+++ b/dist/src/libs/AxelarQueryClient/types/index.d.ts
@@ -1,7 +1,7 @@
-import { QueryService as EvmQS } from "@axelar-network/axelarjs-types/axelar/evm/v1beta1/service";
-import { QueryService as AxelarnetQS } from "@axelar-network/axelarjs-types/axelar/axelarnet/v1beta1/service";
-import { QueryService as NexusQS } from "@axelar-network/axelarjs-types/axelar/nexus/v1beta1/service";
-import { QueryService as TSSQS } from "@axelar-network/axelarjs-types/axelar/tss/v1beta1/service";
+import { QueryService as EvmQS } from "@axelar-network/axelarjs-types/build/commonjs/axelar/evm/v1beta1/service";
+import { QueryService as AxelarnetQS } from "@axelar-network/axelarjs-types/build/commonjs/axelar/axelarnet/v1beta1/service";
+import { QueryService as NexusQS } from "@axelar-network/axelarjs-types/build/commonjs/axelar/nexus/v1beta1/service";
+import { QueryService as TSSQS } from "@axelar-network/axelarjs-types/build/commonjs/axelar/tss/v1beta1/service";
import { QueryClient } from "@cosmjs/stargate";
export interface AxelarQueryService {
readonly evm: EvmQS;
diff --git a/dist/src/libs/AxelarQueryClient/types/index.js b/dist/src/libs/AxelarQueryClient/types/index.js
index c594b7f574fb7640545af793c63be3e0cfed739f..eaa558fc08c87a5a30005b221b458a965576d953 100644
--- a/dist/src/libs/AxelarQueryClient/types/index.js
+++ b/dist/src/libs/AxelarQueryClient/types/index.js
@@ -1,10 +1,10 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.setupQueryExtension = void 0;
-const service_1 = require("@axelar-network/axelarjs-types/axelar/evm/v1beta1/service");
-const service_2 = require("@axelar-network/axelarjs-types/axelar/axelarnet/v1beta1/service");
-const service_3 = require("@axelar-network/axelarjs-types/axelar/nexus/v1beta1/service");
-const service_4 = require("@axelar-network/axelarjs-types/axelar/tss/v1beta1/service");
+const service_1 = require("@axelar-network/axelarjs-types/build/commonjs/axelar/evm/v1beta1/service");
+const service_2 = require("@axelar-network/axelarjs-types/build/commonjs/axelar/axelarnet/v1beta1/service");
+const service_3 = require("@axelar-network/axelarjs-types/build/commonjs/axelar/nexus/v1beta1/service");
+const service_4 = require("@axelar-network/axelarjs-types/build/commonjs/axelar/tss/v1beta1/service");
const stargate_1 = require("@cosmjs/stargate");
function setupQueryExtension(base) {
const client = (0, stargate_1.createProtobufRpcClient)(base);
diff --git a/dist/src/libs/AxelarSigningClient/types/AxelarnetTxTypes.js b/dist/src/libs/AxelarSigningClient/types/AxelarnetTxTypes.js
index 3718302f0f6976c8755d34710437e0b2ae0ec8b3..ed31be28741d7835daf82a0e2c4038af0de3fb3e 100644
--- a/dist/src/libs/AxelarSigningClient/types/AxelarnetTxTypes.js
+++ b/dist/src/libs/AxelarSigningClient/types/AxelarnetTxTypes.js
@@ -1,7 +1,7 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.registerAxelarnetTxTypes = void 0;
-const tx_1 = require("@axelar-network/axelarjs-types/axelar/axelarnet/v1beta1/tx");
+const tx_1 = require("@axelar-network/axelarjs-types/build/commonjs/axelar/axelarnet/v1beta1/tx");
const TxTypeUrlMap = {
AxelarnetLinkRequest: `/${tx_1.protobufPackage}.LinkRequest`,
AxelarnetConfirmDepositRequest: `/${tx_1.protobufPackage}.ConfirmDepositRequest`,
diff --git a/dist/src/libs/AxelarSigningClient/types/EvmTxTypes.js b/dist/src/libs/AxelarSigningClient/types/EvmTxTypes.js
index 917e3527bb77941218963bfa5b68ee9795329580..8c5561da12242ae68f3f39c9e33e5fd0cb7062a9 100644
--- a/dist/src/libs/AxelarSigningClient/types/EvmTxTypes.js
+++ b/dist/src/libs/AxelarSigningClient/types/EvmTxTypes.js
@@ -1,7 +1,7 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.registerEvmTxTypes = void 0;
-const tx_1 = require("@axelar-network/axelarjs-types/axelar/evm/v1beta1/tx");
+const tx_1 = require("@axelar-network/axelarjs-types/build/commonjs/axelar/evm/v1beta1/tx");
const TxTypeUrlMap = {
EvmLinkRequest: `/${tx_1.protobufPackage}.LinkRequest`,
EvmSetGatewayRequest: `/${tx_1.protobufPackage}.SetGatewayRequest`,
diff --git a/dist/src/libs/TransactionRecoveryApi/AxelarGMPRecoveryAPI.d.ts b/dist/src/libs/TransactionRecoveryApi/AxelarGMPRecoveryAPI.d.ts
index d1faf2f2503de713d4b15f045fa1ec2d2fccd5ff..c87d06a252f9d3d8803655110aca53298cd089a5 100644
--- a/dist/src/libs/TransactionRecoveryApi/AxelarGMPRecoveryAPI.d.ts
+++ b/dist/src/libs/TransactionRecoveryApi/AxelarGMPRecoveryAPI.d.ts
@@ -3,7 +3,7 @@ import { EvmChain } from "../../constants/EvmChain";
import { GasToken } from "../../constants/GasToken";
import { AxelarRecoveryApi } from "./AxelarRecoveryApi";
import { AxelarQueryAPI } from "../AxelarQueryAPI";
-import { EventResponse } from "@axelar-network/axelarjs-types/axelar/evm/v1beta1/query";
+import { EventResponse } from "@axelar-network/axelarjs-types/build/commonjs/axelar/evm/v1beta1/query";
import { ChainInfo } from "src/chains/types";
import { Coin, OfflineSigner } from "@cosmjs/proto-signing";
import { DeliverTxResponse, SigningStargateClient, StdFee } from "@cosmjs/stargate";
diff --git a/dist/src/libs/TransactionRecoveryApi/AxelarGMPRecoveryAPI.js b/dist/src/libs/TransactionRecoveryApi/AxelarGMPRecoveryAPI.js
index 20af4416060796e5dc6b7887f2d899ee2e4bf112..879d80dad12d51b9e748e70846fb9fc69cf96ab7 100644
--- a/dist/src/libs/TransactionRecoveryApi/AxelarGMPRecoveryAPI.js
+++ b/dist/src/libs/TransactionRecoveryApi/AxelarGMPRecoveryAPI.js
@@ -39,7 +39,7 @@ const providerHelper_1 = require("./helpers/providerHelper");
const error_1 = require("./constants/error");
const helpers_1 = require("./helpers");
const utils_1 = require("../../utils");
-const types_2 = require("@axelar-network/axelarjs-types/axelar/evm/v1beta1/types");
+const types_2 = require("@axelar-network/axelarjs-types/build/commonjs/axelar/evm/v1beta1/types");
const utils_2 = require("ethers/lib/utils");
const s3_1 = __importDefault(require("./constants/s3"));
const stargate_1 = require("@cosmjs/stargate");
diff --git a/dist/src/libs/TransactionRecoveryApi/AxelarRecoveryApi.d.ts b/dist/src/libs/TransactionRecoveryApi/AxelarRecoveryApi.d.ts
index 02c161a8256da56fd2da5f88ff314461193676fb..e92199717a4508834444c03ca9a611f22d313f1e 100644
--- a/dist/src/libs/TransactionRecoveryApi/AxelarRecoveryApi.d.ts
+++ b/dist/src/libs/TransactionRecoveryApi/AxelarRecoveryApi.d.ts
@@ -133,10 +133,10 @@ export declare class AxelarRecoveryApi {
executePendingTransfers(chainName: string): Promise<import("../types").AxelarTxResponse>;
routeMessageRequest(txHash: string, payload: string, logIndex?: number): Promise<import("../types").AxelarTxResponse>;
signCommands(chainName: string): Promise<import("../types").AxelarTxResponse>;
- queryBatchedCommands(chainId: string, batchCommandId?: string): Promise<import("@axelar-network/axelarjs-types/axelar/evm/v1beta1/query").BatchedCommandsResponse>;
+ queryBatchedCommands(chainId: string, batchCommandId?: string): Promise<import("@axelar-network/axelarjs-types/build/commonjs/axelar/evm/v1beta1/query").BatchedCommandsResponse>;
queryGatewayAddress({ chain }: {
chain: string;
- }): Promise<import("@axelar-network/axelarjs-types/axelar/evm/v1beta1/query").GatewayAddressResponse>;
+ }): Promise<import("@axelar-network/axelarjs-types/build/commonjs/axelar/evm/v1beta1/query").GatewayAddressResponse>;
getSignedTxAndBroadcast(chain: string, data: string): Promise<import("@ethersproject/abstract-provider").TransactionResponse>;
sendApproveTx(chain: string, data: string, evmWalletDetails: EvmWalletDetails): Promise<any>;
broadcastEvmTx(chain: string, data: string, evmWalletDetails?: {
diff --git a/dist/src/libs/TransactionRecoveryApi/helpers/mappers.d.ts b/dist/src/libs/TransactionRecoveryApi/helpers/mappers.d.ts
index 54edb998f0af1e55a513088595cd947c5697f4b3..70cbdcc8206614f66a4b013e19c2da52ecf09341 100644
--- a/dist/src/libs/TransactionRecoveryApi/helpers/mappers.d.ts
+++ b/dist/src/libs/TransactionRecoveryApi/helpers/mappers.d.ts
@@ -1,4 +1,4 @@
-import { BatchedCommandsResponse } from "@axelar-network/axelarjs-types/axelar/evm/v1beta1/query";
+import { BatchedCommandsResponse } from "@axelar-network/axelarjs-types/build/commonjs/axelar/evm/v1beta1/query";
import { BatchedCommandsAxelarscanResponse } from "../AxelarRecoveryApi";
export declare const mapIntoAxelarscanResponseType: (input: BatchedCommandsResponse, chainId: string) => BatchedCommandsAxelarscanResponse;
//# sourceMappingURL=mappers.d.ts.map
\ No newline at end of file
diff --git a/dist/src/libs/TransactionRecoveryApi/helpers/mappers.js b/dist/src/libs/TransactionRecoveryApi/helpers/mappers.js
index ffbd805b5a238a18ba239163eb8e2e76632d9a2c..71bf57d4c11989d1343e374b77a4b48dd91cea26 100644
--- a/dist/src/libs/TransactionRecoveryApi/helpers/mappers.js
+++ b/dist/src/libs/TransactionRecoveryApi/helpers/mappers.js
@@ -1,7 +1,7 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.mapIntoAxelarscanResponseType = void 0;
-const types_1 = require("@axelar-network/axelarjs-types/axelar/evm/v1beta1/types");
+const types_1 = require("@axelar-network/axelarjs-types/build/commonjs/axelar/evm/v1beta1/types");
/**
* core returns a number response that's typed to an enum:
"export declare enum BatchedCommandsStatus {
4 changes: 3 additions & 1 deletion eas.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
"buildType": "apk"
}
},
"production": {}
"production": {
"node": "18.1.0"
}
},
"submit": {
"production": {}
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@
"resolutions": {
"@gnolang/tm2-js-client@^1.0.0": "patch:@gnolang/tm2-js-client@npm%3A1.0.1#./.yarn/patches/@gnolang-tm2-js-client-npm-1.0.1-9e54bafbb3.patch",
"chain-registry@^1.20.0": "patch:chain-registry@npm%3A1.20.0#./.yarn/patches/chain-registry-npm-1.20.0-e290300d1b.patch",
"multiformats@^12.1.3": "patch:multiformats@npm%3A12.1.3#./.yarn/patches/multiformats-npm-12.1.3-dbaa26037a.patch"
"multiformats@^12.1.3": "patch:multiformats@npm%3A12.1.3#./.yarn/patches/multiformats-npm-12.1.3-dbaa26037a.patch",
"@axelar-network/axelarjs-sdk@^0.13.6": "patch:@axelar-network/axelarjs-sdk@npm%3A0.13.9#./.yarn/patches/@axelar-network-axelarjs-sdk-npm-0.13.9-617166d9cd.patch"
},
"private": true,
"packageManager": "[email protected]",
Expand Down
5 changes: 1 addition & 4 deletions packages/components/navigation/Navigator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import { MyCollectionScreen } from "../../screens/MyCollection/MyCollectionScree
import { OrganizationDeployerScreen } from "../../screens/Organizations/OrganizationDeployerScreen";
import { OrganizationsScreen } from "../../screens/Organizations/OrganizationsScreen";
import { RiotGameBreedingScreen } from "../../screens/RiotGame/RiotGameBreedingScreen";
// import { RiotGameBridgeScreen } from "../../screens/RiotGame/RiotGameBridgeScreen";
import { RiotGameBridgeScreen } from "../../screens/RiotGame/RiotGameBridgeScreen";
import { RiotGameEnrollScreen } from "../../screens/RiotGame/RiotGameEnrollScreen";
import { RiotGameFightScreen } from "../../screens/RiotGame/RiotGameFightScreen";
import { RiotGameInventoryScreen } from "../../screens/RiotGame/RiotGameInventoryScreen";
Expand Down Expand Up @@ -185,7 +185,6 @@ export const Navigator: React.FC = () => {
title: screenTitle("Riot Game Inventory"),
}}
/>
{/*
<Nav.Screen
name="RiotGameBridge"
component={RiotGameBridgeScreen}
Expand All @@ -194,8 +193,6 @@ export const Navigator: React.FC = () => {
title: screenTitle("Riot Game Bridge"),
}}
/>
*/}

{/* ==== Wallet Manager */}
<Nav.Screen
name="WalletManager"
Expand Down
27 changes: 26 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ __metadata:
languageName: node
linkType: hard

"@axelar-network/axelarjs-sdk@npm:^0.13.6":
"@axelar-network/axelarjs-sdk@npm:0.13.9":
version: 0.13.9
resolution: "@axelar-network/axelarjs-sdk@npm:0.13.9"
dependencies:
Expand All @@ -66,6 +66,31 @@ __metadata:
languageName: node
linkType: hard

"@axelar-network/axelarjs-sdk@patch:@axelar-network/axelarjs-sdk@npm%3A0.13.9#./.yarn/patches/@axelar-network-axelarjs-sdk-npm-0.13.9-617166d9cd.patch::locator=teritori-dapp%40workspace%3A.":
version: 0.13.9
resolution: "@axelar-network/axelarjs-sdk@patch:@axelar-network/axelarjs-sdk@npm%3A0.13.9#./.yarn/patches/@axelar-network-axelarjs-sdk-npm-0.13.9-617166d9cd.patch::version=0.13.9&hash=dc0f6f&locator=teritori-dapp%40workspace%3A."
dependencies:
"@axelar-network/axelar-cgp-solidity": ^4.5.0
"@axelar-network/axelarjs-types": ^0.33.0
"@cosmjs/json-rpc": ^0.30.1
"@cosmjs/stargate": 0.31.0-alpha.1
"@ethersproject/abstract-provider": ^5.7.0
"@ethersproject/networks": ^5.7.1
"@ethersproject/providers": ^5.7.2
"@types/uuid": ^8.3.1
bech32: ^2.0.0
clone-deep: ^4.0.1
cross-fetch: ^3.1.5
ethers: ^5.7.2
socket.io-client: ^4.6.1
standard-http-error: ^2.0.1
string-similarity-js: ^2.1.4
uuid: ^8.3.2
ws: ^8.13.0
checksum: 2d0fa29c6ec20d27b73d9b5cab81b4ed486d6c282bd71f40cd2b86960406d7a8e21a15b10f1c8a44786aa0517ac497f0ca75ee22f05008b84fe0ad9b74a13424
languageName: node
linkType: hard

"@axelar-network/axelarjs-types@npm:^0.33.0":
version: 0.33.0
resolution: "@axelar-network/axelarjs-types@npm:0.33.0"
Expand Down

0 comments on commit be1c93e

Please sign in to comment.