add payment generator

Author: Neo

example/mvm.js

@@ -1,5 +1,6 @@
 const { Client,
-  extraGeneratorByInfo,
+  extraGeneratByInfo,
+  paymentGeneratByInfo,
   getMvmTransaction,
   getAssetIDByAddress,
   getContractByAssetID,
@@ -12,7 +13,7 @@ const client = new Client(keystore)
 
 async function main() {
   // 1.1 使用参数进行生成 extra
-  const extra = extraGeneratorByInfo({
+  const extra = extraGeneratByInfo({
     contractAddress: '0x4f31E2eAF25DCDD46651AcE019B61E3E750023E0', // 要调用的合约地址
     methodName: 'addAny', // 要调用的合约方法
     types: ['uint256'], // 参数类型列表
@@ -49,4 +50,20 @@ async function main() {
   console.log(userAddress) // 0xc49E0F42A844273E41F0d00e8C2406468b55AFEa
 }
 
+async function paymentTest() {
+  const t = await paymentGeneratByInfo({
+    contractAddress: '0x4883Ae7CB5c3Cf9219Aeb02d010F2F6Ef353C40c',
+    methodName: 'addAny',
+    types: ['uint256'],
+    values: ['11'],
+    payment: {
+      type: 'tx'
+    }
+  })
+
+  const tx = await client.transaction(t)
+  console.log(t)
+  console.log(tx)
+}
+
 main()

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mixin-node-sdk",
-  "version": "3.0.24",
+  "version": "3.0.25",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

src/client/index.ts

@@ -82,6 +82,7 @@ export {
   getMvmTransaction,
   abiParamsGenerator,
   extraGeneratByInfo,
+  paymentGeneratByInfo,
   getContractByAssetID,
   getContractByUserIDs,
   getAssetIDByAddress,
@@ -257,7 +258,7 @@ export class Client
 
   // Pin...
   verifyPin!: (pin: string) => Promise<void>;
-  modifyPin!: (pin: string, newPin: string) => Promise<void>;
+  modifyPin!: (pin: string, oldPin?: string) => Promise<void>;
   readTurnServers!: () => Promise<Turn[]>;
 
   // Snapshot...

src/client/mvm.ts

@@ -1,4 +1,4 @@
-import { TransactionInput, InvokeCodeParams, ExtraGeneratParams } from "../types"
+import { TransactionInput, InvokeCodeParams, ExtraGeneratParams, Payment, PaymentGeneratParams } from "../types"
 import { v4 as newUUID, parse, stringify } from 'uuid'
 import { Encoder } from "../mixin/encoder"
 import { base64url } from "../mixin/sign"
@@ -12,6 +12,10 @@ const OperationPurposeGroupEvent = 1
 // const OperationPurposeAddProcess = 11
 // const OperationPurposeCreditProcess = 12
 
+const mvmClient = axios.create({
+  baseURL: 'https://mvm-api.test.mixinbots.com',
+})
+
 const receivers = [
   "a15e0b6d-76ed-4443-b83f-ade9eca2681a",
   "b9126674-b07d-49b6-bf4f-48d965b2242b",
@@ -60,18 +64,18 @@ export const extraGeneratByInfo = async (params: ExtraGeneratParams): Promise<st
   if (!methodID) methodID = getMethodIdByAbi(methodName!, types)
   if (types.length != values.length) return Promise.reject('error: types.length!=values.length')
   let extra = contractAddress + methodID
-  let opcode: number = 0
-  const { uploadkey, delegatecall, process = registryProcess, address = registryAddress } = options
+  const { uploadkey, delegatecall, ignoreUpload, process = registryProcess, address = registryAddress } = options
   if (types.length !== 0) {
     const abiCoder = new utils.AbiCoder()
     extra += abiCoder.encode(types, values).slice(2)
   }
-  const memo = encodeMemo(extra, process)
-  if (memo.length > 200) {
+  if (ignoreUpload) return extra
+  let opcode: number = 0
+  if (encodeMemo(extra, process).length > 200) {
     if (!uploadkey) return Promise.reject('please provide key to generate extra(length > 200)')
     const raw = '0x' + extra
     const key = utils.keccak256(raw)
-    const res = await axios.post(`https://mvm-api.test.mixinbots.com/`, { uploadkey, key, raw, address })
+    const res = await mvmClient.post(`/`, { uploadkey, key, raw, address })
     if (!res.data.hash) return Promise.reject(res)
     opcode += 1
     extra = key.slice(2)
@@ -80,11 +84,23 @@ export const extraGeneratByInfo = async (params: ExtraGeneratParams): Promise<st
   return ('0' + opcode + extra).toLowerCase()
 }
 
+export const paymentGeneratByInfo = async (params: PaymentGeneratParams): Promise<Payment> => {
+  if (!params.options) params.options = {}
+  params.options.ignoreUpload = true
+  const extra = await extraGeneratByInfo(params)
+  const { type, trace, asset, amount } = params.payment || {}
+  const { process, delegatecall, uploadkey, address } = params.options
+  const res = await mvmClient.post('/payment', {
+    extra,
+    process, delegatecall, uploadkey, address,
+    type, trace, asset, amount
+  })
+  return res.data
+}
 
 export const getContractByAssetID = (id: string, processAddress = registryAddress): Promise<string> =>
   getRegistryContract(processAddress).contracts('0x' + Buffer.from(parse(id) as Buffer).toString('hex'))
 
-
 export const getContractByUserIDs = (ids: string | string[], threshold?: number, processAddress = registryAddress): Promise<string> => {
   if (typeof ids === 'string') ids = [ids]
   if (!threshold) threshold = ids.length

src/types/mvm.ts

@@ -10,25 +10,39 @@ export interface InvokeCodeParams {
   process?: string
 }
 
-export interface ExtraGeneratOptions {
-  uploadkey?: string // auto upload params
-  delegatecall?: boolean // use delegatecall
-  process?: string // registry process
-  address?: string // registry address
-}
-
-export interface ExtraGeneratParams {
+interface ContractParams {
   contractAddress: string
   methodName?: string
   types?: string[]
   values?: any[]
-  options?: ExtraGeneratOptions
   methodID?: string
 }
 
+export interface ExtraGeneratParams extends ContractParams {
+  options: {
+    delegatecall?: boolean // use delegatecall
+    process?: string // registry process
+    address?: string // registry address
+    uploadkey?: string // auto upload params
+
+    ignoreUpload?: boolean // ignore upload params
+  }
+}
+
+export interface PaymentGeneratParams extends ExtraGeneratParams {
+  extra?: string,
+  payment: {
+    asset?: string
+    amount?: string
+    trace?: string
+    type?: 'payment' | 'tx' // payment or tx, default is payment
+  }
+}
+
 
 export interface MvmClientRequest {
   getMvmTransaction(params: InvokeCodeParams): TransactionInput
   abiParamsGenerator(contractAddress: string, abi: JsonFragment[]): { [method: string]: Function }
-  extraGeneratorByInfo(params: ExtraGeneratParams, options: ExtraGeneratOptions): string
+  extraGeneratByInfo(params: ExtraGeneratParams): string
+  paymentGeneratByInfo(params: PaymentGeneratParams): string
 }