payment-kit 1.17.12 → 1.18.0

package/api/src/integrations/arcblock/stake.ts

@@ -4,7 +4,6 @@ import assert from 'assert';
 
 import { isEthereumDid } from '@arcblock/did';
 import { toStakeAddress } from '@arcblock/did-util';
-import env from '@blocklet/sdk/lib/env';
 import { BN, fromUnitToToken, toBN } from '@ocap/util';
 
 import { Op } from 'sequelize';
@@ -26,10 +25,6 @@ export async function ensureStakedForGas() {
 
       try {
         const { state: account } = await client.getAccountState({ address: wallet.address });
-        if (!account) {
-          const hash = await client.declare({ moniker: env.appNameSlug, wallet });
-          logger.info(`declared app on chain ${host}`, { hash });
-        }
 
         const address = toStakeAddress(wallet.address, wallet.address);
         const { state: stake } = await client.getStakeState({ address });

package/api/src/routes/payment-methods.ts

@@ -116,7 +116,7 @@ router.post('/', auth, async (req, res) => {
         blockNumber,
       });
     } catch (err) {
-      logger.error('verify ethereum api endpoint failed', err);
+      logger.error(`verify ${paymentType} api endpoint failed`, err);
       return res.status(400).json({ error: err.message });
     }
 
@@ -295,6 +295,33 @@ router.put('/:id', auth, async (req, res) => {
     if ('logo' in method.dataValues || raw.logo !== undefined) {
       updateData.logo = raw.logo ?? method.logo;
     }
+    const updateSettings = 'settings' in req.body ? req.body.settings : null;
+    if (EVM_CHAIN_TYPES.includes(method.type as string) && updateSettings) {
+      const paymentType = method.type as EVMChainType;
+      if (!updateSettings[paymentType]?.api_host) {
+        return res.status(400).json({ error: `${paymentType} api_host is required` });
+      }
+      if (!updateSettings[paymentType]?.explorer_host) {
+        return res.status(400).json({ error: `${paymentType} explorer_host is required` });
+      }
+      if (!updateSettings[paymentType]?.native_symbol) {
+        return res.status(400).json({ error: `${paymentType} native_symbol is required` });
+      }
+      try {
+        const provider = new ethers.JsonRpcProvider(updateSettings[paymentType]?.api_host);
+        const [network, blockNumber] = await Promise.all([provider.getNetwork(), provider.getBlockNumber()]);
+        updateSettings[paymentType]!.chain_id = network.chainId.toString();
+        logger.info(`${paymentType} api endpoint verified`, {
+          settings: updateSettings[paymentType],
+          network,
+          blockNumber,
+        });
+      } catch (err) {
+        logger.error(`verify ${paymentType} api endpoint failed`, err);
+        return res.status(400).json({ error: err.message });
+      }
+      updateData.settings = pick(PaymentMethod.encryptSettings(updateSettings), [paymentType]) as PaymentMethodSettings;
+    }
     const updatedMethod = await method.update(updateData);
     return res.json(updatedMethod);
   } catch (err) {

package/blocklet.yml

@@ -14,7 +14,7 @@ repository:
   type: git
   url: git+https://github.com/blocklet/payment-kit.git
 specVersion: 1.2.8
-version: 1.17.12
+version: 1.18.0
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.17.12",
+  "version": "1.18.0",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -53,7 +53,7 @@
     "@arcblock/validator": "^1.19.3",
     "@blocklet/js-sdk": "^1.16.37",
     "@blocklet/logger": "^1.16.37",
-    "@blocklet/payment-react": "1.17.12",
+    "@blocklet/payment-react": "1.18.0",
     "@blocklet/sdk": "^1.16.37",
     "@blocklet/ui-react": "^2.11.27",
     "@blocklet/uploader": "^0.1.64",
@@ -121,7 +121,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.37",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.17.12",
+    "@blocklet/payment-types": "1.18.0",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -167,5 +167,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "da4588c387abaed2109c591b8e08661ae90c8f3c"
+  "gitHead": "052c301e1f565558766c9346ba355f2fd072108e"
 }

package/src/components/payment-method/form.tsx

@@ -11,15 +11,15 @@ import BaseMethodForm from './base';
 
 PaymentMethodForm.defaultProps = {
   action: 'create',
-  activeKeys: [],
+  editableKeys: [],
 };
 
 export default function PaymentMethodForm({
   action,
-  activeKeys,
+  editableKeys,
 }: {
   action?: 'create' | 'edit';
-  activeKeys?: string[];
+  editableKeys?: string[];
 }) {
   const { t } = useLocaleContext();
   const { control, setValue } = useFormContext();
@@ -28,7 +28,7 @@ export default function PaymentMethodForm({
 
   const checkDisabled = (key: string) => {
     if (action === 'edit') {
-      return !activeKeys?.includes(key);
+      return !editableKeys?.includes(key);
     }
     return false;
   };

package/src/components/uploader.tsx

@@ -151,7 +151,7 @@ Uploader.defaultProps = {
   preview: '',
   maxFileSize: undefined,
   maxNumberOfFiles: 1,
-  allowedFileExts: ['.png', '.jpeg', '.webp'],
+  allowedFileExts: ['.png', '.jpeg', '.webp', '.svg', '.jpg'],
   disabled: false,
 };
 

package/src/pages/admin/settings/payment-methods/edit.tsx

@@ -63,7 +63,18 @@ export default function PaymentMethodEdit({ onClose, value }: { onClose: () => v
         </Button>
       }>
       <FormProvider {...methods}>
-        <PaymentMethodForm action="edit" activeKeys={['name', 'description', 'logo']} />
+        <PaymentMethodForm
+          action="edit"
+          editableKeys={[
+            'name',
+            'description',
+            'logo',
+            'settings.base.api_host',
+            'settings.base.explorer_host',
+            'settings.ethereum.api_host',
+            'settings.ethereum.explorer_host',
+          ]}
+        />
       </FormProvider>
     </DrawerForm>
   );