chore: add funds limit

InjectiveLabs · Jan 2, 2025 · d63f36e · d63f36e
1 parent 5527b3d
commit d63f36e
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 14 deletions.
diff --git a/packages/sdk-ts/src/core/modules/authz/msgs/authorizations/ContractExecutionAuthorization.ts b/packages/sdk-ts/src/core/modules/authz/msgs/authorizations/ContractExecutionAuthorization.ts
@@ -1,3 +1,4 @@
+import { Coin } from '@injectivelabs/ts-types'
 import {
   GoogleProtobufAny,
   CosmwasmWasmV1Authz,
@@ -8,7 +9,8 @@ export declare namespace ContractExecutionAuthorization {
   export interface Params {
     contract: string
     limit?: {
-      maxCalls: number
+      maxCalls?: number
+      amounts?: Coin[]
     }
     filter?: {
       acceptedMessagesKeys: string[]
@@ -46,15 +48,38 @@ export default class ContractExecutionAuthorization extends BaseAuthorization<
     grant.contract = params.contract
 
     if (params.limit) {
-      const limit = CosmwasmWasmV1Authz.MaxCallsLimit.create()
+      if (params.limit.maxCalls && params.limit.amounts) {
+        const limit = CosmwasmWasmV1Authz.CombinedLimit.create()
 
-      limit.remaining = params.limit.maxCalls.toString()
+        limit.callsRemaining = params.limit.maxCalls.toString()
+        limit.amounts = params.limit.amounts
 
-      const any = GoogleProtobufAny.Any.create()
-      any.typeUrl = '/cosmwasm.wasm.v1.MaxCallsLimit'
-      any.value = CosmwasmWasmV1Authz.MaxCallsLimit.encode(limit).finish()
+        const any = GoogleProtobufAny.Any.create()
+        any.typeUrl = '/cosmwasm.wasm.v1.CombinedLimit'
+        any.value = CosmwasmWasmV1Authz.CombinedLimit.encode(limit).finish()
+
+        grant.limit = any
+      } else if (params.limit.maxCalls) {
+        const limit = CosmwasmWasmV1Authz.MaxCallsLimit.create()
+
+        limit.remaining = params.limit.maxCalls.toString()
+
+        const any = GoogleProtobufAny.Any.create()
+        any.typeUrl = '/cosmwasm.wasm.v1.MaxCallsLimit'
+        any.value = CosmwasmWasmV1Authz.MaxCallsLimit.encode(limit).finish()
 
-      grant.limit = any
+        grant.limit = any
+      } else if (params.limit.amounts) {
+        const limit = CosmwasmWasmV1Authz.MaxFundsLimit.create()
+
+        limit.amounts = params.limit.amounts
+
+        const any = GoogleProtobufAny.Any.create()
+        any.typeUrl = '/cosmwasm.wasm.v1.MaxFundsLimit'
+        any.value = CosmwasmWasmV1Authz.MaxFundsLimit.encode(limit).finish()
+
+        grant.limit = any
+      }
     }
 
     if (params.filter) {
@@ -99,9 +124,22 @@ export default class ContractExecutionAuthorization extends BaseAuthorization<
     grant.contract = params.contract
 
     if (params.limit) {
-      grant.limit = {
-        type: 'wasm/MaxCallsLimit',
-        remaining: params.limit.maxCalls.toString(),
+      if (params.limit.maxCalls && params.limit.amounts) {
+        grant.limit = {
+          type: 'wasm/CombinedLimit',
+          calls_remaining: params.limit.maxCalls.toString(),
+          amounts: params.limit.amounts,
+        }
+      } else if (params.limit.maxCalls) {
+        grant.limit = {
+          type: 'wasm/MaxCallsLimit',
+          remaining: params.limit.maxCalls.toString(),
+        }
+      } else if (params.limit.amounts) {
+        grant.limit = {
+          type: 'wasm/MaxFundsLimit',
+          amounts: params.limit.amounts,
+        }
       }
     }
 
@@ -126,9 +164,22 @@ export default class ContractExecutionAuthorization extends BaseAuthorization<
     grant.contract = params.contract
 
     if (params.limit) {
-      grant.limit = {
-        '@type': '/cosmwasm.wasm.v1.MaxCallsLimit',
-        remaining: params.limit.maxCalls.toString(),
+      if (params.limit.maxCalls && params.limit.amounts) {
+        grant.limit = {
+          '@type': '/cosmwasm.wasm.v1.CombinedLimit',
+          calls_remaining: params.limit.maxCalls.toString(),
+          amounts: params.limit.amounts,
+        }
+      } else if (params.limit.maxCalls) {
+        grant.limit = {
+          '@type': '/cosmwasm.wasm.v1.MaxCallsLimit',
+          remaining: params.limit.maxCalls.toString(),
+        }
+      } else if (params.limit.amounts) {
+        grant.limit = {
+          '@type': '/cosmwasm.wasm.v1.MaxFundsLimit',
+          amounts: params.limit.amounts,
+        }
       }
     }
 

diff --git a/proto/indexer/gen.sh b/proto/indexer/gen.sh
@@ -3,7 +3,7 @@ BUILD_DIR=$ROOT_DIR/gen
 PROTO_DIR=$ROOT_DIR/proto
 TS_OUTPUT_DIR=$ROOT_DIR/proto-ts
 TS_STUB_DIR=$ROOT_DIR/stub
-injective_indexer_branch=v1.13.78-RC.1
+injective_indexer_branch=dev
 
 # remove old gen
 rm -rf $BUILD_DIR