From 12f2b7c152deda38947b7d1bb8325a583b8c3492 Mon Sep 17 00:00:00 2001 From: Canh Trinh Date: Fri, 12 Jan 2024 13:20:35 -0500 Subject: [PATCH 1/4] chore: remove unused saveGMP API --- CHANGELOG.md | 4 ++ .../AxelarGMPRecoveryAPI.ts | 41 ------------------- .../AxelarGMPRecoveryAPI.spec.ts | 30 -------------- 3 files changed, 4 insertions(+), 71 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d17f0206..508ebc64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [0.13.10] - 2024-JANUARY-12 + +- Remove unused internal APIs + ## [0.13.8] - 2023-DECEMBER-18 - Add `Immutable` to mainnet configs; update `Immutable` testnet RPC diff --git a/src/libs/TransactionRecoveryApi/AxelarGMPRecoveryAPI.ts b/src/libs/TransactionRecoveryApi/AxelarGMPRecoveryAPI.ts index f68a041a..31e55a40 100644 --- a/src/libs/TransactionRecoveryApi/AxelarGMPRecoveryAPI.ts +++ b/src/libs/TransactionRecoveryApi/AxelarGMPRecoveryAPI.ts @@ -172,25 +172,6 @@ export class AxelarGMPRecoveryAPI extends AxelarRecoveryApi { }); } - private async saveGMP( - sourceTransactionHash: string, - relayerAddress: string, - sourceTransactionIndex?: number, - sourceTransactionLogIndex?: number, - transactionHash?: string, - error?: any - ) { - return await this.execPost(super.getAxelarGMPApiUrl, "", { - method: "saveGMP", - sourceTransactionHash, - transactionHash, - sourceTransactionIndex, - sourceTransactionLogIndex, - relayerAddress, - error, - }); - } - public getCidFromSrcTxHash(destChainId: string, txHash: string, eventIndex: number) { return getCommandId(destChainId, txHash, eventIndex, this.environment, rpcInfo); } @@ -1147,28 +1128,6 @@ export class AxelarGMPRecoveryAPI extends AxelarRecoveryApi { } }); - // Submit execute data to axelarscan if the contract execution is success. - const signerAddress = await signer.getAddress(); - const executeTxHash = txResult.transaction?.transactionHash; - if (executeTxHash) { - await this.saveGMP( - srcTxHash, - signerAddress, - srcTxInfo.transactionIndex, - srcTxInfo.logIndex, - executeTxHash - ).catch(() => undefined); - } else { - await this.saveGMP( - srcTxHash, - signerAddress, - srcTxInfo.transactionIndex, - srcTxInfo.logIndex, - "", - txResult.error - ).catch(() => undefined); - } - return txResult; } diff --git a/src/libs/test/TransactionRecoveryAPI/AxelarGMPRecoveryAPI.spec.ts b/src/libs/test/TransactionRecoveryAPI/AxelarGMPRecoveryAPI.spec.ts index c3b316cf..ac6e03bc 100644 --- a/src/libs/test/TransactionRecoveryAPI/AxelarGMPRecoveryAPI.spec.ts +++ b/src/libs/test/TransactionRecoveryAPI/AxelarGMPRecoveryAPI.spec.ts @@ -1525,23 +1525,11 @@ describe("AxelarGMPRecoveryAPI", () => { const error = new Error(ContractCallHelper.CALL_EXECUTE_ERROR.REVERT); vitest.spyOn(ContractCallHelper, "callExecute").mockRejectedValueOnce(error); - // Mock private saveGMP - const mockGMPApi = vitest.spyOn(AxelarGMPRecoveryAPI.prototype as any, "saveGMP"); - mockGMPApi.mockImplementation(() => Promise.resolve(undefined)); - const sourceTxHash = "0x86e5f91eff5a8a815e90449ca32e02781508f3b94620bbdf521f2ba07c41d9ae"; const response = await api.execute(sourceTxHash, undefined, evmWalletDetails); // Expect returns error expect(response).toEqual(ExecutionRevertedError(executeParams)); - - // Expect we don't call saveGMP api - expect(mockGMPApi).toHaveBeenCalledWith( - sourceTxHash, - new ethers.Wallet(evmWalletDetails.privateKey as string).address, - "", - response.error - ); }); test("it calls 'execute' and return revert error given 'callExecute' throws 'CALL_EXECUTE_ERROR.INSUFFICIENT_FUNDS' error", async () => { @@ -1557,23 +1545,11 @@ describe("AxelarGMPRecoveryAPI", () => { const error = new Error(ContractCallHelper.CALL_EXECUTE_ERROR.INSUFFICIENT_FUNDS); vitest.spyOn(ContractCallHelper, "callExecute").mockRejectedValueOnce(error); - // Mock private saveGMP - const mockGMPApi = vitest.spyOn(AxelarGMPRecoveryAPI.prototype as any, "saveGMP"); - mockGMPApi.mockImplementation(() => Promise.resolve(undefined)); - const sourceTxHash = "0x86e5f91eff5a8a815e90449ca32e02781508f3b94620bbdf521f2ba07c41d9ae"; const response = await api.execute(sourceTxHash, undefined, evmWalletDetails); // Expect returns error expect(response).toEqual(InsufficientFundsError(executeParams)); - - // Expect we don't call saveGMP api - expect(mockGMPApi).toHaveBeenCalledWith( - sourceTxHash, - new ethers.Wallet(evmWalletDetails.privateKey as string).address, - "", - response.error - ); }); test("it should call 'execute' and return success = true", async () => { @@ -1588,10 +1564,6 @@ describe("AxelarGMPRecoveryAPI", () => { // Mock contract call is successful vitest.spyOn(ContractCallHelper, "callExecute").mockResolvedValueOnce(contractReceiptStub()); - // Mock private saveGMP - const mockGMPApi = vitest.spyOn(AxelarGMPRecoveryAPI.prototype as any, "saveGMP"); - mockGMPApi.mockImplementation(() => Promise.resolve(undefined)); - const response = await api.execute( "0x86e5f91eff5a8a815e90449ca32e02781508f3b94620bbdf521f2ba07c41d9ae", undefined, @@ -1624,8 +1596,6 @@ describe("AxelarGMPRecoveryAPI", () => { }, }, }); - - expect(mockGMPApi).toHaveBeenCalledTimes(1); }); }); }); From 18137b2aee9b478284d06c2312cf2e2ac8ea4deb Mon Sep 17 00:00:00 2001 From: Canh Trinh Date: Fri, 9 Feb 2024 00:49:57 -0500 Subject: [PATCH 2/4] feat: add fraxtal testnet configs --- CHANGELOG.md | 1 + src/chains/supported-chains-list.ts | 1 + src/constants/EvmChain.ts | 1 + src/constants/GasToken.ts | 2 ++ src/libs/AxelarGateway.ts | 1 + src/libs/TransactionRecoveryApi/constants/chain/testnet.ts | 5 +++++ 6 files changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 508ebc64..87344636 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [0.13.10] - 2024-JANUARY-12 - Remove unused internal APIs +- Add Fraxtal testnet ## [0.13.8] - 2023-DECEMBER-18 diff --git a/src/chains/supported-chains-list.ts b/src/chains/supported-chains-list.ts index f3ac63ee..7fdb378e 100644 --- a/src/chains/supported-chains-list.ts +++ b/src/chains/supported-chains-list.ts @@ -20,6 +20,7 @@ export const CHAINS = { FANTOM: "Fantom", FETCH: "fetch", FILECOIN: "filecoin-2", + FRAXTAL: "fraxtal", HAQQ: "haqq", HERO: "hero", HIGHRISE: "highrise", diff --git a/src/constants/EvmChain.ts b/src/constants/EvmChain.ts index 37c228d4..e2c45c4e 100644 --- a/src/constants/EvmChain.ts +++ b/src/constants/EvmChain.ts @@ -22,4 +22,5 @@ export enum EvmChain { IMMUTABLE = "immutable", CENTRIFUGE_TESTNET = "centrifuge-2", CENTRIFUGE = "centrifuge", + FRAXTAL = "fraxtal", } diff --git a/src/constants/GasToken.ts b/src/constants/GasToken.ts index 0d50e9d8..e036d9dc 100644 --- a/src/constants/GasToken.ts +++ b/src/constants/GasToken.ts @@ -27,6 +27,7 @@ export enum GasToken { SEPOLIA = "ETH", ARBITRUM_SEPOLIA = "ETH", CENTRIFUGE = "CFG", + FRAXTAL = "frxETH", } export const nativeGasTokenSymbol: Record> = { @@ -53,6 +54,7 @@ export const nativeGasTokenSymbol: Record = { [EvmChain.ARBITRUM_SEPOLIA]: "https://sepolia-rollup.arbitrum.io/rpc", [EvmChain.CENTRIFUGE_TESTNET]: "https://node-7118620155331796992.gx.onfinality.io/jsonrpc?apikey=00538f2d-6297-44e3-8812-4b9d579524b2", + [EvmChain.FRAXTAL]: "https://rpc.testnet.frax.com", }; export const networkInfo: Record = { @@ -116,4 +117,8 @@ export const networkInfo: Record = { chainId: 13473, name: EvmChain.IMMUTABLE, }, + [EvmChain.FRAXTAL]: { + chainId: 2522, + name: EvmChain.FRAXTAL, + }, }; From 551e9b045155091859891b45ab62b8984ca30d56 Mon Sep 17 00:00:00 2001 From: Canh Trinh Date: Fri, 9 Feb 2024 00:50:05 -0500 Subject: [PATCH 3/4] 0.13.10 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5470a68f..cfe04039 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@axelar-network/axelarjs-sdk", - "version": "0.13.9", + "version": "0.13.10", "description": "The JavaScript SDK for Axelar Network", "repository": { "type": "git", From d54e4f4b72adfd8d7a29f0cd2977b4ef822432e0 Mon Sep 17 00:00:00 2001 From: Canh Trinh Date: Fri, 9 Feb 2024 00:50:56 -0500 Subject: [PATCH 4/4] chore: update changelog date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87344636..cecb4022 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -## [0.13.10] - 2024-JANUARY-12 +## [0.13.10] - 2024-FEBRUARY-9 - Remove unused internal APIs - Add Fraxtal testnet