Merge pull request #20 from eco-stake/configurable-prevent-authz-exec…

…-types Configurable prevented authz exec types
eco-stake · Jun 23, 2023 · c53fca3 · c53fca3
2 parents 43dfe3d + f38a597
commit c53fca3
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 24 deletions.
diff --git a/src/adapters/DefaultSigningAdapter.mjs b/src/adapters/DefaultSigningAdapter.mjs
@@ -99,6 +99,13 @@ export default class DefaultSigningAdapter {
           throw new Error('This chain does not fully support amino conversion for Authz messages, using signDirect instead')
         }
       }
+      if(message.typeUrl === '/cosmos.authz.v1beta1.MsgExec'){
+        const execTypes = message.value.msgs.map(msg => msg.typeUrl)
+        const preventedTypes = execTypes.filter(type => this.network.authzAminoExecPreventTypes.some(prevent => type.match(_.escapeRegExp(prevent))))
+        if(preventedTypes.length > 0){
+          throw new Error(`This chain does not support amino conversion for Authz Exec with types: ${preventedTypes.join(', ')}`)
+        }
+      }
       let aminoMessage = this.aminoTypes.toAmino(message)
       if(this.network.authzAminoLiftedValues){
         switch (aminoMessage.type) {

diff --git a/src/adapters/OsmosisSigningAdapter.mjs b/src/adapters/OsmosisSigningAdapter.mjs
diff --git a/src/networks.json b/src/networks.json
@@ -5,7 +5,10 @@
     "maxPerDay": 1,
     "apiVersions": {
       "gov": "v1beta1"
-    }
+    },
+    "authzAminoExecPreventTypes": [
+      "/cosmos.gov."
+    ]
   },
   {
     "name": "juno",
@@ -28,7 +31,10 @@
   },
   {
     "name": "regen",
-    "ownerAddress": "regenvaloper1c4y3j05qx652rnxm5mg4yesqdkmhz2f6dl7hhk"
+    "ownerAddress": "regenvaloper1c4y3j05qx652rnxm5mg4yesqdkmhz2f6dl7hhk",
+    "authzAminoExecPreventTypes": [
+      "/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommission"
+    ]
   },
   {
     "name": "terra",
@@ -58,7 +64,10 @@
   },
   {
     "name": "cryptoorgchain",
-    "ownerAddress": "crocncl10mfs428fyntu296dgh5fmhvdzrr2stlaekcrp9"
+    "ownerAddress": "crocncl10mfs428fyntu296dgh5fmhvdzrr2stlaekcrp9",
+    "authzAminoExecPreventTypes": [
+      "/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommission"
+    ]
   },
   {
     "name": "evmos",
@@ -81,7 +90,10 @@
     "ownerAddress": "comdexvaloper17f70yjkvmvld379904jaddx9h0f74n32pjtmp6",
     "apiVersions": {
       "gov": "v1beta1"
-    }
+    },
+    "authzAminoExecPreventTypes": [
+      "/cosmos.gov."
+    ]
   },
   {
     "name": "cheqd"
@@ -209,7 +221,10 @@
   },
   {
     "name": "mars",
-    "ownerAddress": "marsvaloper1hvtaqw9mlwc0a4cdx6g3klk8acfc6z3yazzk8a"
+    "ownerAddress": "marsvaloper1hvtaqw9mlwc0a4cdx6g3klk8acfc6z3yazzk8a",
+    "authzAminoExecPreventTypes": [
+      "/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommission"
+    ]
   },
   {
     "name": "planq"
@@ -223,7 +238,10 @@
   },
   {
     "name": "kyve",
-    "ownerAddress": "kyvevaloper1egqphd8yjdfv84fl825grwgna0pf2emagdmnz8"
+    "ownerAddress": "kyvevaloper1egqphd8yjdfv84fl825grwgna0pf2emagdmnz8",
+    "authzAminoExecPreventTypes": [
+      "/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommission"
+    ]
   },
   {
     "name": "quicksilver",

diff --git a/src/utils/Chain.mjs b/src/utils/Chain.mjs
@@ -13,6 +13,7 @@ const Chain = (data) => {
   const authzAminoSupport = data.authzAminoSupport ?? true
   const authzAminoGenericOnly = authzAminoSupport && (data.authzAminoGenericOnly ?? !sdkAuthzAminoSupport)
   const authzAminoLiftedValues = authzAminoSupport && (data.authzAminoLiftedValues ?? authzAminoGenericOnly)
+  const authzAminoExecPreventTypes = data.authzAminoExecPreventTypes || []
   const apiVersions = {
     gov: sdk46OrLater ? 'v1' : 'v1beta1',
     ...data.apiVersions || {}
@@ -30,6 +31,7 @@ const Chain = (data) => {
     authzAminoSupport,
     authzAminoGenericOnly,
     authzAminoLiftedValues,
+    authzAminoExecPreventTypes,
     apiVersions,
     denom: data.denom || baseAsset?.base?.denom,
     display: data.display || baseAsset?.display?.denom,

diff --git a/src/utils/Network.mjs b/src/utils/Network.mjs
@@ -90,6 +90,7 @@ class Network {
     this.authzAminoSupport = this.chain.authzAminoSupport
     this.authzAminoGenericOnly = this.chain.authzAminoGenericOnly
     this.authzAminoLiftedValues = this.chain.authzAminoLiftedValues
+    this.authzAminoExecPreventTypes = this.chain.authzAminoExecPreventTypes
     this.txTimeout = this.data.txTimeout || 60_000
     this.keywords = this.buildKeywords()
 

diff --git a/src/utils/SigningClient.mjs b/src/utils/SigningClient.mjs
@@ -12,11 +12,9 @@ import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx.js";
 
 import { coin } from './Helpers.mjs'
 import DefaultSigningAdapter from '../adapters/DefaultSigningAdapter.mjs';
-import OsmosisSigningAdapter from '../adapters/OsmosisSigningAdapter.mjs';
 import TerraSigningAdapter from '../adapters/TerraSigningAdapter.mjs';
 
 const adapters = {
-  osmosis: OsmosisSigningAdapter,
   terra: TerraSigningAdapter
 }