Merge pull request #99 from FigureTechnologies/hyperschwartz/v3.7.1-localtools-upgrade-for-new-msgfees

v3.7.1: Localtools support for Provenance v1.14.0

Author: hyperschwartz

client/src/main/kotlin/tech/figure/classification/asset/client/domain/model/OnboardingCost.kt

@@ -15,7 +15,7 @@ import java.math.BigInteger
  * execution route.
  * @param feeDestinations A collection of addresses and fee distribution amounts that dictates how the fee amount is
  * distributed to other addresses than the verifier.  The amounts of all destinations should never sum to a value
- * greater than half the onboarding cost (to account for the 50% MsgFees module community split).
+ * greater than the onboarding cost.
  */
 @JsonNaming(SnakeCaseStrategy::class)
 data class OnboardingCost(

client/src/main/kotlin/tech/figure/classification/asset/client/domain/model/VerifierDetail.kt

@@ -19,7 +19,7 @@ import java.math.BigInteger
  * onboarding cost to determine a coin required.
  * @param feeDestinations A collection of addresses and fee distribution amounts that dictates how the fee amount is
  * distributed to other addresses than the verifier.  The amounts of all destinations should never sum to a value
- * greater than half the onboarding cost (to account for the 50% MsgFees module community split).
+ * greater than the onboarding cost.
  * @param entityDetail An optional set of fields defining the validator in a human-readable way.
  * @param retryCost Defines the cost to use in place of the root onboarding cost and fee destination when retrying
  * classification for a failed verification.  If not present, the original values used for the first verification will

gradle/libs.versions.toml

@@ -11,7 +11,7 @@ jackson-protobuf = "0.9.13"
 kotlin = "1.7.22"
 kotlin-coroutines = "1.6.4"
 kotlin-logging = "3.0.4"
-logback = "1.4.5"
+logback = "1.2.3"
 mockk = "1.13.3"
 objectstore-gateway = "3.3.0"
 okhttp = "4.10.0"

localtools/src/integrationTest/kotlin/testconfiguration/assertions/FeePaymentDetailAssertions.kt

@@ -51,10 +51,10 @@ fun assertFeePaymentDetailValidity(
     val expectedOnboardingCost = verifierDetail.retryCost?.cost?.takeIf { isRetry }
         ?: verifierDetail.subsequentClassificationDetail?.cost?.cost?.takeIf { isSubsequentClassification }
         ?: verifierDetail.onboardingCost
-    val expectedVerifierFee = expectedOnboardingCost.divide("2".toBigInteger()).minus(nonVerifierFeesPaid)
+    val expectedVerifierFee = expectedOnboardingCost - nonVerifierFeesPaid
     assertTrue(
         actual = expectedVerifierFee >= BigInteger.ZERO,
-        message = "Non verifier-targeted fees should always sum to a value less or equal to half the verifier detail's onboarding cost [${verifierDetail.onboardingCost}] divided by two, but was [$nonVerifierFeesPaid]",
+        message = "Non verifier-targeted fees should always sum to a value less or equal to the verifier detail's onboarding cost [${verifierDetail.onboardingCost}], but was [$nonVerifierFeesPaid]",
     )
     if (expectedVerifierFee > BigInteger.ZERO) {
         val verifierFee = feePayments.payments.singleOrNull { it.recipient == verifierDetail.address }

localtools/src/integrationTest/kotlin/testconfiguration/containers/instances/ManagedProvenanceTestContainer.kt

@@ -98,11 +98,13 @@ class ManagedProvenanceTestContainer : ManagedTestContainer<ProvenanceTestContai
     }
 }
 
-class ProvenanceTestContainer : GenericContainer<ProvenanceTestContainer>("provenanceio/provenance:v1.12.0") {
-    private companion object : KLogging()
+class ProvenanceTestContainer : GenericContainer<ProvenanceTestContainer>("provenanceio/provenance:$VERSION") {
+    private companion object : KLogging() {
+        const val VERSION: String = "v1.14.0"
+    }
 
     init {
-        logger.info("Starting Provenance Blockchain container version v1.12.0")
+        logger.info("Starting Provenance Blockchain container version $VERSION")
     }
 }
 

localtools/src/integrationTest/kotlin/testconfiguration/util/AppResources.kt

@@ -8,7 +8,7 @@ object AppResources {
     // and libs are compatible with.  Local testing for unpublished versions of the smart contract's WASM file can be
     // done by tweaking ManagedProvenanceTestContainer's afterStartup function implementation to fetch the file from local
     // resources, if needed.
-    const val CONTRACT_VERSION = "3.2.0"
+    const val CONTRACT_VERSION = "3.3.0"
     const val ONBOARDING_CUSTOM_FEE_NAME = "Asset Classification Onboarding Fee"
 
     // This account is intended to simulate an account used for verifying assets

localtools/src/integrationTest/resources/data/provenance/config/genesis.json

@@ -443,7 +443,8 @@
         "max_validators": 100,
         "max_entries": 7,
         "historical_entries": 10000,
-        "bond_denom": "nhash"
+        "bond_denom": "nhash",
+        "min_commission_rate": "0.000000000000000000"
       },
       "last_total_power": "0",
       "last_validator_powers": [],
@@ -469,8 +470,7 @@
           "permission": "Everybody",
           "address": ""
         },
-        "instantiate_default_permission": "Everybody",
-        "max_wasm_code_size": "1228800"
+        "instantiate_default_permission": "Everybody"
       },
       "codes": [],
       "contracts": [],

localtools/src/main/kotlin/tech/figure/classification/asset/localtools/tool/SetupACTool.kt

@@ -174,7 +174,7 @@ object SetupACTool {
                 ).toBase64Msg(OBJECT_MAPPER)
             }.build().wrapListAc(),
             account = config.contractAdminAccount,
-            gasAdjustment = 1.1,
+            gasAdjustment = 1.2,
         ).getContractAddressAc()
         config.logger("Successfully instantiated the asset classification smart contract with address [$contractAddress]")
         ACClient.getDefault(