Merge pull request #317 from fioprotocol/release/3.1.x

Release/3.1.x -> Master ( Mainnet Release )
fioprotocol · Oct 14, 2021 · 62e7389 · 62e7389
2 parents a5c0cf9 + afb3326
commit 62e7389
Show file tree

Hide file tree

Showing 6 changed files with 501 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,7 +27,7 @@ set(CMAKE_CXX_EXTENSIONS ON)
 set(CXX_STANDARD_REQUIRED ON)
 
 set(VERSION_MAJOR 3)
-set(VERSION_MINOR 0)
+set(VERSION_MINOR 1)
 set(VERSION_PATCH 0)
 #set(VERSION_SUFFIX develop)
 

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
@@ -1379,11 +1379,10 @@ namespace eosio {
                     a.contractname = "eosio.msig";
                     a.blocktimestamp = 1;
                 });
-                 
-                 */
-
+                
+                */
             }
-
+        
 
             // The returned scoped_exit should not exceed the lifetime of the pending which existed when make_block_restore_point was called.
             fc::scoped_exit<std::function<void()>> make_block_restore_point() {

diff --git a/libraries/fc b/libraries/fc
diff --git a/plugins/chain_api_plugin/chain_api_plugin.cpp b/plugins/chain_api_plugin/chain_api_plugin.cpp
@@ -125,6 +125,9 @@ namespace eosio {
                                      CHAIN_RO_CALL(get_whitelist, 200),
                                      CHAIN_RO_CALL(check_whitelist, 200),
                                      CHAIN_RO_CALL(get_sent_fio_requests, 200),
+                                     CHAIN_RO_CALL(get_nfts_fio_address, 200),
+                                     CHAIN_RO_CALL(get_nfts_hash, 200),
+                                     CHAIN_RO_CALL(get_nfts_contract, 200),
                                      CHAIN_RW_CALL_ASYNC(push_block, chain_apis::read_write::push_block_results, 202),
                                      CHAIN_RW_CALL_ASYNC(push_transaction,
                                                          chain_apis::read_write::push_transaction_results, 202),
@@ -134,6 +137,12 @@ namespace eosio {
                                                          chain_apis::read_write::send_transaction_results, 202),
                                      CHAIN_RW_CALL_ASYNC(register_fio_address,
                                                          chain_apis::read_write::register_fio_address_results, 202),
+                                     CHAIN_RW_CALL_ASYNC(add_nft,
+                                                         chain_apis::read_write::add_nft_results, 202),
+                                     CHAIN_RW_CALL_ASYNC(remove_nft,
+                                                         chain_apis::read_write::remove_nft_results, 202),
+                                     CHAIN_RW_CALL_ASYNC(remove_all_nfts,
+                                                         chain_apis::read_write::remove_all_nfts_results, 202),
                                      CHAIN_RW_CALL_ASYNC(register_fio_domain,
                                                          chain_apis::read_write::register_fio_domain_results, 202),
                                      CHAIN_RW_CALL_ASYNC(add_pub_address,