升级chain33 sdk至3.1.0

joying-admin/src/main/java/com/fzm/admin/schedule/CopyrightTask.java

@@ -150,7 +150,8 @@ public class CopyrightTask {
                         NftVo detail = nftService.getDetail(nftHash);
                         String newTokenInfo = appendTokenInfo(tokenInfo, detail.getCopyright());
                         log.info("追加tokenInfo, 新生成后的tokenInfo为: {}", newTokenInfo);
-                        String hash = paraChainClient.evmSetTokenInfo(abi, contractAddr, 0, nft.getTokenId(), newTokenInfo, nft.getPublishAddress(), null, true);
+                        String hash = paraChainClient.evmSetTokenInfo(abi, contractAddr, 0,
+                                nft.getTokenId(), newTokenInfo, nft.getPublishAddress(), null, true, false);
                         if (StringUtils.isBlank(hash)) {
                             log.error("nft追加tokenInfo失败,当前流水号为: 【{}】,交易哈希:【{}】", serial_code, hash);
                             continue;

joying-common/pom.xml

@@ -68,7 +68,7 @@
         <dependency>
             <groupId>cn.fzm.chain</groupId>
             <artifactId>simple-sdk</artifactId>
-            <version>2.9.6</version>
+            <version>3.1.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.google.guava</groupId>

joying-common/src/main/java/com/fzm/common/service/impl/CommemorateNftServiceImpl.java

@@ -88,11 +88,11 @@ public class CommemorateNftServiceImpl extends ServiceImpl<CommemorateNftMapper,
         log.info("加密上链数据: {}", tokenInfo);
         // 发行nft
         long tokenId = getTokenId();
-        String hash = paraChainClient.evmPublishToken(abi, contractAddr, EvmTokenEnum.ERC1155, 0L, wallet, wallet, privkey, tokenId, 1, str, true);
+        String hash = paraChainClient.evmPublishToken(abi, contractAddr, EvmTokenEnum.ERC1155, 0L, wallet, wallet, privkey, tokenId, 1, str, true, false);
         if (StringUtils.isBlank(hash)) {
             throw GlobalException.newException(ResultCode.FAILED, "nft发行失败");
         }
-        String tradeHash = paraChainClient.evmSetTokenInfo(abi, contractAddr, 1000000L, tokenId, tokenInfo, wallet, privkey, true);
+        String tradeHash = paraChainClient.evmSetTokenInfo(abi, contractAddr, 1000000L, tokenId, tokenInfo, wallet, privkey, true, false);
         if (StringUtils.isBlank(tradeHash)) {
             throw GlobalException.newException(ResultCode.PUBLISH_ERROR, "nft发行失败");
         }
@@ -142,7 +142,8 @@ public class CommemorateNftServiceImpl extends ServiceImpl<CommemorateNftMapper,
             String abi = "[{\"inputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"bool\",\"name\":\"approved\",\"type\":\"bool\"}],\"name\":\"ApprovalForAll\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256[]\",\"name\":\"ids\",\"type\":\"uint256[]\"},{\"indexed\":false,\"internalType\":\"uint256[]\",\"name\":\"values\",\"type\":\"uint256[]\"}],\"name\":\"TransferBatch\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"id\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"}],\"name\":\"TransferSingle\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"string\",\"name\":\"value\",\"type\":\"string\"},{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"id\",\"type\":\"uint256\"}],\"name\":\"URI\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"id\",\"type\":\"uint256\"}],\"name\":\"balanceOf\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"accounts\",\"type\":\"address[]\"},{\"internalType\":\"uint256[]\",\"name\":\"ids\",\"type\":\"uint256[]\"}],\"name\":\"balanceOfBatch\",\"outputs\":[{\"internalType\":\"uint256[]\",\"name\":\"\",\"type\":\"uint256[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"tokenId\",\"type\":\"uint256\"}],\"name\":\"getTokenInfo\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"}],\"name\":\"isApprovedForAll\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"tokenId\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"mintToken\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256[]\",\"name\":\"ids\",\"type\":\"uint256[]\"},{\"internalType\":\"uint256[]\",\"name\":\"amounts\",\"type\":\"uint256[]\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"safeBatchTransferFrom\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"id\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"safeTransferFrom\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"operator\",\"type\":\"address\"},{\"internalType\":\"bool\",\"name\":\"approved\",\"type\":\"bool\"}],\"name\":\"setApprovalForAll\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"tokenId\",\"type\":\"uint256\"},{\"internalType\":\"string\",\"name\":\"tokenInfo\",\"type\":\"string\"}],\"name\":\"setTokenInfo\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes4\",\"name\":\"interfaceId\",\"type\":\"bytes4\"}],\"name\":\"supportsInterface\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"uri\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]";
             String tokenInfo = paraChainClient.evmGetTokenInfo(abi, contractAddr, commemorateNft.getTokenId(), commemorateNft.getPublishAddress());
             // 领取纪念版nft
