@pioneer-platform/eth-network 8.1.68 → 8.1.69

package/lib/index.js

@@ -361,17 +361,16 @@ var check_airdrop_claim = function (address) {
         });
     });
 };
-//get_token_transfer_data
 var get_token_transfer_data = function (toAddress, amount, contract) {
     return __awaiter(this, void 0, void 0, function () {
-        var tag, minABI, newContract, decimals, value, tokenData, e_4;
+        var tag, minABI, newContract, decimalPlaces, amountInWei, decimals, amountInSmallestUnit, amountHex, amountHexPadded, tokenData, e_4;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     tag = TAG + " | get_token_transfer_data | ";
                     _a.label = 1;
                 case 1:
-                    _a.trys.push([1, 4, , 5]);
+                    _a.trys.push([1, 3, , 4]);
                     minABI = [
                         // balanceOf
                         {
@@ -393,36 +392,100 @@ var get_token_transfer_data = function (toAddress, amount, contract) {
                     newContract = new web3.eth.Contract(minABI, contract);
                     return [4 /*yield*/, newContract.methods.decimals().call()];
                 case 2:
-                    decimals = _a.sent();
-                    value = web3.utils.toBN(amount).mul(web3.utils.toBN(10).pow(web3.utils.toBN(decimals)));
-                    log.info(tag, "value: ", value.toString());
-                    log.info(tag, "value: ", value);
-                    return [4 /*yield*/, web3.eth.abi.encodeFunctionCall({
-                            name: 'transfer',
-                            type: 'function',
-                            inputs: [
-                                {
-                                    type: 'address',
-                                    name: '_to'
-                                },
-                                {
-                                    type: 'uint256',
-                                    name: '_value'
-                                }
-                            ]
-                        }, [toAddress, value])];
-                case 3:
-                    tokenData = _a.sent();
+                    decimalPlaces = _a.sent();
+                    amountInWei = web3.utils.toWei(amount, 'ether');
+                    decimals = web3.utils.toBN(decimalPlaces);
+                    amountInSmallestUnit = web3.utils.toBN(amountInWei).mul(web3.utils.toBN(10).pow(decimals));
+                    amountHex = amountInSmallestUnit.toString(16);
+                    amountHexPadded = amountHex.padStart(64, '0');
+                    tokenData = web3.eth.abi.encodeFunctionCall({
+                        name: 'transfer',
+                        type: 'function',
+                        inputs: [
+                            {
+                                type: 'address',
+                                name: '_to'
+                            },
+                            {
+                                type: 'uint256',
+                                name: '_value'
+                            }
+                        ]
+                    }, [toAddress, amountInSmallestUnit.toString()]);
                     return [2 /*return*/, tokenData];
-                case 4:
+                case 3:
                     e_4 = _a.sent();
                     console.error(tag, e_4);
-                    return [3 /*break*/, 5];
-                case 5: return [2 /*return*/];
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
             }
         });
     });
 };
+// //get_token_transfer_data
+// const get_token_transfer_data = async function(toAddress:string, amount:string, contract:string){
+// 	let tag = TAG + " | get_token_transfer_data | "
+// 	try{
+//
+// 		let minABI = [
+// 			// balanceOf
+// 			{
+// 				"constant": true,
+// 				"inputs": [{ "name": "_owner", "type": "address" }],
+// 				"name": "balanceOf",
+// 				"outputs": [{ "name": "balance", "type": "uint256" }],
+// 				"type": "function"
+// 			},
+// 			// decimals
+// 			{
+// 				"constant": true,
+// 				"inputs": [],
+// 				"name": "decimals",
+// 				"outputs": [{ "name": "", "type": "uint8" }],
+// 				"type": "function"
+// 			}
+// 		];
+// 		const newContract = new web3.eth.Contract(minABI, contract);
+// 		const decimalPlaces = await newContract.methods.decimals().call();
+// 		//
+// 		// // @ts-ignore
+// 		// let value = parseInt(amount/Math.pow(10, decimals))
+// 		// //const adjustedValue = value.mul(web3.utils.toBN(10).pow(web3.utils.toBN(decimals)));
+// 		//
+// 		// log.info(tag, "adjustedValue: ", value.toString());
+//
+// 		// Calculate the amount in the token's smallest unit
+// 		const amountInWei = web3.utils.toWei(amount, 'ether');
+// 		const decimals = web3.utils.toBN(decimalPlaces);
+// 		const amountInSmallestUnit = web3.utils.toBN(amountInWei).mul(web3.utils.toBN(10).pow(decimals));
+//
+// // Convert the amount to a hexadecimal string
+// 		const amountHex = amountInSmallestUnit.toString(16);
+//
+// // Pad the hexadecimal string with zeros to 64 characters
+// 		const amountHexPadded = amountHex.padStart(64, '0');
+//
+// 		//parse to prescision?
+// 		let tokenData = await web3.eth.abi.encodeFunctionCall({
+// 			name: 'transfer',
+// 			type: 'function',
+// 			inputs: [
+// 				{
+// 					type: 'address',
+// 					name: '_to'
+// 				},
+// 				{
+// 					type: 'uint256',
+// 					name: '_value'
+// 				}
+// 			]
+// 		}, [toAddress, amountInSmallestUnit]);
+//
+// 		return tokenData
+// 	}catch(e){
+// 		console.error(tag,e)
+// 	}
+// }
 var get_symbol_from_contract = function (address) {
     return __awaiter(this, void 0, void 0, function () {
         var tag, contract, tokenName, e_5;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pioneer-platform/eth-network",
-  "version": "8.1.68",
+  "version": "8.1.69",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "scripts": {