feat: Manage Nervos DAO with multisig address #3298
Conversation
| generateMultisigDaoClaimTx({ | ||
| withdrawingOutPoint: record.outPoint, | ||
| depositOutPoint: record.depositOutPoint, | ||
| feeRate: `${MEDIUM_FEE_RATE}`, |
There was a problem hiding this comment.
Is there no sugested fee rate here?
| feeRate: string = '0', | ||
| lockClass = { | ||
| lockArgs: [''], | ||
| codeHash: SystemScriptInfo.SECP_CODE_HASH, | ||
| hashType: ScriptHashType.Type, | ||
| }, | ||
| multisigConfig?: MultisigConfigModel | ||
| ): Promise<Transaction> => { | ||
| const secpCellDep = await SystemScriptInfo.getInstance().getSecpCellDep() | ||
| let cellDep: CellDep | ||
| if (lockClass.codeHash === SystemScriptInfo.MULTI_SIGN_CODE_HASH) { | ||
| cellDep = await SystemScriptInfo.getInstance().getMultiSignCellDep() | ||
| } else { | ||
| cellDep = await SystemScriptInfo.getInstance().getSecpCellDep() | ||
| } |
There was a problem hiding this comment.
The lockClass is unnecessary here because multisigConfig includes a blake160s property, which serves the same purpose as lockArgs in lockClass
There was a problem hiding this comment.
The lockClass is still needed in subsequent processing
| export const useOnWithdrawDialogSubmit = ({ | ||
| activeRecord, | ||
| setActiveRecord, | ||
| clearGeneratedTx, | ||
| walletID, | ||
| dispatch, | ||
| suggestFeeRate, | ||
| multisigConfig, | ||
| }: { |
There was a problem hiding this comment.
It is recommended to rename useOnWithdrawDialogSubmit to useGenerateDaoWithdrawTx and rename clearGeneratedTx to onGenerateFailed for clearer
|
I guess it will be better to back to the multisig address table after the send success dialog opens and closes |
| multisigConfig.n | ||
| ) | ||
|
|
||
| const multiSignBlake160 = script.args.slice(0, 42) |
There was a problem hiding this comment.
The args has been sliced at https://github.com/nervosnetwork/neuron/blob/develop/packages/neuron-wallet/src/models/multisig.ts#L29
|
|
||
| const multiSignBlake160 = script.args.slice(0, 42) | ||
|
|
||
| logger.info('getMultisigDaoCells---multiSignBlake160----', multiSignBlake160) |
There was a problem hiding this comment.
If this is a debug log, remove it. Or print it in a better format.
| @@ -285,6 +286,75 @@ export default class CellsService { | |||
| return cells | |||
| } | |||
|
|
|||
| public static async getMultisigDaoCells(multisigConfig: MultisigConfigModel): Promise<Cell[]> { | |||
There was a problem hiding this comment.
Could we refactor this function https://github.com/nervosnetwork/neuron/blob/develop/packages/neuron-wallet/src/services/cells.ts#L226 to get the DaoCells with lock args?
| @@ -815,6 +894,121 @@ export default class TransactionSender { | |||
| return tx | |||
| } | |||
|
|
|||
| public withdrawFromMultisigDao = async ( | |||
There was a problem hiding this comment.
Too many duplicated code with https://github.com/nervosnetwork/neuron/blob/develop/packages/neuron-wallet/src/services/transaction-sender.ts#L707
| ? Script.fromSDK( | ||
| Multisig.getMultisigScript(multisigConfig.blake160s, multisigConfig.r, multisigConfig.m, multisigConfig.n) | ||
| ) |
There was a problem hiding this comment.
What is the difference between Multisig.getMultisigScript's return type and Script.fromSDK's return type?
| type: AppActions.RequestPassword, | ||
| payload: { | ||
| walletID: wallet.id, | ||
| actionType: multisigConfig.m === 1 ? 'send-from-multisig-need-one' : 'send-from-multisig', |
There was a problem hiding this comment.
This can be verified using the getMultisigSignStatus result named canBroadcastAfterSign.
Magickbase/neuron-public-issues#425
Screen-2025-01-16-050516.mp4