refactor: move on-chain stuff to the right place

src/app/creator/build/[type]/AppliedModal.tsx

@@ -29,12 +29,12 @@ import Loader from '@/components/Loader';
 import { Modal } from '@/components/Modal';
 import { Confirm } from '@/components/Modal/Confirm';
 import { NoData } from '@/components/NoData';
-import { writeBountyAbiActions } from '@/constants/abis/bounty';
 import { BOUNTY_SUPPORTED_CHAIN } from '@/constants/chain';
 import { contracts, payTokens } from '@/constants/contract';
 import { useAllowance, useApprove } from '@/hooks/useERC20';
 import { parseTokenUnits } from '@/utils/web3';
 
+import { createTask } from '#/domain/bounty/repository';
 import { EXPERIENCE_OPTIONS } from '#/lib/user';
 import { denyBuilder, approveBuilder } from '#/services/creator';
 import { useCreatorBountyBuilders } from '#/services/creator/hooks';
@@ -142,7 +142,7 @@ export function AppliedModal({ open, closeModal, bounty, applyCallback }) {
 
   const write = async () => {
     try {
-      const { hash } = await writeBountyAbiActions.createTask(_contracts.bounty, [
+      const { hash } = await createTask(_contracts.bounty, [
         bounty.task,
         currUser?.user_wallet,
         payToken.address,

src/app/creator/build/[type]/ManageModal.js

@@ -24,14 +24,13 @@ import { useNetwork, useWalletClient } from 'wagmi';
 import { Button } from '@/components/Button';
 import { Modal } from '@/components/Modal';
 import { NoData } from '@/components/NoData';
-import { withdraw } from '@/constants/bounty';
 import { BOUNTY_SUPPORTED_CHAIN } from '@/constants/chain';
 import { contracts, payTokens } from '@/constants/contract';
 import { currentTime, fromNow } from '@/utils/date';
 import { formatTime } from '@/utils/date';
 import { parseTokenUnits, signBounty } from '@/utils/web3';
 
-import { requestTermination } from '#/domain/bounty/repository';
+import { requestTermination, withdraw } from '#/domain/bounty/repository';
 import {
   getProgressList,
   finishConfirm,

src/shared/constants/abis/bounty.ts → src/domain/bounty/helper/abi.ts

@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-import { abiContractFactory } from '#/shared/utils/abiContractFactory';
-
-export const BountyABI = [
+const abi = [
   { inputs: [], stateMutability: 'nonpayable', type: 'constructor' },
   { inputs: [], name: 'AlreadyExists', type: 'error' },
   { inputs: [], name: 'AlreadyWithdrawn', type: 'error' },
@@ -205,6 +203,4 @@ export const BountyABI = [
   },
 ] as const;
 
-export const { readActions: readBountyAbiActions, writeActions: writeBountyAbiActions } = abiContractFactory(BountyABI);
-
-export default BountyABI;
+export default abi;

src/domain/bounty/repository.js → src/domain/bounty/repository.ts

@@ -14,9 +14,18 @@
  * limitations under the License.
  */
 
+import { waitForTransaction } from '@wagmi/core';
+
 import { PAGE_SIZE } from '@/constants/config';
+import { contracts, payTokens } from '@/constants/contract';
 import { isInteger, merge } from '@/utils';
+import { createContractActions } from '@/utils/contract';
 import httpClient from '@/utils/http';
+import { parseTokenUnits } from '@/utils/web3';
+
+import bountyAbi from './helper/abi';
+
+const { writeActions: { createTask, withdraw: withdrawFromAbi } } = createContractActions(bountyAbi);
 
 function resolveSkipped(page, size = PAGE_SIZE) {
   let resolved = Number(page);
@@ -28,7 +37,7 @@ function resolveSkipped(page, size = PAGE_SIZE) {
   return (resolved - 1) * size;
 }
 
-async function fetchList(params = {}) {
+async function fetchList(params = {} as any) {
   const { page = 1, sort, ...others } = params;
 
   return httpClient.get('/build/general/bounties', {
@@ -59,13 +68,13 @@ async function fetchBuilderListForCreator(id, params) {
   return httpClient.get(`/build/creator/bounties/${id}/builders`, { params });
 }
 
-async function fetchPublishedBountyList(params = {}) {
+async function fetchPublishedBountyList(params = {} as any) {
   const { userId, ...others } = params;
 
   return fetchList({ ...others, team_uid: userId  });
 }
 
-async function fetchAppliedBountyList(params = {}) {
+async function fetchAppliedBountyList(params = {} as any) {
   const { userId, sort, ...others } = params;
 
   return httpClient.get(`/build/dashboard/bounties/public/${userId}`, {
@@ -77,9 +86,25 @@ async function requestTermination(id, data) {
   return httpClient.post(`/build/creator/bounties/${id}/status/termination/propose`, data);
 }
 
+async function withdraw(walletClient, chainId, taskId, amount, deadline, signature) {
+  try {
+    const { hash } = await withdrawFromAbi(contracts[chainId].bounty, [
+      taskId,
+      parseTokenUnits(amount.toString(), payTokens[chainId].usdt.decimals).toBigInt(),
+      deadline,
+      signature,
+    ]);
+    const wait = await waitForTransaction({ hash });
+    return { hash, wait };
+  } catch {
+    return { hash: 'error', wait: null };
+  }
+}
+
 export {
   fetchList, fetchOne, applyOne,
   fetchActivityList, fetchBuilderList, fetchBuilderListForCreator,
   fetchPublishedBountyList, fetchAppliedBountyList,
   requestTermination,
+  createTask, withdraw,
 };

src/domain/bounty/widgets/process-list/AgreeFinishedModal.js

@@ -20,14 +20,14 @@ import {  useNetwork, useWalletClient } from 'wagmi';
 
 import { Button } from '@/components/Button';
 import { Modal } from '@/components/Modal';
-import { withdraw } from '@/constants/bounty';
 
 import {
   finishConfirm,
   finishDeny,
 } from '#/services/bounties';
 
 import { useBountyEnvCheck } from '../../hooks';
+import { withdraw } from '../../repository';
 
 function AgreeFinishedModal({open, close, bounty, revalidatePathAction}) {
   const [loading, setLoading] = useState(false);

src/domain/bounty/widgets/process-list/AppliedModal.tsx

@@ -29,10 +29,9 @@
 import { parseTokenUnits } from '@/utils/web3';
 
 import { approveBuilder } from '#/services/creator';
-import { writeBountyAbiActions } from '#/shared/constants/abis/bounty';
 
 import { useBountyEnvCheck } from '../../hooks';
-import { fetchBuilderListForCreator } from '../../repository';
+import { fetchBuilderListForCreator, createTask } from '../../repository';
 import AppliedBuilderListView from '../../views/applied-builder-list';
 
 function AppliedModal({ open, closeModal, bounty, revalidatePathAction }) {
@@ -77,7 +76,7 @@
 
   const write = useCallback(async() => {
     try {
-      const { hash } = await writeBountyAbiActions.createTask(_contracts.bounty, [
+      const { hash } = await createTask(_contracts.bounty, [
         bounty.task,
         currUser?.user_wallet,
         payToken.address,
@@ -104,7 +103,7 @@
       setApproveConfirmLoading(false);
       toast.error(err.message);
     }
   }, [_contracts, approveConfirmIds, bounty, currUser, payToken, updateList]);
 
   const approveConfirm = useCallback(async () => {
     setApproveConfirmLoading(true);

src/shared/constants/abis/erc20ABI.ts → src/domain/crypto/repository.ts

@@ -16,6 +16,8 @@
 
 import { erc20ABI } from '@wagmi/core';
 
-import { abiContractFactory } from '#/shared/utils/abiContractFactory';
+import { createContractActions } from '@/utils/contract';
 
-export const { readActions: readErc20AbiActions, writeActions: writeErc20AbiActions } = abiContractFactory(erc20ABI);
+const { writeActions: { transfer: transferToken } } = createContractActions(erc20ABI);
+
+export { transferToken };

src/domain/reputation/helper/nftAbi.ts → src/domain/reputation/helper/abi.ts

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import { abiContractFactory } from '#/shared/utils/abiContractFactory';
-
 const abi = [
   {
     inputs: [],
@@ -787,6 +785,4 @@ const abi = [
   },
 ] as const;
 
-export const { readActions: readNftAbiActions, writeActions: writeNftAbiActions } = abiContractFactory(abi);
-
 export default abi;

src/domain/reputation/repository.ts

@@ -17,12 +17,14 @@
 import { TransactionBlock } from '@mysten/sui.js/transactions';
 import { waitForTransaction } from '@wagmi/core';
 
+import { createContractActions } from '@/utils/contract';
 import httpClient from '@/utils/http';
 
 import type { Address } from '@wagmi/core';
 
-import { writeNftAbiActions } from './helper/nftAbi';
+import nftAbi from './helper/abi';
 
+const { writeActions: { safeMint } } = createContractActions(nftAbi);
 
 async function fetchGainedReputationList(userId) {
   return httpClient.get(`/nft/general/public/${userId}/infos`);
@@ -65,7 +67,7 @@ async function mintNft({
 
   const signed = signRes.data;
 
-  const { hash } = await writeNftAbiActions.safeMint(contract, [
+  const { hash } = await safeMint(contract, [
     address,
     id,
     userId,

src/entry/pages/course-detail/RightCard.tsx

@@ -36,7 +36,7 @@ import { parseTokenUnits } from '@/utils/web3';
 
 import { enrollOne, updateTransaction } from '#/domain/challenge/repository';
 import DatePlaceWidget from '#/domain/challenge/widgets/date-place';
-import { writeErc20AbiActions } from '#/shared/constants/abis/erc20ABI';
+import { transferToken } from '#/domain/crypto/repository';
 // import { currentTime } from '@/utils/date'
 import { useMediaUrl } from '#/state/application/hooks';
 
@@ -308,7 +308,7 @@ export default function LearnRightCard({
       //   args: [toAddress, _amount],
       // })
 
-      const { hash } = await writeErc20AbiActions.transfer(
+      const { hash } = await transferToken(
         data.challenges_extra?.course_challenges_extra_feeds_contract,
         [toAddress, _amount.toBigInt()],
       );

src/shared/utils/abiContractFactory.ts → src/shared/utils/contract.ts

@@ -19,7 +19,7 @@ import { readContract, writeContract } from '@wagmi/core';
 import type { Address, ReadContractConfig, ReadContractResult, WriteContractPreparedArgs, WriteContractResult } from '@wagmi/core';
 import type { Abi, ExtractAbiFunctionNames } from 'abitype';
 
-export function abiContractFactory<
+export function createContractActions<
   TAbi extends Abi,
   ViewFunctionNames extends ExtractAbiFunctionNames<TAbi, 'view' | 'pure'>,
   WriteFunctionNames extends ExtractAbiFunctionNames<TAbi, 'payable' | 'nonpayable'>,