Merge pull request #70 from mysteriumnetwork/remove-reg-req-fees

Remove reg req fees

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysterium-vpn-js",
-  "version": "8.1.0",
+  "version": "9.0.0",
   "description": "Javascript SDK for Mysterium node",
   "keywords": [
     "mysterium",

src/fmt/money-formater.ts

@@ -5,7 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { Money, Currency } from '../proposal/payment-method'
+import { Currency } from '../proposal/payment-method'
+import { Money } from '../payment'
 
 export interface DisplayMoneyOptions {
   showCurrency?: boolean

src/identity/registration.ts

@@ -10,7 +10,6 @@ import { validateMultiple } from '../fmt/validation'
 export interface IdentityRegisterRequest {
   stake?: number
   beneficiary?: string
-  fee?: number
   referralToken?: string
 }
 

src/index.ts

@@ -44,9 +44,9 @@ export { ServiceLocation } from './proposal/service-location'
 export {
   PaymentMethod,
   PaymentMethodType,
-  Money,
   Currency,
   pricePerMinute,
+  pricePerHour,
   pricePerGiB,
 } from './proposal/payment-method'
 
@@ -78,7 +78,12 @@ export { TequilapiError, AxiosError } from './tequilapi-error'
 export { MMNReport, MMNApiKeyResponse, MMNReportResponse } from './mmn/mmn'
 export { Pageable } from './common/pageable'
 
-export { PaymentOrderResponse, PaymentOrderRequest, PaymentOrderOptionsResponse } from './payments'
+export {
+  Money,
+  PaymentOrderResponse,
+  PaymentOrderRequest,
+  PaymentOrderOptionsResponse,
+} from './payment'
 export { ReferralTokenResponse } from './referral'
 
 export default tequilapi

src/payments/index.ts → src/payment/index.ts

@@ -30,3 +30,8 @@ export interface PaymentOrderOptionsResponse {
   minimum: number
   suggested: number[]
 }
+
+export interface Money {
+  amount: number
+  currency: string
+}

src/proposal/payment-method.ts

@@ -4,6 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import { Money } from '../payment'
 
 export interface PaymentMethod {
   type: PaymentMethodType
@@ -19,11 +20,6 @@ export enum PaymentMethodType {
   Unsupported = 'UNSUPPORTED',
 }
 
-export interface Money {
-  amount: number
-  currency: string
-}
-
 export enum Currency {
   MYST = 'MYST',
   MYSTTestToken = 'MYSTT',
@@ -39,6 +35,14 @@ export const pricePerMinute = (pm?: PaymentMethod): Money => {
   }
 }
 
+export const pricePerHour = (p?: PaymentMethod): Money => {
+  const price = pricePerMinute(p)
+  return {
+    currency: price.currency,
+    amount: price.amount * 60,
+  }
+}
+
 const bytesInGiB = 1024 * 1024 * 1024
 
 export const pricePerGiB = (pm?: PaymentMethod): Money => {

src/tequilapi-client.ts

@@ -62,7 +62,12 @@ import {
 } from './transactor/settlement'
 import { IdentityCurrentRequest } from './identity/selection'
 import { AuthRequest, AuthResponse, ChangePasswordRequest } from './auth/auth'
-import { PaymentOrderOptionsResponse, PaymentOrderRequest, PaymentOrderResponse } from './payments'
+import {
+  Money,
+  PaymentOrderOptionsResponse,
+  PaymentOrderRequest,
+  PaymentOrderResponse,
+} from './payment'
 import { ReferralTokenResponse } from './referral'
 
 export const TEQUILAPI_URL = 'http://127.0.0.1:4050'
@@ -144,6 +149,7 @@ export interface TequilapiClient {
   getPaymentOrder(identity: string, orderId: number): Promise<PaymentOrderResponse>
   getPaymentOrderOptions(): Promise<PaymentOrderOptionsResponse>
   getPaymentOrderCurrencies(): Promise<string[]>
+  exchangeRate(quoteCurrency?: string): Promise<Money>
 
   getReferralToken(identity: string): Promise<ReferralTokenResponse>
 }
@@ -539,4 +545,9 @@ export class HttpTequilapiClient implements TequilapiClient {
   public async getReferralToken(identity: string): Promise<ReferralTokenResponse> {
     return this.http.get(`/identities/${identity}/referral`)
   }
+
+  public async exchangeRate(quoteCurrency = 'usd'): Promise<Money> {
+    const baseCurrency = 'myst'
+    return this.http.get(`/exchange/${baseCurrency}/${quoteCurrency}`)
+  }
 }

src/test-utils/empty-tequilapi-client-mock.ts

@@ -44,7 +44,12 @@ import {
 import { IdentityCurrentRequest } from '../identity/selection'
 import { IdentityBeneficiaryResponse } from '../identity/beneficiary'
 import { AuthRequest, AuthResponse, ChangePasswordRequest } from '../auth/auth'
-import { PaymentOrderOptionsResponse, PaymentOrderRequest, PaymentOrderResponse } from '../payments'
+import {
+  Money,
+  PaymentOrderOptionsResponse,
+  PaymentOrderRequest,
+  PaymentOrderResponse,
+} from '../payment'
 import { Terms, TermsRequest } from '../daemon/terms'
 import { ReferralTokenResponse } from '../referral'
 
@@ -298,4 +303,8 @@ export class EmptyTequilapiClientMock implements TequilapiClient {
   public async getReferralToken(identity: string): Promise<ReferralTokenResponse> {
     throw Error('Not implemented')
   }
+
+  public async exchangeRate(quoteCurrency?: string): Promise<Money> {
+    throw Error('Not implemented')
+  }
 }