Merge pull request #875 from telosnetwork/develop

Removing check for showing the execute button, bumping wharfkit to get fixed cleos transaction format

Author: poplexity

src/pages/ProposalItem.vue

@@ -301,7 +301,10 @@ export default defineComponent({
             activeProducersApproved.value = activeProducers.value.filter(
                 item => item.status,
             );
-
+            // Commenting this out, the logic is bad.
+            // BPs can be involved in non-BP proposals, so we can't just check if BPs are involved and then assume 2/3 + 1
+            // And if no BPs are involved, doesn't mean we need 100% approval, most msigs are 2/3 or 5/7, etc...
+            /*
             if (activeProducers.value.length === 0) {
                 // No BPs are involved in the proposal, so we need to 100% of the requested approvals
                 isApproved.value = proposal.provided_approvals.length === totalRequestedApprovals;
@@ -310,6 +313,8 @@ export default defineComponent({
                 const approval = (activeProducers.value.length * 2 / 3) + 1;
                 isApproved.value = activeProducersApproved.value.length >= Math.floor(approval);
             }
+              */
+            isApproved.value = true;
 
             const transactions = await handleTransactionHistory(proposal.block_num);
 

yarn.lock

@@ -2680,10 +2680,10 @@
     "@wharfkit/token" "^1.1.2"
     tslib "^2.1.0"
 
-"@wharfkit/antelope@1.0.9":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@wharfkit/antelope/-/antelope-1.0.9.tgz#87388b8ab86f6f0e63950284661b7e8da16e76a7"
-  integrity sha512-kqJJmvp+//OG372HELb8IdSMvSZI9u/S6TPiljB5sm3Yl4rRLJL+EV8SxmfuAY/kF5asbHQkW2HWR8L12HXZ6w==
+"@wharfkit/antelope@1.0.10":
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/@wharfkit/antelope/-/antelope-1.0.10.tgz#5c63d6b67a4b62038575cd86ef47edaa8d1f57dd"
+  integrity sha512-12m4nD6+ZZl+mwzySuFkeiJCOrbXQT6mqg9amr1l/JtRewRdxeN9QTsEoPjE5MCTXbJc84X51KCT71ysglse0Q==
   dependencies:
     bn.js "^4.11.9"
     brorand "^1.1.0"