From 5222536fbd610aa7a58b3d69b137ce2beab3d544 Mon Sep 17 00:00:00 2001 From: bingshi <1196225782@qq.com> Date: Tue, 8 Nov 2022 16:25:25 +0800 Subject: [PATCH 1/2] update main.js --- js/main.js | 149 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 65 deletions(-) diff --git a/js/main.js b/js/main.js index dbae2be..b43409c 100644 --- a/js/main.js +++ b/js/main.js @@ -6,9 +6,8 @@ console.log(">>begin load wallet main file"); */ function initWallet(funId, type, chain) { - // chain = chain || 80001 - type = 0 - chain = 1338 + type = parseInt(type) + chain = parseInt(chain) try { var wallet; if (!window.jc || !jc.wallet) { @@ -163,40 +162,28 @@ function createAccount(funId) { * @return {string} account actived */ function importAccount(funId, privateKey) { - // try { - // let address = jc.wallet.importAccount(privateKey); - // return JSON.stringify({ - // errcode: 0, - // data: address, - // }); - // } catch (err) { - // return JSON.stringify({ - // errcode: 1, - // errmsg: err, - // }); - // } - let addresses = ["0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1","0xCd36bFD6f5c9685A5b1DD953E8279eeC7d41e1E1","0xb3212b66C337F83D277172D891Daf31776FF9D79"] - let values = ["1024168356010420","0","110241683560010039000000000000000134390000000000000003020000000000000000000000","1667381156"] - let signature = '0x5788bc2812b31165aff7c344321076b55d61f84ee1cb064f12fac3cea7cfbbd03f180a2228b4cce665a00d52fd08c10e3e09d1bf22a008c999bd72dcb372f6fb1b' - jc.wallet.jcStandard - .buyNft721({ - addresses, - values, - signature, - }) - .then((result) => { - jsb.jcCallback( - funId, - JSON.stringify({ - errcode: 0, - data: result, - }) - ); - }) - .catch((err) => { - console.log(JSON.stringify(err)) - jsb.jcCallback(funId,JSON.stringify({errcode: 1,errmsg: err})); + try { + let address = jc.wallet.importAccount(privateKey); + return JSON.stringify({ + errcode: 0, + data: address, }); + } catch (err) { + return JSON.stringify({ + errcode: 1, + errmsg: err, + }); + } + // jc.wallet.erc20Standard.transfer({ + // address: '0xC76c692450d6221A8B1E035CB8bdB639bC60658D', + // from: '0x50A8e60041A206AcaA5F844a1104896224be6F39', + // to: '0x746338765a8FbDD1c5aB61bfb92CD6D960C3C662', + // amount: 101 + // }).then((res) => { + // console.log(JSON.stringify(res)) + // }).catch(err => { + // console.log(JSON.stringify(err)) + // }) } /** * active one account @@ -400,9 +387,8 @@ function signOutGoogle(funId) { //} function buyNft721(funId, addresses, values, signature) { - addresses = ["0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1","0xCd36bFD6f5c9685A5b1DD953E8279eeC7d41e1E1","0xb3212b66C337F83D277172D891Daf31776FF9D79"] - values = ["1024168356010499","0","110241683560010039000000000000000134390000000000000003020000000000000000000000","1667381156"] - signature = '0x4278d777d25fa96bb9733dd6c924adf9a79a88de60c684894f29f02c739ff79231d62ecd10d9a07121d88f6719f6b49814fc2e9438a03a46e6bf0def5c1e3ad71b' + addresses = JSON.parse(addresses) + values = JSON.parse(values) jc.wallet.jcStandard .buyNft721({ addresses, @@ -414,7 +400,7 @@ function buyNft721(funId, addresses, values, signature) { funId, JSON.stringify({ errcode: 0, - data: result, + data: JSON.stringify(result), }) ); }) @@ -424,6 +410,11 @@ function buyNft721(funId, addresses, values, signature) { } function buyNft1155(funId, addresses, values, ids, amounts, signature) { + addresses = JSON.parse(addresses) + values = JSON.parse(values) + ids = JSON.parse(ids) + amounts = JSON.parse(amounts) + jc.wallet.jcStandard .buyNft1155({ addresses, @@ -437,7 +428,7 @@ function buyNft1155(funId, addresses, values, ids, amounts, signature) { funId, JSON.stringify({ errcode: 0, - data: result, + data: JSON.stringify(result), }) ); }) @@ -454,7 +445,7 @@ function evolveNft721( nonce, signature ) { - { + tokenIds = JSON.parse(tokenIds) jc.wallet.jcStandard .evolve721NFT({ nftAddress, @@ -468,17 +459,17 @@ function evolveNft721( funId, JSON.stringify({ errcode: 0, - data: result, + data: JSON.stringify(result), }) ); }) .catch((err) => { jsb.jcCallback(funId,JSON.stringify({errcode: 1,errmsg: err})); }); - } } function evolveChip(funId, tokenIds, startTime, nonce, signature) { + tokenIds = JSON.parse(tokenIds) jc.wallet.jcStandard .evolveChip({ tokenIds, @@ -491,7 +482,7 @@ function evolveChip(funId, tokenIds, startTime, nonce, signature) { funId, JSON.stringify({ errcode: 0, - data: result, + data: JSON.stringify(result), }) ); }) @@ -508,6 +499,9 @@ function mintShardBatchUser( nonce, signature ) { + tokenIds = JSON.parse(tokenIds) + amounts = JSON.parse(amounts) + jc.wallet.jcStandard .mintShardBatchUser({ tokenIds, @@ -521,7 +515,7 @@ function mintShardBatchUser( funId, JSON.stringify({ errcode: 0, - data: result, + data: JSON.stringify(result), }) ); }) @@ -542,6 +536,9 @@ function shardMixByUser( nonce, signature ) { + ids = JSON.parse(ids) + amounts = JSON.parse(amounts) + jc.wallet.jcStandard .shardMixByUser({ tokenId, @@ -559,52 +556,74 @@ function shardMixByUser( funId, JSON.stringify({ errcode: 0, - data: result, + data: JSON.stringify(result), }) ); }) .catch((err) => { jsb.jcCallback(funId,JSON.stringify({errcode: 1,errmsg: err})); }); +} +// addresses: [nftId, chip, sign_address] +// values: [token_id,salt_nonce,startTime] +// chipIds: [...chipIds] function pluginChip( funId, - nftAddress, - chipAddress, - nftId, - chipIds + addresses, + values, + chipIds, + slots, + signature ) { + addresses = JSON.parse(addresses) + values = JSON.parse(values) + chipIds = JSON.parse(chipIds) + slots = JSON.parse(slots) + jc.wallet.jcStandard .pluginChip({ - nftAddress, - chipAddress, - nftId, - chipIds + addresses, + values, + chipIds, + slots, + signature }) .then((result) => { - jsb.jcCallback(funId,JSON.stringify({errcode: 0,data: result})); + jsb.jcCallback(funId,JSON.stringify({errcode: 0,data: JSON.stringify(result)})); }) .catch((err) => { jsb.jcCallback(funId,JSON.stringify({errcode: 1,errmsg: err})); }); } +// addresses: [nftId, chip, sign_address] +// values: [token_id,salt_nonce,startTime] +// chipIds: [...chipIds] function unplugChip( funId, - nftAddress, - chipAddress, - nftId, - chipIds + addresses, + values, + chipIds, + slots, + signature ) { + + addresses = JSON.parse(addresses) + values = JSON.parse(values) + chipIds = JSON.parse(chipIds) + slots = JSON.parse(slots) + jc.wallet.jcStandard .unplugChip({ - nftAddress, - chipAddress, - nftId, - chipIds + addresses, + values, + chipIds, + slots, + signature }) .then((result) => { - jsb.jcCallback(funId,JSON.stringify({errcode: 0,data: result})); + jsb.jcCallback(funId,JSON.stringify({errcode: 0,data: JSON.stringify(result)})); }) .catch((err) => { jsb.jcCallback(funId,JSON.stringify({errcode: 1,errmsg: err})); From a84783c148ae8f31bacb6fec42d48ed21acac63f Mon Sep 17 00:00:00 2001 From: bingshi <1196225782@qq.com> Date: Tue, 8 Nov 2022 16:26:00 +0800 Subject: [PATCH 2/2] 11 --- .idea/.name | 1 + .idea/compiler.xml | 2 +- .idea/gradle.xml | 3 ++- .idea/misc.xml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 .idea/.name diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..70f598f --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +HeadlessCocos \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 61a9130..fb7f4a8 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index dcf70cf..223130a 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -8,11 +8,12 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 1b62f22..6199cc2 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - +