From 9df5e6ef196c922a98c89455e6510708d04648ae Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 7 Jun 2024 14:31:58 +0800
Subject: [PATCH] 1

---
 .../web3bcspider/config/nets/13473/web3.json  |  2 +-
 server/web3service/controllers/jwt.js         |  8 ++++--
 server/web3sign/controllers/activate721nft.js | 25 +++++++++++++------
 third_party/j7                                |  2 +-
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/server/bin_dev/web3bcspider/config/nets/13473/web3.json b/server/bin_dev/web3bcspider/config/nets/13473/web3.json
index 730644d..f77b340 100644
--- a/server/bin_dev/web3bcspider/config/nets/13473/web3.json
+++ b/server/bin_dev/web3bcspider/config/nets/13473/web3.json
@@ -1,5 +1,5 @@
 {
   "user_address": "0x50A8e60041A206AcaA5F844a1104896224be6F39",
   "private_key": "0xd9ed33809372932059c1ba7b336a33f406b4c55e7430daef8297134c67429d60",
-  "block_server": "https://rpc.testnet.immutable.com."
+  "block_server": "https://rpc.testnet.immutable.com"
 }
diff --git a/server/web3service/controllers/jwt.js b/server/web3service/controllers/jwt.js
index f454897..f4ded84 100644
--- a/server/web3service/controllers/jwt.js
+++ b/server/web3service/controllers/jwt.js
@@ -10,7 +10,8 @@ const jwksKeyHash = {};
 async function refreshKey() {
   while (true) {
     const keyList = [];
-    jwksKeyHash.forEach((key, val) => {
+    Object.keys(jwksKeyHash).forEach((key) => {
+      const val = jwksKeyHash[key];
       if (utils.getUtcTime() - val['lastRefreshTime'] > 60 * 30) {
         keyList.push(val);
       }
@@ -51,6 +52,7 @@ async function asyncGetKey(jwksUri, header, cb) {
   try {
     if (jwksUri in jwksKeyHash) {
       const c = jwksKeyHash[jwksUri];
+      console.log(c['key']);
       cb(null, c['key']);
       return;
     }
@@ -59,10 +61,11 @@ async function asyncGetKey(jwksUri, header, cb) {
     });
     client.getSigningKey(header.kid, function(err, key) {
       try {
+        console.log(err, key);
         const signingKey = key.publicKey || key.rsaPublicKey;
         if (!err) {
           jwksKeyHash[jwksUri] = {
-            'key': key,
+            'key': signingKey,
             'uri': jwksUri,
             'header': header,
             'lastRefreshTime': utils.getUtcTime()
@@ -100,6 +103,7 @@ function asyncVerify(jwksUri, data) {
 }
 
 async function verify(session) {
+  console.log('aaaaaaaaaaaaaa');
   const postData = session.getBody();
   const jwksUri = postData['jwksUri'];
   //const arr = postData['data'].split('.');
diff --git a/server/web3sign/controllers/activate721nft.js b/server/web3sign/controllers/activate721nft.js
index 880e787..59f6c79 100644
--- a/server/web3sign/controllers/activate721nft.js
+++ b/server/web3sign/controllers/activate721nft.js
@@ -84,14 +84,15 @@ async function activate721Nft(session) {
       ]);
     const nonce = transId;
     const nftList = [
-      {
-        'tokenId': tokenId,
-        'isMint': true
-      }
+      [
+        tokenId,
+        true
+      ]
     ];
-    let nftListStr = '';
+    const nftListArr = [];
     nftList.forEach((item) => {
-      nftListStr += item['tokenId'].toString() + '0x01';
+      nftListArr.push(item[0].toString());
+      nftListArr.push('0x01');
     });
     const signature = await bc.soliditySha3Sign(
       account,
@@ -100,7 +101,17 @@ async function activate721Nft(session) {
       netId,
       nowTime,
       nonce,
-      ...nftListStr
+      ...nftListArr,
+    );
+    console.log(
+      account,
+      nftAddress,
+      thisContractAddress,
+      netId,
+      nowTime,
+      nonce,
+      nftListArr,
+      signature
     );
 
     let data = instance.methods.unlockOrMint
diff --git a/third_party/j7 b/third_party/j7
index da5693a..4b9a025 160000
--- a/third_party/j7
+++ b/third_party/j7
@@ -1 +1 @@
-Subproject commit da5693a00ff2c85613decb6737bb22e010c61162
+Subproject commit 4b9a0250b2957088fa0b20a8eaa3ea50b2e9b422