diff --git a/.env.development b/.env.development index 32f711c..37b068d 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,9 @@ +### + # @LastEditors: John + # @Date: 2024-07-02 11:31:07 + # @LastEditTime: 2024-07-03 10:21:21 + # @Author: John +### ### # @LastEditors: John # @Date: 2024-06-18 10:12:21 @@ -8,6 +14,6 @@ VITE_BASE_URL= VITE_BASE_API_URL=/dev VITE_PARTICIPATE_CHAIN_ID=97 VITE_PURCHASED_CONTRACT_ADDRESS=0x7aAe4f2CA23482B58D6f9e8d1fBb5e413e7013c8 -VITE_RECEIVE_RAMB_CONTRACT_ADDRESS=0x8291A98382d751CdD52460A547eE94ceE8258930 +VITE_RECEIVE_RAMB_CONTRACT_ADDRESS=0x944fBF12c9b77BFfFA223CE1568F28820d319c2F VITE_NETWORK_USDT_ADDRESS=0xf9A18B7FC8Eb118f8Ad59fBD6eb1A181eaCb4E63 VITE_CHECK_TRANSACTION_DETAILS_URL=https://testnet.bscscan.com/ \ No newline at end of file diff --git a/.env.test b/.env.test index 24da1f6..3b3a9a3 100644 --- a/.env.test +++ b/.env.test @@ -1,13 +1,13 @@ ### # @LastEditors: John # @Date: 2024-06-24 18:38:45 - # @LastEditTime: 2024-07-02 16:49:31 + # @LastEditTime: 2024-07-03 10:21:32 # @Author: John ### VITE_BASE_URL=http://wwwtest.exgo.pro VITE_BASE_API_URL=http://wwwtest.exgo.pro VITE_PARTICIPATE_CHAIN_ID=97 VITE_PURCHASED_CONTRACT_ADDRESS=0x7aAe4f2CA23482B58D6f9e8d1fBb5e413e7013c8 -VITE_RECEIVE_RAMB_CONTRACT_ADDRESS=0x8291A98382d751CdD52460A547eE94ceE8258930 +VITE_RECEIVE_RAMB_CONTRACT_ADDRESS=0x944fBF12c9b77BFfFA223CE1568F28820d319c2F VITE_NETWORK_USDT_ADDRESS=0xf9A18B7FC8Eb118f8Ad59fBD6eb1A181eaCb4E63 VITE_CHECK_TRANSACTION_DETAILS_URL=https://testnet.bscscan.com/ \ No newline at end of file diff --git a/src/contract/abi/receive.json b/src/contract/abi/receive.json index 9393446..d20c331 100644 --- a/src/contract/abi/receive.json +++ b/src/contract/abi/receive.json @@ -144,6 +144,25 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "orderId", + "type": "uint256" + } + ], + "name": "getOrderStatus", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [], "name": "owner", @@ -159,7 +178,7 @@ }, { "inputs": [], - "name": "usdc", + "name": "RMAB", "outputs": [ { "internalType": "contract IERC20", diff --git a/src/contract/utils.ts b/src/contract/utils.ts index 7924ed5..ffc9ad9 100644 --- a/src/contract/utils.ts +++ b/src/contract/utils.ts @@ -1,7 +1,7 @@ /* * @LastEditors: John * @Date: 2024-06-19 15:48:57 - * @LastEditTime: 2024-07-02 17:40:49 + * @LastEditTime: 2024-07-03 10:44:58 * @Author: John */ import { config } from "@/components/WalletProvider"; @@ -303,7 +303,7 @@ export async function receiveRMABByContract( console.log("estimate gas:%d , my gas: %d", gas, gasPrice); writeContract(config, { abi: receiveAbi, - address: import.meta.env.VITE_PURCHASED_CONTRACT_ADDRESS, + address: import.meta.env.VITE_RECEIVE_RAMB_CONTRACT_ADDRESS, functionName: "reward", args: [amount, paymentTime, orderID, hashStr], gas: gasPrice,