-            String hash = paraChainClient.evmTransfer(abi, contractAddr, EvmTokenEnum.ERC1155, 1000000L, user.getWallet(), commemorateNft.getTokenId(), 1, tokenInfo, commemorateNft.getPublishAddress(), null, true);
+            String hash = paraChainClient.evmTransfer(abi, contractAddr, EvmTokenEnum.ERC1155, 1000000L,
+                    user.getWallet(), commemorateNft.getTokenId(), 1, tokenInfo, commemorateNft.getPublishAddress(), null, true, false);
             if (StringUtils.isBlank(hash)) {
                 // 领取失败要释放信号量
                 semaphore.release();

joying-common/src/main/java/com/fzm/common/service/impl/NftServiceImpl.java

@@ -137,11 +137,11 @@ public class NftServiceImpl extends ServiceImpl<NftMapper, Nft> implements NftSe
         String tokenInfo = this.formatTokenInfo(map);
         log.info("tokenInfo:{}", tokenInfo);
         // 发行nft
-        String hash = paraChainClient.evmPublishToken(abi, contractAddr, EvmTokenEnum.ERC1155, 0L, wallet, wallet, privkey, tokenId, 1, str, true);
+        String hash = paraChainClient.evmPublishToken(abi, contractAddr, EvmTokenEnum.ERC1155, 0L, wallet, wallet, privkey, tokenId, 1, str, true, false);
         if (StringUtils.isBlank(hash)) {
             throw GlobalException.newException(ResultCode.FAILED, "nft发行失败");
         }
-        String tradeHash = paraChainClient.evmSetTokenInfo(abi, contractAddr, 0L, tokenId, tokenInfo, wallet, privkey, true);
+        String tradeHash = paraChainClient.evmSetTokenInfo(abi, contractAddr, 0L, tokenId, tokenInfo, wallet, privkey, true, false);
 
         if (StringUtils.isBlank(tradeHash)) {
             throw GlobalException.newException(ResultCode.PUBLISH_ERROR, "nft发行失败");
@@ -176,7 +176,7 @@ public class NftServiceImpl extends ServiceImpl<NftMapper, Nft> implements NftSe
         log.info("tokenInfo:{}", tokenInfo);
         // 转让nft
         String hash = paraChainClient.evmTransfer(abi, contractAddr, EvmTokenEnum.ERC1155, 1000000L,
-                param.getReceiveWallet(), nft.getTokenId(), param.getCount(), tokenInfo, user.getWallet(), null, true);
+                param.getReceiveWallet(), nft.getTokenId(), param.getCount(), tokenInfo, user.getWallet(), null, true, false);
         if (StringUtils.isBlank(hash)) {
             throw GlobalException.newException(ResultCode.TRANSFER_ERROR, "nft转让失败");
         }
@@ -314,7 +314,7 @@ public class NftServiceImpl extends ServiceImpl<NftMapper, Nft> implements NftSe
         log.info("tokenInfo:{}", tokenInfo);
         // 转让nft
         String hash = paraChainClient.evmTransfer(abi, contractAddr, EvmTokenEnum.ERC1155, 1000000L,
-                receiveAddress, nft.getTokenId(), 1, tokenInfo, user.getWallet(), null, true);
+                receiveAddress, nft.getTokenId(), 1, tokenInfo, user.getWallet(), null, true, false);
         if (StringUtils.isBlank(hash)) {
             throw GlobalException.newException(ResultCode.TRANSFER_ERROR, "nft转让失败");
         }
@@ -348,11 +348,11 @@ public class NftServiceImpl extends ServiceImpl<NftMapper, Nft> implements NftSe
         String tokenInfo = this.formatTokenInfo(map);
         log.info("tokenInfo:{}", tokenInfo);
         // 发行nft
-        String hash = paraChainClient.evmPublishToken(abi, contractAddr, EvmTokenEnum.ERC1155, 0L, wallet, wallet, privkey, tokenId, 1, str, true);
+        String hash = paraChainClient.evmPublishToken(abi, contractAddr, EvmTokenEnum.ERC1155, 0L, wallet, wallet, privkey, tokenId, 1, str, true, false);
         if (StringUtils.isBlank(hash)) {
             throw GlobalException.newException(ResultCode.FAILED, "nft发行失败");
         }
-        String tradeHash = paraChainClient.evmSetTokenInfo(abi, contractAddr, 0L, tokenId, tokenInfo, wallet, privkey, true);
+        String tradeHash = paraChainClient.evmSetTokenInfo(abi, contractAddr, 0L, tokenId, tokenInfo, wallet, privkey, true, false);
 
         if (StringUtils.isBlank(tradeHash)) {
             throw GlobalException.newException(ResultCode.PUBLISH_ERROR, "nft发行失败");

pom.xml

@@ -90,12 +90,6 @@
                 <artifactId>core</artifactId>
                 <version>3.3.0</version>
             </dependency>
-            <!-- sharding -->
-            <dependency>
-                <groupId>org.apache.shardingsphere</groupId>
-                <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
-                <version>4.1.1</version>
-            </dependency>
 
             <dependency>
                 <groupId>org.redisson</groupId>