From 51d8d820fb021fbd19a2f8233890fdcd0f6a27ac Mon Sep 17 00:00:00 2001 From: kaushalrajbacancy <78725072+kaushalrajbacancy@users.noreply.github.com> Date: Tue, 29 Aug 2023 15:24:17 +0530 Subject: [PATCH] Fixed release failed issue (#24) * Fixed release failed issue * Changed project-key as compulsory * Changed graphqlEndpoint as optional * Set graphqlEndpoint from networkConfig --- .eslintignore | 4 +++- package-lock.json | 12 ++++++------ package.json | 4 ++-- src/sdk/common/rxjs/object.subject.ts | 11 +++++++++++ src/sdk/data/data.service.ts | 9 ++++----- src/sdk/interfaces.ts | 2 +- src/sdk/network/interfaces.ts | 2 +- src/sdk/sdk.ts | 2 -- 8 files changed, 28 insertions(+), 18 deletions(-) diff --git a/.eslintignore b/.eslintignore index b0cdb55..c223dc2 100644 --- a/.eslintignore +++ b/.eslintignore @@ -2,4 +2,6 @@ node_modules dist coverage __snapshots__ -src/sdk/contracts/**/*.ts \ No newline at end of file +src/sdk/contracts/**/*.ts +src/sdk/base/HttpRpcClient.ts +src/sdk/state/state.service.ts \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 755aa2f..3f2dc52 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@etherspot/prime-sdk", - "version": "1.1.7", + "version": "1.1.8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@etherspot/prime-sdk", - "version": "1.1.7", + "version": "1.1.8", "license": "MIT", "dependencies": { "@apollo/client": "3.4.0", @@ -34,7 +34,7 @@ "eslint-plugin-import": "2.20.2", "npm": "9.6.4", "ts-node": "8.10.2", - "typescript": "3.9.3" + "typescript": "4.5.2" } }, "node_modules/@apollo/client": { @@ -7470,9 +7470,9 @@ } }, "node_modules/typescript": { - "version": "3.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.3.tgz", - "integrity": "sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==", + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz", + "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/package.json b/package.json index 0266930..4bd4beb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@etherspot/prime-sdk", - "version": "1.1.7", + "version": "1.1.8", "description": "Etherspot Prime (Account Abstraction) SDK", "keywords": [ "ether", @@ -75,6 +75,6 @@ "dotenv": "16.0.3", "npm": "9.6.4", "ts-node": "8.10.2", - "typescript": "3.9.3" + "typescript": "4.5.2" } } diff --git a/src/sdk/common/rxjs/object.subject.ts b/src/sdk/common/rxjs/object.subject.ts index 94dfb5a..87883da 100644 --- a/src/sdk/common/rxjs/object.subject.ts +++ b/src/sdk/common/rxjs/object.subject.ts @@ -25,6 +25,17 @@ export class ObjectSubject extends Be } } + nextData(value: T): void { + if (!value) { + super.next('' as any); + } else if ( + !this.value || // + !deepCompare(this.prepareForCompare(this.value), this.prepareForCompare(value)) + ) { + super.next(this.prepareForNext(value)); + } + } + prepareForNext(value: T): T { return value; } diff --git a/src/sdk/data/data.service.ts b/src/sdk/data/data.service.ts index 0eac4d1..dc3aec1 100644 --- a/src/sdk/data/data.service.ts +++ b/src/sdk/data/data.service.ts @@ -6,9 +6,9 @@ import { BigNumber } from 'ethers'; import { CrossChainServiceProvider, LiFiBridge } from './constants'; export class DataService extends Service { - readonly currentProject$ = new ObjectSubject(null); + readonly currentProject$ = new ObjectSubject(''); - constructor(currentProject: string = null) { + constructor(currentProject = '') { super(); this.switchCurrentProject(currentProject); } @@ -19,8 +19,7 @@ export class DataService extends Service { get headers(): { [key: string]: any } { let result: { [key: string]: any } = {}; - - if (this.currentProject) { + if (this.currentProject || this.currentProject === '') { const key = this.currentProject; result = { @@ -32,7 +31,7 @@ export class DataService extends Service { } switchCurrentProject(currentProject: string): string { - this.currentProject$.next(currentProject); + this.currentProject$.nextData(currentProject); return this.currentProject; } diff --git a/src/sdk/interfaces.ts b/src/sdk/interfaces.ts index 74d145e..27f4ec6 100644 --- a/src/sdk/interfaces.ts +++ b/src/sdk/interfaces.ts @@ -14,6 +14,6 @@ export interface SdkOptions { bundlerRpcUrl?: string; rpcProviderUrl?: string; graphqlEndpoint?: string; - projectKey? : string; + projectKey: string; paymasterApi?: PaymasterApi; } diff --git a/src/sdk/network/interfaces.ts b/src/sdk/network/interfaces.ts index 2f8f901..6cf6844 100644 --- a/src/sdk/network/interfaces.ts +++ b/src/sdk/network/interfaces.ts @@ -16,5 +16,5 @@ export interface NetworkConfig { use: boolean; url: string; }; - graphqlEndpoint: string; + graphqlEndpoint?: string; }; diff --git a/src/sdk/sdk.ts b/src/sdk/sdk.ts index d7cc18c..6c283e0 100644 --- a/src/sdk/sdk.ts +++ b/src/sdk/sdk.ts @@ -43,9 +43,7 @@ export class PrimeSdk { const networkConfig = getNetworkConfig(chainId); optionsLike.bundlerRpcUrl = networkConfig.bundler; if (optionsLike.bundlerRpcUrl == '') throw new Exception('No bundler Rpc provided'); - optionsLike.graphqlEndpoint = networkConfig.graphqlEndpoint; - if (optionsLike.graphqlEndpoint == '') throw new Exception('No graphql endpoint provided'); }