update claimToken

Author: CoNETProject

src/localServer/testMinerV2.ts

@@ -305,7 +305,8 @@ const connectToGossipNode = async ( wallet: ethers.Wallet ) => {
 
 const start = (privateKeyArmor: string) => new Promise(async resolve => {
 	const wallet = new ethers.Wallet(privateKeyArmor)
-	connectToGossipNode(wallet)
+	await connectToGossipNode(wallet)
+	resolve (true)
 })
 
 

src/localServer/workers/encrypt.ts

@@ -722,6 +722,10 @@ const processCmd = async (cmd: worker_command) => {
 			return recoverAccount(cmd)
 		}
 
+		case 'claimToken': {
+			return claimToken (cmd)
+		}
+
 		case 'getAllProfiles': {
 			const profiles = CoNET_Data?.profiles
 			if (!profiles) {

src/localServer/workers/utilities/miningV2.ts

@@ -458,4 +458,74 @@ const CONETianPlan_purchase = async (referrer: string, profile: profile, amount:
         return resolve(false)
     }
 	return resolve(true)
-})
+})
+
+const claimAdmin = '0xD7fa7D7316C0de4538c7033c503Bee8Ad2AA338d'
+
+const approveClaimToken = async (profile: profile, token: CryptoAsset) => {
+	const getContract = getClaimableAddress(token.name)
+	if (!getContract) {
+		return false
+	}
+	const wallet = new ethers.Wallet(profile.privateKeyArmor, provideCONET)
+	const amount = ethers.parseEther (token.balance)
+	const approveContract = new ethers.Contract (getContract, cCNTP_ABI, wallet)
+	try {
+		const tx = await approveContract.approve(claimAdmin, amount)
+		return tx
+	} catch (ex) {
+		return false
+	}
+}
+
+const getTokenByName = (tokens: conet_tokens, tokenName: string) => {
+	const tokensKeys = Object.keys(tokens)
+	const tokensIndex = tokensKeys.findIndex(n => tokens[n].name === tokenName)
+	if (tokensIndex < 0) {
+		return null
+	}
+	return tokens[tokensKeys[tokensIndex]]
+}
+
+const claimToken = async (cmd: worker_command) => {
+	if (!cmd?.data?.length) {
+		cmd.err = 'INVALID_DATA'
+		return returnUUIDChannel(cmd)
+	}
+
+	const _profile: profile = cmd.data[0]
+	const tokenName = cmd.data[1]
+
+	if (!_profile?.keyID || !tokenName ) {
+		cmd.err = 'INVALID_DATA'
+		return returnUUIDChannel(cmd)
+	}
+
+	const profile = getProfileFromKeyID (_profile.keyID)
+
+	if (!profile) {
+		cmd.err = 'INVALID_DATA'
+		return returnUUIDChannel(cmd)
+	}
+
+	const tokens = profile.tokens
+	if (!tokens) {
+		cmd.err = 'INVALID_DATA'
+		return returnUUIDChannel(cmd)
+	}
+
+	const conetBalance = parseFloat(tokens.conet?.balance || '0')
+	const token = getTokenByName (tokens, tokenName)
+	if (conetBalance< 0.0001 || !token) {
+		await getFaucet(profile)
+		cmd.err = 'INVALID_DATA'
+		return returnUUIDChannel(cmd)
+	}
+	
+	const  tx = await approveClaimToken (profile, token)
+	if (!tx) {
+		cmd.err = 'INVALID_DATA'
+		return returnUUIDChannel(cmd)
+	}
+	
+}

src/localServer/workers/utilities/smartContractABI.ts

@@ -2932,6 +2932,25 @@ const cCNTP_ABI = [
         "name": "Transfer",
         "type": "event"
     },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "name": "adminList",
+        "outputs": [
+            {
+                "internalType": "bool",
+                "name": "",
+                "type": "bool"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
     {
         "inputs": [
             {
@@ -2999,6 +3018,19 @@ const cCNTP_ABI = [
         "stateMutability": "view",
         "type": "function"
     },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "value",
+                "type": "uint256"
+            }
+        ],
+        "name": "bronCNTP",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
     {
         "inputs": [
             {
@@ -3043,32 +3075,94 @@ const cCNTP_ABI = [
                 "type": "bool"
             }
         ],
-        "name": "changeAddressInWhitelist",
+        "name": "changeAddressInAdminlist",
         "outputs": [],
         "stateMutability": "nonpayable",
         "type": "function"
     },
+    {
+        "inputs": [],
+        "name": "decimals",
+        "outputs": [
+            {
+                "internalType": "uint8",
+                "name": "",
+                "type": "uint8"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
     {
         "inputs": [
             {
-                "internalType": "bool",
-                "name": "_rule",
-                "type": "bool"
+                "internalType": "address",
+                "name": "to",
+                "type": "address"
+            },
+            {
+                "internalType": "uint256",
+                "name": "value",
+                "type": "uint256"
             }
         ],
-        "name": "changeWhitelistRule",
+        "name": "initAccount",
         "outputs": [],
         "stateMutability": "nonpayable",
         "type": "function"
     },
     {
-        "inputs": [],
-        "name": "decimals",
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "name": "initV2",
         "outputs": [
             {
-                "internalType": "uint8",
+                "internalType": "bool",
                 "name": "",
-                "type": "uint8"
+                "type": "bool"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "name": "latestBronBlockNumber",
+        "outputs": [
+            {
+                "internalType": "uint256",
+                "name": "",
+                "type": "uint256"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "name": "latestBronValue",
+        "outputs": [
+            {
+                "internalType": "uint256",
+                "name": "",
+                "type": "uint256"
             }
         ],
         "stateMutability": "view",
@@ -3183,38 +3277,6 @@ const cCNTP_ABI = [
         ],
         "stateMutability": "nonpayable",
         "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "",
-                "type": "address"
-            }
-        ],
-        "name": "whiteList",
-        "outputs": [
-            {
-                "internalType": "bool",
-                "name": "",
-                "type": "bool"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "whitelistRule",
-        "outputs": [
-            {
-                "internalType": "bool",
-                "name": "",
-                "type": "bool"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
     }
 ]
 

src/localServer/workers/utilities/utilV2.ts

@@ -404,7 +404,8 @@ const prePurchase = async (cmd) => {
 
 const nodePrice = 1250
 
-const claimAdmin = '0x418833b70F882C833EF0F0Fcee3FB9d89C79d47C'
+
+
 const getClaimableAddress = (CONET_claimableName) => {
     switch (CONET_claimableName) {