@openocean.finance/wallet 0.4.29 → 0.4.30

package/lib/Wallets/SafePalWallet.js

@@ -101,10 +101,10 @@ var SafePalWallet = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!(window.ethereum && window.ethereum.isMetaMask)) {
-                            throw new Error(types_1.EnumErrors.NotMetamask);
+                        if (!window.safepalProvider) {
+                            throw new Error(types_1.EnumErrors.NoSafePal);
                         }
-                        this.sdk = new web3_1.default(window.ethereum);
+                        this.sdk = new web3_1.default(window.safepalProvider);
                         return [4 /*yield*/, this.sdk.eth.requestAccounts()];
                     case 1:
                         address = (_a.sent())[0];

package/lib/Wallets/TrustWallet.d.ts

@@ -7,12 +7,10 @@ declare class TrustWallet extends BaseWallet {
     supportChains: EnumChains[];
     type: EnumWalletType;
     sdk: Web3 | null;
-    infuraId?: string;
     /**
-     * connect metamask and get wallet address
+     * connect TrustWallet and get wallet address
      * @param chainId specific chainId,throw error when not match
-     * @param config
      */
-    requestConnect(chainId?: number, config?: any): Promise<string>;
+    requestConnect(chainId?: number): Promise<string>;
 }
 export default TrustWallet;

package/lib/Wallets/TrustWallet.js

@@ -14,17 +14,6 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -76,7 +65,6 @@ var trust_svg_1 = __importDefault(require("../assets/trust.svg"));
 var types_1 = require("../types");
 var BaseWallet_1 = __importDefault(require("./BaseWallet"));
 var web3_1 = __importDefault(require("web3"));
-var web3_provider_1 = __importDefault(require("@walletconnect/web3-provider"));
 var TrustWallet = /** @class */ (function (_super) {
     __extends(TrustWallet, _super);
     function TrustWallet() {
@@ -96,61 +84,36 @@ var TrustWallet = /** @class */ (function (_super) {
             types_1.EnumChains.Optimism,
             types_1.EnumChains.Boba,
             types_1.EnumChains.Moonriver,
-            types_1.EnumChains.Aurora,
             types_1.EnumChains.Cronos,
             types_1.EnumChains.Harmony
         ];
-        _this.type = types_1.EnumWalletType.WalletConnect;
+        _this.type = types_1.EnumWalletType.Extension;
         _this.sdk = null;
         return _this;
     }
     /**
-     * connect metamask and get wallet address
+     * connect TrustWallet and get wallet address
      * @param chainId specific chainId,throw error when not match
-     * @param config
      */
-    TrustWallet.prototype.requestConnect = function (chainId, config) {
-        if (chainId === void 0) { chainId = 1; }
+    TrustWallet.prototype.requestConnect = function (chainId) {
         return __awaiter(this, void 0, void 0, function () {
-            var provider, currentChainId, address;
+            var address, currentChainId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!this.infuraId) {
-                            throw new Error("infuraId not set");
+                        if (!window.trustwallet) {
+                            throw new Error(types_1.EnumErrors.NoTrustWallet);
                         }
-                        provider = new web3_provider_1.default(__assign({ infuraId: this.infuraId, chainId: chainId, rpc: {
-                                69: "https://kovan.optimism.io",
-                                420: "https://goerli.optimism.io",
-                                10: "https://mainnet.optimism.io",
-                                25: "https://evm.cronos.org",
-                                56: "https://bsc-dataseed1.binance.org",
-                                66: "https://exchainrpc.okex.org",
-                                100: "https://rpc.xdaichain.com",
-                                128: "https://http-mainnet.hecochain.com",
-                                137: "https://rpc-mainnet.maticvigil.com",
-                                250: "https://rpcapi.fantom.network",
-                                288: "https://mainnet.boba.network",
-                                1285: "https://rpc.moonriver.moonbeam.network",
-                                42161: "https://arb1.arbitrum.io/rpc",
-                                421611: "https://rinkeby.arbitrum.io/rpc",
-                                43114: "https://api.avax.network/ext/bc/C/rpc",
-                                1313161554: "https://mainnet.aurora.dev",
-                                1666600000: "https://api.harmony.one",
-                            } }, config));
-                        return [4 /*yield*/, provider.enable()];
+                        this.sdk = new web3_1.default(window.trustwallet);
+                        return [4 /*yield*/, this.sdk.eth.requestAccounts()];
                     case 1:
-                        _a.sent();
-                        this.sdk = new web3_1.default(provider);
+                        address = (_a.sent())[0];
                         return [4 /*yield*/, this.sdk.eth.getChainId()];
                     case 2:
                         currentChainId = _a.sent();
                         if (chainId && currentChainId !== chainId) {
                             throw new Error(types_1.EnumErrors.ChainIdNotMath);
                         }
-                        return [4 /*yield*/, this.sdk.eth.getAccounts()];
-                    case 3:
-                        address = (_a.sent())[0];
                         this.address = address;
                         this.chainId = currentChainId;
                         return [2 /*return*/, address];

package/lib/types.d.ts

@@ -103,7 +103,9 @@ export declare enum EnumErrors {
     NoBrave = "40025",
     NoCryptoCom = "40026",
     NoBitKeep = "40027",
-    NoBlocto = "40028"
+    NoBlocto = "40028",
+    NoSafePal = "40028",
+    NoTrustWallet = "40029"
 }
 export interface ConnectResult {
     chain: EnumChains;

package/lib/types.js

@@ -107,4 +107,6 @@ var EnumErrors;
     EnumErrors["NoCryptoCom"] = "40026";
     EnumErrors["NoBitKeep"] = "40027";
     EnumErrors["NoBlocto"] = "40028";
+    EnumErrors["NoSafePal"] = "40028";
+    EnumErrors["NoTrustWallet"] = "40029";
 })(EnumErrors = exports.EnumErrors || (exports.EnumErrors = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openocean.finance/wallet",
-  "version": "0.4.29",
+  "version": "0.4.30",
   "description": "A multi-chain wallets manager",
   "main": "lib/index.js",
   "scripts": {