Skip to content

Commit

Permalink
Update @nimiq/utils and @nimiq/vue-components to make FiatApi provide…
Browse files Browse the repository at this point in the history
…r configurable

CoinGecko is becoming increasingly strict with unauthenticated access to their
API without API key. For example, wallet.nimiq.com has already been blocked from
unauthenticated access, thus the Wallet has been switched to CryptoCompare as
fiat api provider, while hub.nimiq.com and keyguard.nimiq.com are not currently
blocked. I.e. in the Hub, we don't have to switch yet. If we switch the Hub's
FiatApi provider in PaymentInfoLine, we should also switch it in the Keyguard's
PaymentInfoLine, which is a bit more work though. For this reason, we keep the
Hub and Keyguard on CoinGecko for now, but remove the CoinGecko proxy / custom
API URL, as this one has been shut down.
  • Loading branch information
danimoh committed Jul 8, 2024
1 parent bdc2096 commit d3d3a6e
Show file tree
Hide file tree
Showing 13 changed files with 91 additions and 74 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@nimiq/oasis-api": "^1.1.1",
"@nimiq/rpc": "^0.4.1",
"@nimiq/style": "^0.8.2",
"@nimiq/utils": "^0.5.2",
"@nimiq/utils": "^0.11.1",
"@nimiq/vue-components": "https://github.com/nimiq/vue-components#build/hub",
"@opengsn/common": "^2.2.5",
"@sentry/vue": "^6.0.0",
Expand Down
4 changes: 3 additions & 1 deletion src/components/CheckoutCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ import { Static } from '../lib/StaticStore';
import StatusScreen from './StatusScreen.vue';
import CheckoutServerApi, { GetStateResponse } from '../lib/CheckoutServerApi';
import { PaymentInfoLine } from '@nimiq/vue-components';
import { ERROR_REQUEST_TIMED_OUT, HISTORY_KEY_SELECTED_CURRENCY } from '../lib/Constants';
import { ERROR_REQUEST_TIMED_OUT, HISTORY_KEY_SELECTED_CURRENCY, FIAT_API_PROVIDER } from '../lib/Constants';
import { PaymentState } from '../../client/PublicRequestTypes';
export default class CheckoutCard<
Parsed extends AvailableParsedPaymentOptions,
> extends Vue {
private static readonly FIAT_API_PROVIDER = FIAT_API_PROVIDER; // used in templates of child classes
protected optionTimeout: number = -1;
@Prop(Object) protected paymentOptions!: Parsed;
Expand Down
4 changes: 2 additions & 2 deletions src/components/CheckoutCardEthereum.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { createEthereumRequestLink } from '@nimiq/utils';
import { Currency, createEthereumRequestLink } from '@nimiq/utils';
import { ParsedEtherDirectPaymentOptions } from '../lib/paymentOptions/EtherPaymentOptions';
import CheckoutCardExternal from './CheckoutCardExternal.vue';
import { FormattableNumber } from '@nimiq/utils';
Expand All @@ -13,7 +13,7 @@ export default class CheckoutCardEthereum
const paymentOptions = this.paymentOptions;
const protocolSpecific = paymentOptions.protocolSpecific;
if (!protocolSpecific.recipient) return '#';
return createEthereumRequestLink(protocolSpecific.recipient, {
return createEthereumRequestLink(protocolSpecific.recipient, Currency.ETH, {
amount: paymentOptions.amount,
gasLimit: protocolSpecific.gasLimit,
gasPrice: protocolSpecific.gasPrice,
Expand Down
1 change: 1 addition & 0 deletions src/components/CheckoutCardExternal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
amount: request.fiatAmount,
currency: request.fiatCurrency,
} : null"
:fiatApiProvider="constructor.FIAT_API_PROVIDER"
:vendorMarkup="paymentOptions.vendorMarkup"
:networkFee="paymentOptions.fee"
:address="typeof paymentOptions.protocolSpecific.recipient === 'object'
Expand Down
1 change: 1 addition & 0 deletions src/components/CheckoutCardNimiq.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
amount: request.fiatAmount,
currency: request.fiatCurrency,
} : null"
:fiatApiProvider="constructor.FIAT_API_PROVIDER"
:vendorMarkup="paymentOptions.vendorMarkup"
:networkFee="paymentOptions.fee"
:address="paymentOptions.protocolSpecific.recipient
Expand Down
4 changes: 4 additions & 0 deletions src/components/CheckoutManualPaymentDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
amount: request.fiatAmount,
currency: request.fiatCurrency,
} : null"
:fiatApiProvider="constructor.FIAT_API_PROVIDER"
:vendorMarkup="paymentOptions.vendorMarkup"
:networkFee="paymentOptions.fee"
:address="typeof paymentOptions.protocolSpecific.recipient === 'object'
Expand Down Expand Up @@ -52,6 +53,7 @@ import {
PaymentInfoLine,
} from '@nimiq/vue-components';
import { State as RpcState } from '@nimiq/rpc';
import { FIAT_API_PROVIDER } from '../lib/Constants';
import { Static } from '../lib/StaticStore';
import { AvailableParsedPaymentOptions, ParsedCheckoutRequest } from '../lib/RequestTypes';
import CheckoutServerApi from '../lib/CheckoutServerApi';
Expand All @@ -66,6 +68,8 @@ import CheckoutServerApi from '../lib/CheckoutServerApi';
class CheckoutManualPaymentDetails<
Parsed extends AvailableParsedPaymentOptions,
> extends Vue {
private static readonly FIAT_API_PROVIDER = FIAT_API_PROVIDER;
@Prop({
type: Array,
required: true,
Expand Down
Loading

0 comments on commit d3d3a6e

Please sign in to comment.