Merge pull request #187 from fioprotocol/release/2.5.x_3.1.x

Release/2.5.x 3.1.x > master
fioprotocol · Oct 15, 2021 · cc3016b · cc3016b
2 parents 40c3cbc + d79510e
commit cc3016b
Show file tree

Hide file tree

Showing 18 changed files with 11,781 additions and 1,571 deletions.
diff --git a/config.js b/config.js
@@ -275,6 +275,18 @@ const config = {
         cancel_funds_request: {
             bundledEligible: true,
             fee: 600000000
+        },
+        add_nft: {
+            bundledEligible: true,
+            fee: 600000000
+        },
+        remove_nft: {
+            bundledEligible: true,
+            fee: 600000000
+        },
+        remove_all_nfts: {
+            bundledEligible: true,
+            fee: 1200000000
         }
 
     },
@@ -306,8 +318,8 @@ const config = {
         ADDADDRESSRAM: 512,
         SETDOMAINPUBRAM: 256,
         BURNEXPIREDRAM: 0,
-        NEWFUNDSREQUESTRAM: 2048,
-        RECORDOBTRAM: 2048,
+        NEWFUNDSREQUESTRAM: 4098,
+        RECORDOBTRAM: 4098,
         RENEWADDRESSRAM: 1024,
         RENEWDOMAINRAM: 1024,
         TPIDCLAIMRAM: 0,
@@ -330,7 +342,8 @@ const config = {
         XFERDOMAINRAM: 512,
         XFERADDRESSRAM: 512,
         CANCELFUNDSRAM: 512,
-        BUNDLEVOTERAM: 0
+        BUNDLEVOTERAM: 0,
+        ADDNFTRAM: 3584
     },
 
     public_addresses: [

diff --git a/index.js b/index.js
@@ -3,15 +3,16 @@ const {expect} = require('chai')
 
 describe('TEST SUITE', () => {
 
+  //require('./tests/nft-performance-tests.js'); //This runs most reliably on a fresh chain
   //require('./tests/bravo-migr-test.js'); //This is required when testing 2.3.0 (bravo) with fio bahamas (need to do the full table migration).
 
-  
+
   require('./tests/addaddress.js'); // v1.0.x  Also includes FIP-13 tests.
   require('./tests/fees.js'); // v1.0.x
   require('./tests/fio-request.js'); // v1.0.x
   require('./tests/producer.js'); // v1.0.x
   require('./tests/pushtransaction.js'); // v1.0.x
-  require('./tests/ram2.js');  // v1.0.x //Eric to update to remove clio
+  require('./tests/ram.js');  // v1.0.x //Eric to update to remove clio
   require('./tests/register-fio-address.js');
   require('./tests/register-fio-domain.js'); // v1.0.x
   require('./tests/transfer-tokens.js'); // v1.0.x
@@ -29,12 +30,19 @@ describe('TEST SUITE', () => {
   require('./tests/transfer-locked-tokens.js');  // FIP-6 locking tests
   require('./tests/transfer-locked-tokens-account-tests.js');  // FIP-6 tests of generic account functionality
   require('./tests/addbundles.js');  // FIP-11.a
-  require('./tests/tpid.js'); 
+  require('./tests/tpid.js');
+  require('./tests/nft-add-remove.js'); //FIP-27
+  require('./tests/nft-sdk-tests.js');
+  //require('./tests/nft-performance-tests.js'); //FIP-27
+  require('./tests/nft-uniqueness.js'); //FIP-27
+  //require('./tests/nft-remove-burn.js'); //FIP-27
   //require('./tests/clio.js');  // FIP-16  //Only works with local testing
   //require('./tests/performance-request-obt.js');
 
   require('./tests/testnet-smoketest.js'); // Testnet smoketest. By default runs against local build.
-  
+
   //require('./tests/expired-address-domain.js'); // Requires manual updates to contracts to shorten expiration timing
+  //require('./tests/expired-address-domain-modexpire.js'); // Requires modexpire action which allows expiring of domains
+
   //require('./tests/history.js'); // Only run against history node.
 });