From 7a453131d6556e1a0b96cdc854e6f3553c473278 Mon Sep 17 00:00:00 2001
From: "jinseong.cho" <jinseong.cho@linecorp.com>
Date: Mon, 19 Jun 2023 13:24:25 +0900
Subject: [PATCH] support cosmjs-types 0.8.0

---
 .../src/modules/wasm/aminomessages.spec.ts       |  4 ++++
 .../src/modules/wasm/aminomessages.ts            | 16 ++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/packages/cosmwasm-stargate/src/modules/wasm/aminomessages.spec.ts b/packages/cosmwasm-stargate/src/modules/wasm/aminomessages.spec.ts
index 5be3ddfa..ffa7bbbd 100644
--- a/packages/cosmwasm-stargate/src/modules/wasm/aminomessages.spec.ts
+++ b/packages/cosmwasm-stargate/src/modules/wasm/aminomessages.spec.ts
@@ -54,6 +54,7 @@ describe("AminoTypes", () => {
         instantiatePermission: {
           permission: AccessType.ACCESS_TYPE_ONLY_ADDRESS,
           address: "cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6",
+          addresses: [],
         },
       };
       const aminoMsg = new AminoTypes(createWasmAminoConverters()).toAmino({
@@ -68,6 +69,7 @@ describe("AminoTypes", () => {
           instantiate_permission: {
             permission: "OnlyAddress",
             address: "cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6",
+            addresses: undefined,
           },
         },
       };
@@ -315,6 +317,7 @@ describe("AminoTypes", () => {
           instantiate_permission: {
             permission: "OnlyAddress",
             address: "cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6",
+            addresses: undefined,
           },
         },
       };
@@ -325,6 +328,7 @@ describe("AminoTypes", () => {
         instantiatePermission: {
           permission: AccessType.ACCESS_TYPE_ONLY_ADDRESS,
           address: "cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6",
+          addresses: [],
         },
       };
       expect(msg).toEqual({
diff --git a/packages/cosmwasm-stargate/src/modules/wasm/aminomessages.ts b/packages/cosmwasm-stargate/src/modules/wasm/aminomessages.ts
index fca808d1..0bb180b6 100644
--- a/packages/cosmwasm-stargate/src/modules/wasm/aminomessages.ts
+++ b/packages/cosmwasm-stargate/src/modules/wasm/aminomessages.ts
@@ -23,6 +23,8 @@ export function accessTypeFromString(str: string): AccessType {
       return AccessType.ACCESS_TYPE_ONLY_ADDRESS;
     case "Everybody":
       return AccessType.ACCESS_TYPE_EVERYBODY;
+    case "AnyOfAddresses":
+      return AccessType.ACCESS_TYPE_ANY_OF_ADDRESSES;
     default:
       return AccessType.UNRECOGNIZED;
   }
@@ -38,6 +40,8 @@ export function accessTypeToString(object: any): string {
       return "OnlyAddress";
     case AccessType.ACCESS_TYPE_EVERYBODY:
       return "Everybody";
+    case AccessType.ACCESS_TYPE_ANY_OF_ADDRESSES:
+      return "AnyOfAddresses";
     case AccessType.UNRECOGNIZED:
     default:
       return "UNRECOGNIZED";
@@ -49,11 +53,16 @@ export function accessTypeToString(object: any): string {
  */
 export interface AccessConfig {
   /**
-   * Permission should be one kind of string 'Nobody', 'OnlyAddress', 'Everybody', 'Unspecified'
-   * @see https://github.com/CosmWasm/wasmd/blob/v0.28.0/x/wasm/types/params.go#L54
+   * Permission should be one kind of string 'Nobody', 'OnlyAddress', 'Everybody', 'AnyOfAddresses', 'Unspecified'
+   * @see https://github.com/CosmWasm/wasmd/blob/v0.31.0/x/wasm/types/params.go#L54
    */
   readonly permission: string;
+  /**
+   * Address
+   * Deprecated: replaced by addresses
+   */
   readonly address?: string;
+  readonly addresses?: string[];
 }
 
 /**
@@ -204,6 +213,8 @@ export function createWasmAminoConverters(): AminoConverters {
           ? {
               permission: accessTypeToString(instantiatePermission.permission),
               address: instantiatePermission.address || undefined,
+              addresses:
+                instantiatePermission.addresses.length !== 0 ? instantiatePermission.addresses : undefined,
             }
           : undefined,
       }),
@@ -218,6 +229,7 @@ export function createWasmAminoConverters(): AminoConverters {
           ? {
               permission: accessTypeFromString(instantiate_permission.permission),
               address: instantiate_permission.address ?? "",
+              addresses: instantiate_permission.addresses ?? [],
             }
           : undefined,
       }),