Merge branch 'master' into configurable-prevent-authz-exec-types

eco-stake · Jun 23, 2023 · f38a597 · f38a597
2 parents dd3d917 + 43dfe3d
commit f38a597
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/src/adapters/DefaultSigningAdapter.mjs b/src/adapters/DefaultSigningAdapter.mjs
@@ -107,7 +107,7 @@ export default class DefaultSigningAdapter {
         }
       }
       let aminoMessage = this.aminoTypes.toAmino(message)
-      if(this.network.authzAminoGenericOnly){
+      if(this.network.authzAminoLiftedValues){
         switch (aminoMessage.type) {
           case 'cosmos-sdk/MsgGrant':
             aminoMessage = aminoMessage.value

diff --git a/src/networks.json b/src/networks.json
@@ -37,7 +37,8 @@
     ]
   },
   {
-    "name": "terra"
+    "name": "terra",
+    "authzAminoLiftedValues": false
   },
   {
     "name": "terra2"

diff --git a/src/utils/Chain.mjs b/src/utils/Chain.mjs
@@ -12,6 +12,7 @@ const Chain = (data) => {
   const authzSupport = data.authzSupport ?? data.params?.authz
   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',
@@ -29,6 +30,7 @@ const Chain = (data) => {
     authzSupport,
     authzAminoSupport,
     authzAminoGenericOnly,
+    authzAminoLiftedValues,
     authzAminoExecPreventTypes,
     apiVersions,
     denom: data.denom || baseAsset?.base?.denom,

diff --git a/src/utils/Network.mjs b/src/utils/Network.mjs
@@ -89,6 +89,7 @@ class Network {
     this.authzSupport = this.chain.authzSupport
     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()