From 01b31fb2eaa3c43bb3f29ffabb329906c75c86ae Mon Sep 17 00:00:00 2001 From: dDee-D-six Date: Tue, 18 Oct 2022 17:12:32 +0700 Subject: [PATCH 01/10] ignore vue --- .../cosmos-sdk/cosmos.auth.v1beta1/index.ts | 207 ------------------ .../cosmos.auth.v1beta1/module/index.ts | 57 ----- vue/src/store/generated/index.ts | 79 ------- 3 files changed, 343 deletions(-) delete mode 100755 vue/src/store/generated/cosmos/cosmos-sdk/cosmos.auth.v1beta1/index.ts delete mode 100755 vue/src/store/generated/cosmos/cosmos-sdk/cosmos.auth.v1beta1/module/index.ts delete mode 100644 vue/src/store/generated/index.ts diff --git a/vue/src/store/generated/cosmos/cosmos-sdk/cosmos.auth.v1beta1/index.ts b/vue/src/store/generated/cosmos/cosmos-sdk/cosmos.auth.v1beta1/index.ts deleted file mode 100755 index a879a2de..00000000 --- a/vue/src/store/generated/cosmos/cosmos-sdk/cosmos.auth.v1beta1/index.ts +++ /dev/null @@ -1,207 +0,0 @@ -import { txClient, queryClient, MissingWalletError , registry} from './module' - -import { BaseAccount } from "./module/types/cosmos/auth/v1beta1/auth" -import { ModuleAccount } from "./module/types/cosmos/auth/v1beta1/auth" -import { Params } from "./module/types/cosmos/auth/v1beta1/auth" - - -export { BaseAccount, ModuleAccount, Params }; - -async function initTxClient(vuexGetters) { - return await txClient(vuexGetters['common/wallet/signer'], { - addr: vuexGetters['common/env/apiTendermint'] - }) -} - -async function initQueryClient(vuexGetters) { - return await queryClient({ - addr: vuexGetters['common/env/apiCosmos'] - }) -} - -function mergeResults(value, next_values) { - for (let prop of Object.keys(next_values)) { - if (Array.isArray(next_values[prop])) { - value[prop]=[...value[prop], ...next_values[prop]] - }else{ - value[prop]=next_values[prop] - } - } - return value -} - -function getStructure(template) { - let structure = { fields: [] } - for (const [key, value] of Object.entries(template)) { - let field: any = {} - field.name = key - field.type = typeof value - structure.fields.push(field) - } - return structure -} - -const getDefaultState = () => { - return { - Accounts: {}, - Account: {}, - Params: {}, - - _Structure: { - BaseAccount: getStructure(BaseAccount.fromPartial({})), - ModuleAccount: getStructure(ModuleAccount.fromPartial({})), - Params: getStructure(Params.fromPartial({})), - - }, - _Registry: registry, - _Subscriptions: new Set(), - } -} - -// initial state -const state = getDefaultState() - -export default { - namespaced: true, - state, - mutations: { - RESET_STATE(state) { - Object.assign(state, getDefaultState()) - }, - QUERY(state, { query, key, value }) { - state[query][JSON.stringify(key)] = value - }, - SUBSCRIBE(state, subscription) { - state._Subscriptions.add(JSON.stringify(subscription)) - }, - UNSUBSCRIBE(state, subscription) { - state._Subscriptions.delete(JSON.stringify(subscription)) - } - }, - getters: { - getAccounts: (state) => (params = { params: {}}) => { - if (!( params).query) { - ( params).query=null - } - return state.Accounts[JSON.stringify(params)] ?? {} - }, - getAccount: (state) => (params = { params: {}}) => { - if (!( params).query) { - ( params).query=null - } - return state.Account[JSON.stringify(params)] ?? {} - }, - getParams: (state) => (params = { params: {}}) => { - if (!( params).query) { - ( params).query=null - } - return state.Params[JSON.stringify(params)] ?? {} - }, - - getTypeStructure: (state) => (type) => { - return state._Structure[type].fields - }, - getRegistry: (state) => { - return state._Registry - } - }, - actions: { - init({ dispatch, rootGetters }) { - console.log('Vuex module: cosmos.auth.v1beta1 initialized!') - if (rootGetters['common/env/client']) { - rootGetters['common/env/client'].on('newblock', () => { - dispatch('StoreUpdate') - }) - } - }, - resetState({ commit }) { - commit('RESET_STATE') - }, - unsubscribe({ commit }, subscription) { - commit('UNSUBSCRIBE', subscription) - }, - async StoreUpdate({ state, dispatch }) { - state._Subscriptions.forEach(async (subscription) => { - try { - const sub=JSON.parse(subscription) - await dispatch(sub.action, sub.payload) - }catch(e) { - throw new Error('Subscriptions: ' + e.message) - } - }) - }, - - - - - - - async QueryAccounts({ commit, rootGetters, getters }, { options: { subscribe, all} = { subscribe:false, all:false}, params, query=null }) { - try { - const key = params ?? {}; - const queryClient=await initQueryClient(rootGetters) - let value= (await queryClient.queryAccounts(query)).data - - - while (all && ( value).pagination && ( value).pagination.next_key!=null) { - let next_values=(await queryClient.queryAccounts({...query, 'pagination.key':( value).pagination.next_key})).data - value = mergeResults(value, next_values); - } - commit('QUERY', { query: 'Accounts', key: { params: {...key}, query}, value }) - if (subscribe) commit('SUBSCRIBE', { action: 'QueryAccounts', payload: { options: { all }, params: {...key},query }}) - return getters['getAccounts']( { params: {...key}, query}) ?? {} - } catch (e) { - throw new Error('QueryClient:QueryAccounts API Node Unavailable. Could not perform query: ' + e.message) - - } - }, - - - - - - - - async QueryAccount({ commit, rootGetters, getters }, { options: { subscribe, all} = { subscribe:false, all:false}, params, query=null }) { - try { - const key = params ?? {}; - const queryClient=await initQueryClient(rootGetters) - let value= (await queryClient.queryAccount( key.address)).data - - - commit('QUERY', { query: 'Account', key: { params: {...key}, query}, value }) - if (subscribe) commit('SUBSCRIBE', { action: 'QueryAccount', payload: { options: { all }, params: {...key},query }}) - return getters['getAccount']( { params: {...key}, query}) ?? {} - } catch (e) { - throw new Error('QueryClient:QueryAccount API Node Unavailable. Could not perform query: ' + e.message) - - } - }, - - - - - - - - async QueryParams({ commit, rootGetters, getters }, { options: { subscribe, all} = { subscribe:false, all:false}, params, query=null }) { - try { - const key = params ?? {}; - const queryClient=await initQueryClient(rootGetters) - let value= (await queryClient.queryParams()).data - - - commit('QUERY', { query: 'Params', key: { params: {...key}, query}, value }) - if (subscribe) commit('SUBSCRIBE', { action: 'QueryParams', payload: { options: { all }, params: {...key},query }}) - return getters['getParams']( { params: {...key}, query}) ?? {} - } catch (e) { - throw new Error('QueryClient:QueryParams API Node Unavailable. Could not perform query: ' + e.message) - - } - }, - - - - - } -} diff --git a/vue/src/store/generated/cosmos/cosmos-sdk/cosmos.auth.v1beta1/module/index.ts b/vue/src/store/generated/cosmos/cosmos-sdk/cosmos.auth.v1beta1/module/index.ts deleted file mode 100755 index 67d4b093..00000000 --- a/vue/src/store/generated/cosmos/cosmos-sdk/cosmos.auth.v1beta1/module/index.ts +++ /dev/null @@ -1,57 +0,0 @@ -// THIS FILE IS GENERATED AUTOMATICALLY. DO NOT MODIFY. - -import { StdFee } from "@cosmjs/launchpad"; -import { SigningStargateClient } from "@cosmjs/stargate"; -import { Registry, OfflineSigner, EncodeObject, DirectSecp256k1HdWallet } from "@cosmjs/proto-signing"; -import { Api } from "./rest"; - - -const types = [ - -]; -export const MissingWalletError = new Error("wallet is required"); - -export const registry = new Registry(types); - -const defaultFee = { - amount: [], - gas: "200000", -}; - -interface TxClientOptions { - addr: string -} - -interface SignAndBroadcastOptions { - fee: StdFee, - memo?: string -} - -const txClient = async (wallet: OfflineSigner, { addr: addr }: TxClientOptions = { addr: "http://localhost:26657" }) => { - if (!wallet) throw MissingWalletError; - let client; - if (addr) { - client = await SigningStargateClient.connectWithSigner(addr, wallet, { registry }); - }else{ - client = await SigningStargateClient.offline( wallet, { registry }); - } - const { address } = (await wallet.getAccounts())[0]; - - return { - signAndBroadcast: (msgs: EncodeObject[], { fee, memo }: SignAndBroadcastOptions = {fee: defaultFee, memo: ""}) => client.signAndBroadcast(address, msgs, fee,memo), - - }; -}; - -interface QueryClientOptions { - addr: string -} - -const queryClient = async ({ addr: addr }: QueryClientOptions = { addr: "http://localhost:1317" }) => { - return new Api({ baseUrl: addr }); -}; - -export { - txClient, - queryClient, -}; diff --git a/vue/src/store/generated/index.ts b/vue/src/store/generated/index.ts deleted file mode 100644 index 29ef9be3..00000000 --- a/vue/src/store/generated/index.ts +++ /dev/null @@ -1,79 +0,0 @@ -// THIS FILE IS GENERATED AUTOMATICALLY. DO NOT MODIFY. - -import CosmosCosmosSdkCosmosAuthV1Beta1 from './cosmos/cosmos-sdk/cosmos.auth.v1beta1' -import CosmosCosmosSdkCosmosAuthzV1Beta1 from './cosmos/cosmos-sdk/cosmos.authz.v1beta1' -import CosmosCosmosSdkCosmosBankV1Beta1 from './cosmos/cosmos-sdk/cosmos.bank.v1beta1' -import CosmosCosmosSdkCosmosBaseTendermintV1Beta1 from './cosmos/cosmos-sdk/cosmos.base.tendermint.v1beta1' -import CosmosCosmosSdkCosmosCrisisV1Beta1 from './cosmos/cosmos-sdk/cosmos.crisis.v1beta1' -import CosmosCosmosSdkCosmosDistributionV1Beta1 from './cosmos/cosmos-sdk/cosmos.distribution.v1beta1' -import CosmosCosmosSdkCosmosEvidenceV1Beta1 from './cosmos/cosmos-sdk/cosmos.evidence.v1beta1' -import CosmosCosmosSdkCosmosFeegrantV1Beta1 from './cosmos/cosmos-sdk/cosmos.feegrant.v1beta1' -import CosmosCosmosSdkCosmosGovV1Beta1 from './cosmos/cosmos-sdk/cosmos.gov.v1beta1' -import CosmosCosmosSdkCosmosMintV1Beta1 from './cosmos/cosmos-sdk/cosmos.mint.v1beta1' -import CosmosCosmosSdkCosmosParamsV1Beta1 from './cosmos/cosmos-sdk/cosmos.params.v1beta1' -import CosmosCosmosSdkCosmosSlashingV1Beta1 from './cosmos/cosmos-sdk/cosmos.slashing.v1beta1' -import CosmosCosmosSdkCosmosStakingV1Beta1 from './cosmos/cosmos-sdk/cosmos.staking.v1beta1' -import CosmosCosmosSdkCosmosTxV1Beta1 from './cosmos/cosmos-sdk/cosmos.tx.v1beta1' -import CosmosCosmosSdkCosmosUpgradeV1Beta1 from './cosmos/cosmos-sdk/cosmos.upgrade.v1beta1' -import CosmosCosmosSdkCosmosVestingV1Beta1 from './cosmos/cosmos-sdk/cosmos.vesting.v1beta1' -import IbcGoV3IbcApplicationsInterchainAccountsControllerV1 from './ibc-go/v3/ibc.applications.interchain_accounts.controller.v1' -import IbcGoV3IbcApplicationsInterchainAccountsHostV1 from './ibc-go/v3/ibc.applications.interchain_accounts.host.v1' -import IbcGoV3IbcApplicationsTransferV1 from './ibc-go/v3/ibc.applications.transfer.v1' -import IbcGoV3IbcCoreChannelV1 from './ibc-go/v3/ibc.core.channel.v1' -import IbcGoV3IbcCoreClientV1 from './ibc-go/v3/ibc.core.client.v1' -import IbcGoV3IbcCoreConnectionV1 from './ibc-go/v3/ibc.core.connection.v1' -import TendermintSpnTendermintSpnMonitoringp from './tendermint/spn/tendermint.spn.monitoringp' -import ThesixnetworkSixnftThesixnetworkSixnftEvmsupport from './thesixnetwork/sixnft/thesixnetwork.sixnft.evmsupport' -import ThesixnetworkSixnftThesixnetworkSixnftNftadmin from './thesixnetwork/sixnft/thesixnetwork.sixnft.nftadmin' -import ThesixnetworkSixnftThesixnetworkSixnftNftmngr from './thesixnetwork/sixnft/thesixnetwork.sixnft.nftmngr' -import ThesixnetworkSixnftThesixnetworkSixnftNftoracle from './thesixnetwork/sixnft/thesixnetwork.sixnft.nftoracle' - - -export default { - CosmosCosmosSdkCosmosAuthV1Beta1: load(CosmosCosmosSdkCosmosAuthV1Beta1, 'cosmos.auth.v1beta1'), - CosmosCosmosSdkCosmosAuthzV1Beta1: load(CosmosCosmosSdkCosmosAuthzV1Beta1, 'cosmos.authz.v1beta1'), - CosmosCosmosSdkCosmosBankV1Beta1: load(CosmosCosmosSdkCosmosBankV1Beta1, 'cosmos.bank.v1beta1'), - CosmosCosmosSdkCosmosBaseTendermintV1Beta1: load(CosmosCosmosSdkCosmosBaseTendermintV1Beta1, 'cosmos.base.tendermint.v1beta1'), - CosmosCosmosSdkCosmosCrisisV1Beta1: load(CosmosCosmosSdkCosmosCrisisV1Beta1, 'cosmos.crisis.v1beta1'), - CosmosCosmosSdkCosmosDistributionV1Beta1: load(CosmosCosmosSdkCosmosDistributionV1Beta1, 'cosmos.distribution.v1beta1'), - CosmosCosmosSdkCosmosEvidenceV1Beta1: load(CosmosCosmosSdkCosmosEvidenceV1Beta1, 'cosmos.evidence.v1beta1'), - CosmosCosmosSdkCosmosFeegrantV1Beta1: load(CosmosCosmosSdkCosmosFeegrantV1Beta1, 'cosmos.feegrant.v1beta1'), - CosmosCosmosSdkCosmosGovV1Beta1: load(CosmosCosmosSdkCosmosGovV1Beta1, 'cosmos.gov.v1beta1'), - CosmosCosmosSdkCosmosMintV1Beta1: load(CosmosCosmosSdkCosmosMintV1Beta1, 'cosmos.mint.v1beta1'), - CosmosCosmosSdkCosmosParamsV1Beta1: load(CosmosCosmosSdkCosmosParamsV1Beta1, 'cosmos.params.v1beta1'), - CosmosCosmosSdkCosmosSlashingV1Beta1: load(CosmosCosmosSdkCosmosSlashingV1Beta1, 'cosmos.slashing.v1beta1'), - CosmosCosmosSdkCosmosStakingV1Beta1: load(CosmosCosmosSdkCosmosStakingV1Beta1, 'cosmos.staking.v1beta1'), - CosmosCosmosSdkCosmosTxV1Beta1: load(CosmosCosmosSdkCosmosTxV1Beta1, 'cosmos.tx.v1beta1'), - CosmosCosmosSdkCosmosUpgradeV1Beta1: load(CosmosCosmosSdkCosmosUpgradeV1Beta1, 'cosmos.upgrade.v1beta1'), - CosmosCosmosSdkCosmosVestingV1Beta1: load(CosmosCosmosSdkCosmosVestingV1Beta1, 'cosmos.vesting.v1beta1'), - IbcGoV3IbcApplicationsInterchainAccountsControllerV1: load(IbcGoV3IbcApplicationsInterchainAccountsControllerV1, 'ibc.applications.interchain_accounts.controller.v1'), - IbcGoV3IbcApplicationsInterchainAccountsHostV1: load(IbcGoV3IbcApplicationsInterchainAccountsHostV1, 'ibc.applications.interchain_accounts.host.v1'), - IbcGoV3IbcApplicationsTransferV1: load(IbcGoV3IbcApplicationsTransferV1, 'ibc.applications.transfer.v1'), - IbcGoV3IbcCoreChannelV1: load(IbcGoV3IbcCoreChannelV1, 'ibc.core.channel.v1'), - IbcGoV3IbcCoreClientV1: load(IbcGoV3IbcCoreClientV1, 'ibc.core.client.v1'), - IbcGoV3IbcCoreConnectionV1: load(IbcGoV3IbcCoreConnectionV1, 'ibc.core.connection.v1'), - TendermintSpnTendermintSpnMonitoringp: load(TendermintSpnTendermintSpnMonitoringp, 'tendermint.spn.monitoringp'), - ThesixnetworkSixnftThesixnetworkSixnftEvmsupport: load(ThesixnetworkSixnftThesixnetworkSixnftEvmsupport, 'thesixnetwork.sixnft.evmsupport'), - ThesixnetworkSixnftThesixnetworkSixnftNftadmin: load(ThesixnetworkSixnftThesixnetworkSixnftNftadmin, 'thesixnetwork.sixnft.nftadmin'), - ThesixnetworkSixnftThesixnetworkSixnftNftmngr: load(ThesixnetworkSixnftThesixnetworkSixnftNftmngr, 'thesixnetwork.sixnft.nftmngr'), - ThesixnetworkSixnftThesixnetworkSixnftNftoracle: load(ThesixnetworkSixnftThesixnetworkSixnftNftoracle, 'thesixnetwork.sixnft.nftoracle'), - -} - - -function load(mod, fullns) { - return function init(store) { - if (store.hasModule([fullns])) { - throw new Error('Duplicate module name detected: '+ fullns) - }else{ - store.registerModule([fullns], mod) - store.subscribe((mutation) => { - if (mutation.type == 'common/env/INITIALIZE_WS_COMPLETE') { - store.dispatch(fullns+ '/init', null, { - root: true - }) - } - }) - } - } -} From 38b9b46facabb2567691008971dcb77756b39720 Mon Sep 17 00:00:00 2001 From: dDee-D-six Date: Wed, 19 Oct 2022 15:51:48 +0700 Subject: [PATCH 02/10] add end time to oracle --- docs/static/openapi.yml | 69 +- go.mod | 2 + go.sum | 4 + .../nftoracle/collection_owner_request.proto | 14 +- scripts/menu.sh | 41 +- scripts/new-action.json | 6 + scripts/new-attribute.json | 18 + x/nftmngr/keeper/validate.go | 6 +- .../msg_server_create_action_request.go | 6 +- ..._create_verify_collection_owner_request.go | 8 +- .../types/collection_owner_request.pb.go | 749 ++++++++++-------- 11 files changed, 521 insertions(+), 402 deletions(-) create mode 100644 scripts/new-action.json create mode 100644 scripts/new-attribute.json diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml index e3788bac..f9816fbc 100644 --- a/docs/static/openapi.yml +++ b/docs/static/openapi.yml @@ -35510,16 +35510,6 @@ paths: in: query required: false type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean tags: - Query '/sixnft/nftoracle/action_request/{id}': @@ -35813,16 +35803,6 @@ paths: in: query required: false type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean tags: - Query '/sixnft/nftoracle/mint_request/{id}': @@ -35944,7 +35924,6 @@ paths: type: object properties: params: - description: params holds all the parameters of this module. type: object properties: mint_request_active_duration: @@ -35953,6 +35932,7 @@ paths: type: string verify_request_active_duration: type: string + description: Params defines the parameters for the module. description: >- QueryParamsResponse is response type for the Query/Params RPC method. @@ -36038,6 +36018,11 @@ paths: type: string contract_owner: type: string + ref_id: + type: string + expired_at: + type: string + format: date-time hash: type: string format: byte @@ -36140,16 +36125,6 @@ paths: in: query required: false type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean tags: - Query '/thesixnetwork/sixnft/nftoracle/collection_owner_request/{id}': @@ -36212,6 +36187,11 @@ paths: type: string contract_owner: type: string + ref_id: + type: string + expired_at: + type: string + format: date-time hash: type: string format: byte @@ -60810,6 +60790,11 @@ definitions: type: string contract_owner: type: string + ref_id: + type: string + expired_at: + type: string + format: date-time hash: type: string format: byte @@ -61007,6 +60992,11 @@ definitions: type: string contract_owner: type: string + ref_id: + type: string + expired_at: + type: string + format: date-time hash: type: string format: byte @@ -61023,6 +61013,11 @@ definitions: type: string contract_owner: type: string + ref_id: + type: string + expired_at: + type: string + format: date-time thesixnetwork.sixnft.nftoracle.Params: type: object properties: @@ -61197,6 +61192,11 @@ definitions: type: string contract_owner: type: string + ref_id: + type: string + expired_at: + type: string + format: date-time hash: type: string format: byte @@ -61469,6 +61469,11 @@ definitions: type: string contract_owner: type: string + ref_id: + type: string + expired_at: + type: string + format: date-time hash: type: string format: byte @@ -61567,7 +61572,6 @@ definitions: type: object properties: params: - description: params holds all the parameters of this module. type: object properties: mint_request_active_duration: @@ -61576,6 +61580,7 @@ definitions: type: string verify_request_active_duration: type: string + description: Params defines the parameters for the module. description: QueryParamsResponse is response type for the Query/Params RPC method. thesixnetwork.sixnft.nftoracle.RequestStatus: type: string diff --git a/go.mod b/go.mod index d5bb0ee7..cc4d31d9 100644 --- a/go.mod +++ b/go.mod @@ -80,6 +80,7 @@ require ( github.com/goccy/go-yaml v1.9.4 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/gateway v1.1.0 // indirect + github.com/golang/glog v1.0.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/snappy v0.0.3 // indirect github.com/google/btree v1.0.0 // indirect @@ -90,6 +91,7 @@ require ( github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.12.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/gtank/merlin v0.1.1 // indirect github.com/gtank/ristretto255 v0.1.2 // indirect diff --git a/go.sum b/go.sum index abe5dea0..48335fb5 100644 --- a/go.sum +++ b/go.sum @@ -606,6 +606,8 @@ github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2V github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188/go.mod h1:vXjM/+wXQnTPR4KqTKDgJukSZ6amVRtWMPEjE6sQoK8= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= +github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -735,6 +737,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.12.0 h1:kr3j8iIMR4ywO/O0rvksXaJvauGGCMg2zAZIiNZ9uIQ= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.12.0/go.mod h1:ummNFgdgLhhX7aIiy35vVmQNS0rWXknfPE0qe6fmFXg= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/gtank/merlin v0.1.1-0.20191105220539-8318aed1a79f/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= diff --git a/proto/nftoracle/collection_owner_request.proto b/proto/nftoracle/collection_owner_request.proto index b7df9b9d..1b8b5372 100644 --- a/proto/nftoracle/collection_owner_request.proto +++ b/proto/nftoracle/collection_owner_request.proto @@ -10,12 +10,8 @@ message OriginContractParam { string chain = 1; string contract_address = 2; string contract_owner = 3; -} - -message OriginContractInfo { - OriginContractParam contractOriginDataInfo = 1; - bytes hash = 2; - repeated string confirmers = 3; + google.protobuf.Timestamp request_expire = 4 + [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; } message CollectionOwnerRequest { @@ -34,3 +30,9 @@ message CollectionOwnerRequest { int64 expired_height = 11; } + +message OriginContractInfo { + OriginContractParam contractOriginDataInfo = 1; + bytes hash = 2; + repeated string confirmers = 3; +} \ No newline at end of file diff --git a/scripts/menu.sh b/scripts/menu.sh index 9f454e39..c08a1985 100755 --- a/scripts/menu.sh +++ b/scripts/menu.sh @@ -1,5 +1,5 @@ EVMSIGN=./evmsign -default_schema_cdoe=$1 +default_schema_code=$1 echo "#############################################" echo "## ##" echo "## Welcome to the menu script ##" @@ -20,6 +20,8 @@ echo "## 11. Oracle - Submit Action Response ##" echo "## 12. Oracle - Create Verfify Request ##" echo "## 13. Oracle - Get Verify Request ##" echo "## 14. Oracle - Submit Verify Response ##" +echo "## 15. Add Attribute ##" +echo "## 16. Add Action ##" echo "## Your choice: ##" echo "## ##" echo "#############################################" @@ -28,7 +30,7 @@ case $choice in 1) echo "Showing Schema" read -p "Enter Schema Code: " schema_code if [ -z "$schema_code" ]; then - schema_code=$default_schema_cdoe + schema_code=$default_schema_code fi sixnftd q nftmngr show-nft-schema ${schema_code} --output json | jq . ;; @@ -36,7 +38,7 @@ case $choice in read -p "Enter Schema Code: " schema_code read -p "Enter Token ID: " token_id if [ -z "$schema_code" ]; then - schema_code=$default_schema_cdoe + schema_code=$default_schema_code fi sixnftd q nftmngr show-nft-data ${schema_code} ${token_id} --output json | jq . ;; @@ -44,7 +46,7 @@ case $choice in read -p "Enter Schema Code: " schema_code read -p "Enter Token ID: " token_id if [ -z "$schema_code" ]; then - schema_code=$default_schema_cdoe + schema_code=$default_schema_code fi BASE64_META=`cat nft-data.json | sed "s/TOKENID/${token_id}/g" | sed "s/SCHEMA_CODE/${schema_code}/g" | base64 | tr -d '\n'` sixnftd tx nftmngr create-metadata "${schema_code}" ${token_id} --from alice --gas auto --gas-adjustment 1.5 --gas-prices 0.1stake -y \ @@ -55,7 +57,7 @@ case $choice in read -p "Enter Token ID: " token_id read -p "Enter Action: " action if [ -z "$schema_code" ]; then - schema_code=$default_schema_cdoe + schema_code=$default_schema_code fi sixnftd tx nftmngr perform-action-by-nftadmin ${schema_code} ${token_id} ${action} --from alice --gas auto --gas-adjustment 1.5 --gas-prices 0.1stake -y ;; @@ -63,7 +65,7 @@ case $choice in read -p "Enter Schema Code: " schema_code read -p "Enter Value (attribute_name=N[value]): " value if [ -z "$schema_code" ]; then - schema_code=$default_schema_cdoe + schema_code=$default_schema_code fi ATTRIBUTE_NAME=`echo $value | cut -d'=' -f1` @@ -110,7 +112,7 @@ case $choice in read -p "Enter Token ID: " token_id read -p "Require confirmations: " require_confirmations if [ -z "$schema_code" ]; then - schema_code=$default_schema_cdoe + schema_code=$default_schema_code fi sixnftd tx nftoracle create-mint-request ${schema_code} ${token_id} ${require_confirmations} --from alice --gas auto --gas-adjustment 1.5 --gas-prices 0.1stake -y ;; @@ -132,7 +134,7 @@ case $choice in read -p "Require confirmations: " require_confirmations read -p "Reference ID: " reference_id if [ -z "$schema_code" ]; then - schema_code=$default_schema_cdoe + schema_code=$default_schema_code fi BASE64JSON=`cat action-param.json | sed "s/ACTION/${action}/g" | sed "s/TOKEN_ID/${token_id}/g" | sed "s/SCHEMA_CODE/${schema_code}/g" | sed "s/REFID/${reference_id}/g"` @@ -163,7 +165,7 @@ case $choice in read -p "Enter Schema Code: " schema_code read -p "Require confirmations: " require_confirmations if [ -z "$schema_code" ]; then - schema_code=$default_schema_cdoe + schema_code=$default_schema_code fi BASE64JSON=`cat verify-collection-owner.json` @@ -186,12 +188,31 @@ case $choice in read -p "Verify Request ID: " verfiry_request_id read -p "Oracle : " oracle_key_name if [ -z "$schema_code" ]; then - schema_code=$default_schema_cdoe + schema_code=$default_schema_code fi BASE64_ORIGINDATA=`cat verify-collection-owner.json | base64 | tr -d '\n'` sixnftd tx nftoracle submit-verify-collection-owner ${verfiry_request_id} ${schema_code} ${BASE64_ORIGINDATA} --from ${oracle_key_name} --gas auto --gas-adjustment 1.5 --gas-prices 0.1stake -y ;; + 15) echo "Add Attribute" + read -p "Enter Schema Code: " schema_code + if [ -z "$schema_code" ]; then + schema_code=$default_schema_code + fi + read -p "Location of attribute (0 or 1): " location + BASE64_ATTRIBUTE=`cat new-attribute.json | base64 | tr -d '\n'` + sixnftd tx nftmngr add-attribute ${schema_code} ${location} ${BASE64_ATTRIBUTE} --from alice --gas auto --gas-adjustment 1.5 --gas-prices 0.1stake -y \ + --chain-id sixnft + ;; + 16) echo "Add Action" + read -p "Enter Schema Code: " schema_code + if [ -z "$schema_code" ]; then + schema_code=$default_schema_code + fi + BASE64_ACTION=`cat new-action.json | base64 | tr -d '\n'` + sixnftd tx nftmngr add-action ${schema_code} ${BASE64_ACTION} --from alice --gas auto --gas-adjustment 1.5 --gas-prices 0.1stake -y \ + --chain-id sixnft + ;; *) echo "Invalid choice" ;; esac \ No newline at end of file diff --git a/scripts/new-action.json b/scripts/new-action.json new file mode 100644 index 00000000..377d195b --- /dev/null +++ b/scripts/new-action.json @@ -0,0 +1,6 @@ +{ + "name": "new_action", + "desc": "Use Festival Pass2", + "when": "meta.GetNumber('some_attribute') == 0", + "then": ["meta.SetNumber('some_attribute',meta.GetNumber('some_attribute') 1)"] +} \ No newline at end of file diff --git a/scripts/new-attribute.json b/scripts/new-attribute.json new file mode 100644 index 00000000..c45aa8fa --- /dev/null +++ b/scripts/new-attribute.json @@ -0,0 +1,18 @@ +{ + "name": "new_attribute", + "default_mint_value": { + "boolean_attribute_value": { + "value": false + } + }, + "data_type": "boolean", + "required": true, + "display_value_field": "value", + "display_option": { + "bool_true_value": "Yes", + "bool_false_value": "No", + "opensea": { + "trait_type": "New Attribute" + } + } +} \ No newline at end of file diff --git a/x/nftmngr/keeper/validate.go b/x/nftmngr/keeper/validate.go index 7c2c92a2..25dca8fb 100644 --- a/x/nftmngr/keeper/validate.go +++ b/x/nftmngr/keeper/validate.go @@ -1,7 +1,7 @@ package keeper import ( - "fmt" + // "fmt" "github.com/thesixnetwork/sixnft/x/nftmngr/types" ) @@ -68,11 +68,11 @@ func HasSameType(mapOriginAttributes map[string]*types.AttributeDefinition, onch for _, attriVal := range onchainAttributes { attrDef := mapOriginAttributes[attriVal.Name] if attrDef == nil { - fmt.Println("Attribute not found: ", attriVal.Name) + // fmt.Println("Attribute not found: ", attriVal.Name) continue } if attrDef.DataType != attriVal.DataType { - fmt.Println("attrDef.DataType: ", attrDef.DataType) + // fmt.Println("attrDef.DataType: ", attrDef.DataType) return false, attrDef.Name } } diff --git a/x/nftoracle/keeper/msg_server_create_action_request.go b/x/nftoracle/keeper/msg_server_create_action_request.go index 065dfab6..7ed8b1e0 100644 --- a/x/nftoracle/keeper/msg_server_create_action_request.go +++ b/x/nftoracle/keeper/msg_server_create_action_request.go @@ -65,6 +65,10 @@ func (k msgServer) CreateActionRequest(goCtx context.Context, msg *types.MsgCrea createdAt := ctx.BlockTime() endTime := createdAt.Add(k.ActionRequestActiveDuration(ctx)) + if len(actionParam.ExpiredAt.String()) == 0 { + actionParam.ExpiredAt = endTime + } + id_ := k.Keeper.AppendActionRequest(ctx, types.ActionRequest{ NftSchemaCode: actionParam.NftSchemaCode, TokenId: actionParam.TokenId, @@ -75,7 +79,7 @@ func (k msgServer) CreateActionRequest(goCtx context.Context, msg *types.MsgCrea Status: types.RequestStatus_PENDING, CurrentConfirm: 0, CreatedAt: createdAt, - ValidUntil: endTime, + ValidUntil: actionParam.ExpiredAt, Confirmers: make(map[string]bool), DataHashes: make([]*types.DataHash, 0), }) diff --git a/x/nftoracle/keeper/msg_server_create_verify_collection_owner_request.go b/x/nftoracle/keeper/msg_server_create_verify_collection_owner_request.go index 38352653..1287221d 100644 --- a/x/nftoracle/keeper/msg_server_create_verify_collection_owner_request.go +++ b/x/nftoracle/keeper/msg_server_create_verify_collection_owner_request.go @@ -43,7 +43,7 @@ func (k msgServer) CreateVerifyCollectionOwnerRequest(goCtx context.Context, msg if err != nil { return nil, sdkerrors.Wrap(types.ErrParsingCollectionOwnerSignature, err.Error()) } - _, signer, err := k.ValidateCollectionOwnerSignature(data) + _originContractParam, signer, err := k.ValidateCollectionOwnerSignature(data) if err != nil { return nil, sdkerrors.Wrap(types.ErrVerifyingSignature, err.Error()) } @@ -61,6 +61,10 @@ func (k msgServer) CreateVerifyCollectionOwnerRequest(goCtx context.Context, msg createdAt := ctx.BlockTime() endTime := createdAt.Add(k.VerifyRequestActiveDuration(ctx)) + if len(_originContractParam.RequestExpire.String()) == 0 { + _originContractParam.RequestExpire = endTime + } + id_ := k.Keeper.AppendCollectionOwnerRequest(ctx, types.CollectionOwnerRequest{ NftSchemaCode: msg.NftSchemaCode, Signer: *signer, @@ -68,7 +72,7 @@ func (k msgServer) CreateVerifyCollectionOwnerRequest(goCtx context.Context, msg Status: types.RequestStatus_PENDING, CurrentConfirm: 0, CreatedAt: createdAt, - ValidUntil: endTime, + ValidUntil: _originContractParam.RequestExpire, Confirmers: make(map[string]bool), ContractInfo: make([]*types.OriginContractInfo, 0), }) diff --git a/x/nftoracle/types/collection_owner_request.pb.go b/x/nftoracle/types/collection_owner_request.pb.go index 4d2cb9dc..a33e8ccf 100644 --- a/x/nftoracle/types/collection_owner_request.pb.go +++ b/x/nftoracle/types/collection_owner_request.pb.go @@ -28,9 +28,10 @@ var _ = time.Kitchen const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type OriginContractParam struct { - Chain string `protobuf:"bytes,1,opt,name=chain,proto3" json:"chain,omitempty"` - ContractAddress string `protobuf:"bytes,2,opt,name=contract_address,json=contractAddress,proto3" json:"contract_address,omitempty"` - ContractOwner string `protobuf:"bytes,3,opt,name=contract_owner,json=contractOwner,proto3" json:"contract_owner,omitempty"` + Chain string `protobuf:"bytes,1,opt,name=chain,proto3" json:"chain,omitempty"` + ContractAddress string `protobuf:"bytes,2,opt,name=contract_address,json=contractAddress,proto3" json:"contract_address,omitempty"` + ContractOwner string `protobuf:"bytes,3,opt,name=contract_owner,json=contractOwner,proto3" json:"contract_owner,omitempty"` + RequestExpire time.Time `protobuf:"bytes,4,opt,name=request_expire,json=requestExpire,proto3,stdtime" json:"request_expire"` } func (m *OriginContractParam) Reset() { *m = OriginContractParam{} } @@ -87,64 +88,11 @@ func (m *OriginContractParam) GetContractOwner() string { return "" } -type OriginContractInfo struct { - ContractOriginDataInfo *OriginContractParam `protobuf:"bytes,1,opt,name=contractOriginDataInfo,proto3" json:"contractOriginDataInfo,omitempty"` - Hash []byte `protobuf:"bytes,2,opt,name=hash,proto3" json:"hash,omitempty"` - Confirmers []string `protobuf:"bytes,3,rep,name=confirmers,proto3" json:"confirmers,omitempty"` -} - -func (m *OriginContractInfo) Reset() { *m = OriginContractInfo{} } -func (m *OriginContractInfo) String() string { return proto.CompactTextString(m) } -func (*OriginContractInfo) ProtoMessage() {} -func (*OriginContractInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_5b5e5fd2fa665471, []int{1} -} -func (m *OriginContractInfo) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *OriginContractInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_OriginContractInfo.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *OriginContractInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_OriginContractInfo.Merge(m, src) -} -func (m *OriginContractInfo) XXX_Size() int { - return m.Size() -} -func (m *OriginContractInfo) XXX_DiscardUnknown() { - xxx_messageInfo_OriginContractInfo.DiscardUnknown(m) -} - -var xxx_messageInfo_OriginContractInfo proto.InternalMessageInfo - -func (m *OriginContractInfo) GetContractOriginDataInfo() *OriginContractParam { - if m != nil { - return m.ContractOriginDataInfo - } - return nil -} - -func (m *OriginContractInfo) GetHash() []byte { +func (m *OriginContractParam) GetRequestExpire() time.Time { if m != nil { - return m.Hash + return m.RequestExpire } - return nil -} - -func (m *OriginContractInfo) GetConfirmers() []string { - if m != nil { - return m.Confirmers - } - return nil + return time.Time{} } type CollectionOwnerRequest struct { @@ -165,7 +113,7 @@ func (m *CollectionOwnerRequest) Reset() { *m = CollectionOwnerRequest{} func (m *CollectionOwnerRequest) String() string { return proto.CompactTextString(m) } func (*CollectionOwnerRequest) ProtoMessage() {} func (*CollectionOwnerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_5b5e5fd2fa665471, []int{2} + return fileDescriptor_5b5e5fd2fa665471, []int{1} } func (m *CollectionOwnerRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -271,11 +219,71 @@ func (m *CollectionOwnerRequest) GetExpiredHeight() int64 { return 0 } +type OriginContractInfo struct { + ContractOriginDataInfo *OriginContractParam `protobuf:"bytes,1,opt,name=contractOriginDataInfo,proto3" json:"contractOriginDataInfo,omitempty"` + Hash []byte `protobuf:"bytes,2,opt,name=hash,proto3" json:"hash,omitempty"` + Confirmers []string `protobuf:"bytes,3,rep,name=confirmers,proto3" json:"confirmers,omitempty"` +} + +func (m *OriginContractInfo) Reset() { *m = OriginContractInfo{} } +func (m *OriginContractInfo) String() string { return proto.CompactTextString(m) } +func (*OriginContractInfo) ProtoMessage() {} +func (*OriginContractInfo) Descriptor() ([]byte, []int) { + return fileDescriptor_5b5e5fd2fa665471, []int{2} +} +func (m *OriginContractInfo) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *OriginContractInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_OriginContractInfo.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *OriginContractInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_OriginContractInfo.Merge(m, src) +} +func (m *OriginContractInfo) XXX_Size() int { + return m.Size() +} +func (m *OriginContractInfo) XXX_DiscardUnknown() { + xxx_messageInfo_OriginContractInfo.DiscardUnknown(m) +} + +var xxx_messageInfo_OriginContractInfo proto.InternalMessageInfo + +func (m *OriginContractInfo) GetContractOriginDataInfo() *OriginContractParam { + if m != nil { + return m.ContractOriginDataInfo + } + return nil +} + +func (m *OriginContractInfo) GetHash() []byte { + if m != nil { + return m.Hash + } + return nil +} + +func (m *OriginContractInfo) GetConfirmers() []string { + if m != nil { + return m.Confirmers + } + return nil +} + func init() { proto.RegisterType((*OriginContractParam)(nil), "thesixnetwork.sixnft.nftoracle.OriginContractParam") - proto.RegisterType((*OriginContractInfo)(nil), "thesixnetwork.sixnft.nftoracle.OriginContractInfo") proto.RegisterType((*CollectionOwnerRequest)(nil), "thesixnetwork.sixnft.nftoracle.CollectionOwnerRequest") proto.RegisterMapType((map[string]bool)(nil), "thesixnetwork.sixnft.nftoracle.CollectionOwnerRequest.ConfirmersEntry") + proto.RegisterType((*OriginContractInfo)(nil), "thesixnetwork.sixnft.nftoracle.OriginContractInfo") } func init() { @@ -283,46 +291,48 @@ func init() { } var fileDescriptor_5b5e5fd2fa665471 = []byte{ - // 624 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x6e, 0xd3, 0x4c, - 0x14, 0x8d, 0x93, 0x36, 0x5f, 0x73, 0xd3, 0x26, 0xd5, 0x7c, 0x55, 0xb1, 0xb2, 0x70, 0xa3, 0x8a, - 0x8a, 0xb0, 0xc0, 0x16, 0xe9, 0x06, 0x21, 0xb1, 0x68, 0x43, 0x11, 0x88, 0x45, 0x91, 0x0b, 0x42, - 0x62, 0x63, 0x4d, 0xed, 0xb1, 0x3d, 0xaa, 0x33, 0x13, 0xc6, 0xd7, 0xfd, 0x59, 0xf0, 0x0e, 0x7d, - 0x18, 0x78, 0x87, 0x2e, 0xbb, 0x64, 0x05, 0xa8, 0x7d, 0x11, 0xe4, 0xb1, 0xe3, 0x26, 0xa8, 0x50, - 0x75, 0x77, 0xe7, 0xf8, 0xfe, 0xcc, 0x39, 0xf7, 0x8c, 0x61, 0x20, 0x42, 0x94, 0x8a, 0xfa, 0x09, - 0x73, 0x7c, 0x99, 0x24, 0xcc, 0x47, 0x2e, 0x85, 0x27, 0x4f, 0x04, 0x53, 0x9e, 0x62, 0x9f, 0x33, - 0x96, 0xa2, 0x3d, 0x51, 0x12, 0x25, 0xb1, 0x30, 0x66, 0x29, 0x3f, 0x15, 0x0c, 0x4f, 0xa4, 0x3a, - 0xb2, 0xf3, 0x30, 0x44, 0xbb, 0x2a, 0xef, 0x3d, 0xb8, 0xe9, 0x34, 0x57, 0xd8, 0x5b, 0x8b, 0x64, - 0x24, 0x75, 0xe8, 0xe4, 0x51, 0x89, 0x6e, 0x44, 0x52, 0x46, 0x09, 0x73, 0xf4, 0xe9, 0x30, 0x0b, - 0x1d, 0xe4, 0x63, 0x96, 0x22, 0x1d, 0x4f, 0x8a, 0x84, 0xcd, 0x2f, 0xf0, 0xff, 0xbe, 0xe2, 0x11, - 0x17, 0x23, 0x29, 0x50, 0x51, 0x1f, 0xdf, 0x51, 0x45, 0xc7, 0x64, 0x0d, 0x16, 0xfd, 0x98, 0x72, - 0x61, 0x1a, 0x7d, 0x63, 0xd0, 0x72, 0x8b, 0x03, 0x79, 0x0c, 0xab, 0x7e, 0x99, 0xe6, 0xd1, 0x20, - 0x50, 0x2c, 0x4d, 0xcd, 0xba, 0x4e, 0xe8, 0x4e, 0xf1, 0x9d, 0x02, 0x26, 0x5b, 0xd0, 0xa9, 0x52, - 0x35, 0x4f, 0xb3, 0xa1, 0x13, 0x57, 0xa6, 0xe8, 0x7e, 0x0e, 0x6e, 0x7e, 0x33, 0x80, 0xcc, 0xcf, - 0x7f, 0x23, 0x42, 0x49, 0x8e, 0x60, 0xbd, 0xca, 0xd3, 0x5f, 0x5f, 0x52, 0xa4, 0xf9, 0x17, 0x7d, - 0x9f, 0xf6, 0x70, 0xdb, 0xfe, 0xb7, 0x4c, 0xf6, 0x2d, 0x9c, 0xdc, 0xbf, 0xb4, 0x24, 0x04, 0x16, - 0x62, 0x9a, 0xc6, 0x9a, 0xc9, 0xb2, 0xab, 0x63, 0x62, 0x01, 0xf8, 0x52, 0x84, 0x5c, 0x8d, 0x99, - 0x4a, 0xcd, 0x46, 0xbf, 0x31, 0x68, 0xb9, 0x33, 0xc8, 0xe6, 0xd7, 0x45, 0x58, 0x1f, 0x55, 0x9b, - 0xd4, 0x5c, 0xdc, 0x62, 0x1d, 0xa4, 0x03, 0x75, 0x1e, 0xe8, 0x7b, 0x2e, 0xb8, 0x75, 0x1e, 0x90, - 0x87, 0xb0, 0x22, 0x42, 0x3c, 0xf0, 0x63, 0x36, 0xa6, 0x23, 0x19, 0xb0, 0x52, 0xb1, 0x79, 0x90, - 0xac, 0x43, 0x33, 0xe5, 0xd1, 0x8d, 0x4e, 0xe5, 0x29, 0x97, 0x3c, 0xdf, 0x33, 0x57, 0x2c, 0xf0, - 0xca, 0xf9, 0xe6, 0x82, 0xee, 0xdd, 0x9d, 0xe2, 0xa3, 0x02, 0x26, 0x7b, 0xd0, 0x4c, 0x91, 0x62, - 0x96, 0x9a, 0x8b, 0x7d, 0x63, 0xd0, 0x19, 0x3e, 0xb9, 0x4b, 0xa4, 0xf2, 0xc6, 0x07, 0xba, 0xc8, - 0x2d, 0x8b, 0xc9, 0x23, 0xe8, 0xfa, 0x99, 0x52, 0x4c, 0x60, 0x35, 0xb0, 0xa9, 0x07, 0x76, 0x4a, - 0x78, 0x3a, 0x2f, 0x9c, 0xd3, 0xe8, 0xbf, 0x7e, 0x63, 0xd0, 0x1e, 0xbe, 0xba, 0x6b, 0xe6, 0xed, - 0xa2, 0xd9, 0xa3, 0xaa, 0xd1, 0x9e, 0x40, 0x75, 0x36, 0xab, 0x35, 0x19, 0x01, 0xf8, 0x8a, 0x51, - 0x64, 0x81, 0x47, 0xd1, 0x5c, 0xd2, 0x06, 0xe8, 0xd9, 0x85, 0xb1, 0xed, 0xa9, 0xb1, 0xed, 0xf7, - 0x53, 0x63, 0xef, 0x2e, 0x5d, 0xfc, 0xd8, 0xa8, 0x9d, 0xff, 0xdc, 0x30, 0xdc, 0x56, 0x59, 0xb7, - 0x83, 0x64, 0x0f, 0xda, 0xc7, 0x34, 0xe1, 0x81, 0x97, 0x09, 0xe4, 0x89, 0xd9, 0xba, 0x47, 0x17, - 0xd0, 0x85, 0x1f, 0xf2, 0x3a, 0xf2, 0x11, 0x2a, 0x03, 0x7b, 0x3c, 0xf7, 0x23, 0x68, 0xda, 0xc3, - 0xfb, 0xf9, 0x31, 0xb7, 0x9d, 0xbb, 0xec, 0xcf, 0x3a, 0x7e, 0x0b, 0x3a, 0xec, 0x74, 0xa2, 0xd7, - 0x1c, 0x33, 0x1e, 0xc5, 0x68, 0xb6, 0xfb, 0xc6, 0xa0, 0xe1, 0xae, 0x94, 0xe8, 0x6b, 0x0d, 0xf6, - 0x5e, 0x40, 0xf7, 0x0f, 0xa9, 0xc8, 0x2a, 0x34, 0x8e, 0xd8, 0x59, 0xf9, 0x50, 0xf3, 0x30, 0x7f, - 0xbc, 0xc7, 0x34, 0xc9, 0x0a, 0xa7, 0x2d, 0xb9, 0xc5, 0xe1, 0x79, 0xfd, 0x99, 0xb1, 0xfb, 0xf6, - 0xe2, 0xca, 0x32, 0x2e, 0xaf, 0x2c, 0xe3, 0xd7, 0x95, 0x65, 0x9c, 0x5f, 0x5b, 0xb5, 0xcb, 0x6b, - 0xab, 0xf6, 0xfd, 0xda, 0xaa, 0x7d, 0x7a, 0x1a, 0x71, 0x8c, 0xb3, 0x43, 0xdb, 0x97, 0x63, 0x67, - 0x8e, 0x8b, 0x53, 0x70, 0x71, 0x4e, 0x9d, 0x9b, 0x3f, 0x0f, 0x9e, 0x4d, 0x58, 0x7a, 0xd8, 0xd4, - 0xaa, 0x6d, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x35, 0x9e, 0xf2, 0xcb, 0xdd, 0x04, 0x00, 0x00, + // 645 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcf, 0x6e, 0xd3, 0x4e, + 0x10, 0x8e, 0x93, 0x34, 0xbf, 0x66, 0xd2, 0x24, 0xd5, 0xfe, 0xaa, 0x62, 0xe5, 0xe0, 0x46, 0x15, + 0x08, 0x73, 0xc0, 0x16, 0xe9, 0x05, 0x21, 0x71, 0x68, 0x43, 0x10, 0xa8, 0x87, 0x22, 0x17, 0x84, + 0xc4, 0xc5, 0xda, 0xda, 0x6b, 0x7b, 0x55, 0x67, 0x37, 0xac, 0xd7, 0xfd, 0xf3, 0x16, 0x7d, 0x18, + 0x78, 0x87, 0x8a, 0x53, 0x8f, 0x9c, 0x00, 0xb5, 0x2f, 0x82, 0xbc, 0xde, 0xb8, 0x0d, 0xff, 0xaa, + 0xde, 0x66, 0x3e, 0xcf, 0x37, 0xf3, 0xcd, 0xec, 0x8c, 0xc1, 0x66, 0x91, 0xe4, 0x02, 0x07, 0x29, + 0x71, 0x03, 0x9e, 0xa6, 0x24, 0x90, 0x94, 0x33, 0x9f, 0x1f, 0x33, 0x22, 0x7c, 0x41, 0x3e, 0xe6, + 0x24, 0x93, 0xce, 0x4c, 0x70, 0xc9, 0x91, 0x25, 0x13, 0x92, 0xd1, 0x13, 0x46, 0xe4, 0x31, 0x17, + 0x87, 0x4e, 0x61, 0x46, 0xd2, 0xa9, 0xe8, 0x83, 0x7b, 0xd7, 0x99, 0x16, 0x88, 0x83, 0xb5, 0x98, + 0xc7, 0x5c, 0x99, 0x6e, 0x61, 0x69, 0x74, 0x23, 0xe6, 0x3c, 0x4e, 0x89, 0xab, 0xbc, 0x83, 0x3c, + 0x72, 0x25, 0x9d, 0x92, 0x4c, 0xe2, 0xe9, 0xac, 0x0c, 0xd8, 0xfc, 0x62, 0xc0, 0xff, 0x7b, 0x82, + 0xc6, 0x94, 0x8d, 0x39, 0x93, 0x02, 0x07, 0xf2, 0x0d, 0x16, 0x78, 0x8a, 0xd6, 0x60, 0x29, 0x48, + 0x30, 0x65, 0xa6, 0x31, 0x34, 0xec, 0xb6, 0x57, 0x3a, 0xe8, 0x11, 0xac, 0x06, 0x3a, 0xcc, 0xc7, + 0x61, 0x28, 0x48, 0x96, 0x99, 0x75, 0x15, 0xd0, 0x9f, 0xe3, 0xdb, 0x25, 0x8c, 0x1e, 0x40, 0xaf, + 0x0a, 0x55, 0x8d, 0x9a, 0x0d, 0x15, 0xd8, 0x9d, 0xa3, 0x7b, 0x05, 0x88, 0x76, 0xa1, 0xa7, 0xfb, + 0xf0, 0xc9, 0xc9, 0x8c, 0x0a, 0x62, 0x36, 0x87, 0x86, 0xdd, 0x19, 0x0d, 0x9c, 0x52, 0xb9, 0x33, + 0x57, 0xee, 0xbc, 0x9d, 0x2b, 0xdf, 0x59, 0x3e, 0xff, 0xb6, 0x51, 0x3b, 0xfb, 0xbe, 0x61, 0x78, + 0x5d, 0xcd, 0x9d, 0x28, 0xea, 0xe6, 0xa7, 0x25, 0x58, 0x1f, 0x57, 0xf3, 0x55, 0x05, 0xbc, 0x32, + 0x00, 0xf5, 0xa0, 0x4e, 0x43, 0xd5, 0x4c, 0xd3, 0xab, 0xd3, 0x10, 0xdd, 0x87, 0x2e, 0x8b, 0xe4, + 0x7e, 0x90, 0x90, 0x29, 0x1e, 0xf3, 0x90, 0xe8, 0x36, 0x16, 0x41, 0xb4, 0x0e, 0xad, 0x8c, 0xc6, + 0xd7, 0xe2, 0xb5, 0x57, 0xcc, 0xa1, 0xa8, 0x4c, 0x05, 0x09, 0xfd, 0x80, 0xb3, 0x88, 0x8a, 0xa9, + 0xd2, 0xdd, 0xf4, 0xfa, 0x73, 0x7c, 0x5c, 0xc2, 0x68, 0x02, 0xad, 0x4c, 0x62, 0x99, 0x67, 0xe6, + 0xd2, 0xd0, 0xb0, 0x7b, 0xa3, 0xc7, 0xce, 0xbf, 0x5f, 0xd8, 0xd1, 0x8a, 0xf7, 0x15, 0xc9, 0xd3, + 0x64, 0xf4, 0x10, 0xfa, 0x41, 0x2e, 0x04, 0x61, 0xb2, 0x2a, 0xd8, 0x52, 0x05, 0x7b, 0x1a, 0x9e, + 0xd7, 0x8b, 0x00, 0x74, 0x00, 0x11, 0x99, 0xf9, 0xdf, 0xb0, 0x61, 0x77, 0x46, 0x2f, 0x6f, 0xab, + 0xf9, 0xe7, 0xa1, 0x39, 0xe3, 0x2a, 0xd1, 0x84, 0x49, 0x71, 0xea, 0xdd, 0xc8, 0x8c, 0xc6, 0x00, + 0x81, 0x20, 0x58, 0x92, 0xd0, 0xc7, 0xd2, 0x5c, 0xbe, 0xc3, 0xa3, 0xb5, 0x35, 0x6f, 0x5b, 0xa2, + 0x09, 0x74, 0x8e, 0x70, 0x4a, 0x43, 0x3f, 0x67, 0x92, 0xa6, 0x66, 0xfb, 0x0e, 0x59, 0x40, 0x11, + 0xdf, 0x15, 0x3c, 0xf4, 0x1e, 0xaa, 0xad, 0xf2, 0x29, 0x8b, 0xb8, 0x09, 0xaa, 0xed, 0xd1, 0x6d, + 0x6d, 0x2f, 0x2e, 0xfe, 0x6b, 0x16, 0x71, 0x6f, 0x25, 0xb8, 0xe1, 0x15, 0x4b, 0x5c, 0x6e, 0x65, + 0xe8, 0x27, 0x84, 0xc6, 0x89, 0x34, 0x3b, 0x43, 0xc3, 0x6e, 0x78, 0x5d, 0x8d, 0xbe, 0x52, 0xe0, + 0xe0, 0x39, 0xf4, 0x7f, 0x19, 0x15, 0x5a, 0x85, 0xc6, 0x21, 0x39, 0xd5, 0xd7, 0x53, 0x98, 0xc5, + 0x45, 0x1d, 0xe1, 0x34, 0x2f, 0x37, 0x6d, 0xd9, 0x2b, 0x9d, 0x67, 0xf5, 0xa7, 0xc6, 0xe6, 0x67, + 0x03, 0xd0, 0xef, 0x52, 0xd0, 0x21, 0xac, 0x57, 0xb7, 0xa2, 0xbe, 0xbe, 0xc0, 0x12, 0x17, 0x5f, + 0x54, 0xd6, 0xce, 0x68, 0xeb, 0x6e, 0xed, 0xa9, 0xbb, 0xf6, 0xfe, 0x92, 0x12, 0x21, 0x68, 0x26, + 0x38, 0x4b, 0x94, 0xb8, 0x15, 0x4f, 0xd9, 0xc8, 0x5a, 0x58, 0xa5, 0xc6, 0xb0, 0x61, 0xb7, 0x6f, + 0xae, 0xc0, 0xce, 0xee, 0xf9, 0xa5, 0x65, 0x5c, 0x5c, 0x5a, 0xc6, 0x8f, 0x4b, 0xcb, 0x38, 0xbb, + 0xb2, 0x6a, 0x17, 0x57, 0x56, 0xed, 0xeb, 0x95, 0x55, 0xfb, 0xf0, 0x24, 0xa6, 0x32, 0xc9, 0x0f, + 0x9c, 0x80, 0x4f, 0xdd, 0x05, 0x91, 0x6e, 0x29, 0xd2, 0x3d, 0x71, 0xaf, 0xff, 0x63, 0xf2, 0x74, + 0x46, 0xb2, 0x83, 0x96, 0x7a, 0xed, 0xad, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x03, 0x98, 0xfd, + 0xb7, 0x2b, 0x05, 0x00, 0x00, } func (m *OriginContractParam) Marshal() (dAtA []byte, err error) { @@ -345,6 +355,14 @@ func (m *OriginContractParam) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.RequestExpire, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.RequestExpire):]) + if err1 != nil { + return 0, err1 + } + i -= n1 + i = encodeVarintCollectionOwnerRequest(dAtA, i, uint64(n1)) + i-- + dAtA[i] = 0x22 if len(m.ContractOwner) > 0 { i -= len(m.ContractOwner) copy(dAtA[i:], m.ContractOwner) @@ -369,57 +387,6 @@ func (m *OriginContractParam) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *OriginContractInfo) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *OriginContractInfo) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *OriginContractInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Confirmers) > 0 { - for iNdEx := len(m.Confirmers) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.Confirmers[iNdEx]) - copy(dAtA[i:], m.Confirmers[iNdEx]) - i = encodeVarintCollectionOwnerRequest(dAtA, i, uint64(len(m.Confirmers[iNdEx]))) - i-- - dAtA[i] = 0x1a - } - } - if len(m.Hash) > 0 { - i -= len(m.Hash) - copy(dAtA[i:], m.Hash) - i = encodeVarintCollectionOwnerRequest(dAtA, i, uint64(len(m.Hash))) - i-- - dAtA[i] = 0x12 - } - if m.ContractOriginDataInfo != nil { - { - size, err := m.ContractOriginDataInfo.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintCollectionOwnerRequest(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func (m *CollectionOwnerRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -534,6 +501,57 @@ func (m *CollectionOwnerRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } +func (m *OriginContractInfo) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *OriginContractInfo) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OriginContractInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Confirmers) > 0 { + for iNdEx := len(m.Confirmers) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Confirmers[iNdEx]) + copy(dAtA[i:], m.Confirmers[iNdEx]) + i = encodeVarintCollectionOwnerRequest(dAtA, i, uint64(len(m.Confirmers[iNdEx]))) + i-- + dAtA[i] = 0x1a + } + } + if len(m.Hash) > 0 { + i -= len(m.Hash) + copy(dAtA[i:], m.Hash) + i = encodeVarintCollectionOwnerRequest(dAtA, i, uint64(len(m.Hash))) + i-- + dAtA[i] = 0x12 + } + if m.ContractOriginDataInfo != nil { + { + size, err := m.ContractOriginDataInfo.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCollectionOwnerRequest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func encodeVarintCollectionOwnerRequest(dAtA []byte, offset int, v uint64) int { offset -= sovCollectionOwnerRequest(v) base := offset @@ -563,29 +581,8 @@ func (m *OriginContractParam) Size() (n int) { if l > 0 { n += 1 + l + sovCollectionOwnerRequest(uint64(l)) } - return n -} - -func (m *OriginContractInfo) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ContractOriginDataInfo != nil { - l = m.ContractOriginDataInfo.Size() - n += 1 + l + sovCollectionOwnerRequest(uint64(l)) - } - l = len(m.Hash) - if l > 0 { - n += 1 + l + sovCollectionOwnerRequest(uint64(l)) - } - if len(m.Confirmers) > 0 { - for _, s := range m.Confirmers { - l = len(s) - n += 1 + l + sovCollectionOwnerRequest(uint64(l)) - } - } + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.RequestExpire) + n += 1 + l + sovCollectionOwnerRequest(uint64(l)) return n } @@ -639,159 +636,36 @@ func (m *CollectionOwnerRequest) Size() (n int) { return n } -func sovCollectionOwnerRequest(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozCollectionOwnerRequest(x uint64) (n int) { - return sovCollectionOwnerRequest(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *OriginContractParam) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCollectionOwnerRequest - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: OriginContractParam: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: OriginContractParam: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Chain", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCollectionOwnerRequest - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCollectionOwnerRequest - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCollectionOwnerRequest - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Chain = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ContractAddress", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCollectionOwnerRequest - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCollectionOwnerRequest - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCollectionOwnerRequest - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ContractAddress = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ContractOwner", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCollectionOwnerRequest - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthCollectionOwnerRequest - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCollectionOwnerRequest - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ContractOwner = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipCollectionOwnerRequest(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthCollectionOwnerRequest - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy +func (m *OriginContractInfo) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ContractOriginDataInfo != nil { + l = m.ContractOriginDataInfo.Size() + n += 1 + l + sovCollectionOwnerRequest(uint64(l)) + } + l = len(m.Hash) + if l > 0 { + n += 1 + l + sovCollectionOwnerRequest(uint64(l)) + } + if len(m.Confirmers) > 0 { + for _, s := range m.Confirmers { + l = len(s) + n += 1 + l + sovCollectionOwnerRequest(uint64(l)) } } + return n +} - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil +func sovCollectionOwnerRequest(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 } -func (m *OriginContractInfo) Unmarshal(dAtA []byte) error { +func sozCollectionOwnerRequest(x uint64) (n int) { + return sovCollectionOwnerRequest(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *OriginContractParam) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -814,17 +688,17 @@ func (m *OriginContractInfo) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: OriginContractInfo: wiretype end group for non-group") + return fmt.Errorf("proto: OriginContractParam: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: OriginContractInfo: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: OriginContractParam: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ContractOriginDataInfo", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Chain", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowCollectionOwnerRequest @@ -834,33 +708,29 @@ func (m *OriginContractInfo) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthCollectionOwnerRequest } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthCollectionOwnerRequest } if postIndex > l { return io.ErrUnexpectedEOF } - if m.ContractOriginDataInfo == nil { - m.ContractOriginDataInfo = &OriginContractParam{} - } - if err := m.ContractOriginDataInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.Chain = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Hash", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ContractAddress", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowCollectionOwnerRequest @@ -870,29 +740,27 @@ func (m *OriginContractInfo) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthCollectionOwnerRequest } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthCollectionOwnerRequest } if postIndex > l { return io.ErrUnexpectedEOF } - m.Hash = append(m.Hash[:0], dAtA[iNdEx:postIndex]...) - if m.Hash == nil { - m.Hash = []byte{} - } + m.ContractAddress = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Confirmers", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ContractOwner", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -920,7 +788,40 @@ func (m *OriginContractInfo) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Confirmers = append(m.Confirmers, string(dAtA[iNdEx:postIndex])) + m.ContractOwner = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field RequestExpire", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCollectionOwnerRequest + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthCollectionOwnerRequest + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCollectionOwnerRequest + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.RequestExpire, dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex default: iNdEx = preIndex @@ -1367,6 +1268,158 @@ func (m *CollectionOwnerRequest) Unmarshal(dAtA []byte) error { } return nil } +func (m *OriginContractInfo) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCollectionOwnerRequest + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: OriginContractInfo: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: OriginContractInfo: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ContractOriginDataInfo", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCollectionOwnerRequest + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthCollectionOwnerRequest + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCollectionOwnerRequest + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.ContractOriginDataInfo == nil { + m.ContractOriginDataInfo = &OriginContractParam{} + } + if err := m.ContractOriginDataInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Hash", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCollectionOwnerRequest + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthCollectionOwnerRequest + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthCollectionOwnerRequest + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Hash = append(m.Hash[:0], dAtA[iNdEx:postIndex]...) + if m.Hash == nil { + m.Hash = []byte{} + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Confirmers", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCollectionOwnerRequest + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthCollectionOwnerRequest + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCollectionOwnerRequest + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Confirmers = append(m.Confirmers, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipCollectionOwnerRequest(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthCollectionOwnerRequest + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipCollectionOwnerRequest(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 From e888d8cebd8ee701cbc0eefbf88ac2fb80e131f2 Mon Sep 17 00:00:00 2001 From: dDee-D-six Date: Wed, 19 Oct 2022 19:03:49 +0700 Subject: [PATCH 03/10] add expire time to oralce craete_action,create_verfify --- x/nftoracle/keeper/msg_server_create_action_request.go | 2 +- .../keeper/msg_server_create_verify_collection_owner_request.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x/nftoracle/keeper/msg_server_create_action_request.go b/x/nftoracle/keeper/msg_server_create_action_request.go index 7ed8b1e0..b99bd822 100644 --- a/x/nftoracle/keeper/msg_server_create_action_request.go +++ b/x/nftoracle/keeper/msg_server_create_action_request.go @@ -84,7 +84,7 @@ func (k msgServer) CreateActionRequest(goCtx context.Context, msg *types.MsgCrea DataHashes: make([]*types.DataHash, 0), }) - k.Keeper.InsertActiveActionRequestQueue(ctx, id_, endTime) + k.Keeper.InsertActiveActionRequestQueue(ctx, id_, actionParam.ExpiredAt) ctx.EventManager().EmitEvents(sdk.Events{ sdk.NewEvent( diff --git a/x/nftoracle/keeper/msg_server_create_verify_collection_owner_request.go b/x/nftoracle/keeper/msg_server_create_verify_collection_owner_request.go index 1287221d..a89b7a8e 100644 --- a/x/nftoracle/keeper/msg_server_create_verify_collection_owner_request.go +++ b/x/nftoracle/keeper/msg_server_create_verify_collection_owner_request.go @@ -77,7 +77,7 @@ func (k msgServer) CreateVerifyCollectionOwnerRequest(goCtx context.Context, msg ContractInfo: make([]*types.OriginContractInfo, 0), }) - k.Keeper.InsertActiveVerifyCollectionOwnerRequestQueue(ctx, id_, endTime) + k.Keeper.InsertActiveVerifyCollectionOwnerRequestQueue(ctx, id_, _originContractParam.RequestExpire) ctx.EventManager().EmitEvents(sdk.Events{ sdk.NewEvent( From 64fc8c6c38ff47e836c96f7f597caac607358135 Mon Sep 17 00:00:00 2001 From: dDee-D-six Date: Thu, 20 Oct 2022 11:58:07 +0700 Subject: [PATCH 04/10] handle converting time --- docs/static/openapi.yml | 28 +++++-------------- go.mod | 2 -- go.sum | 4 --- .../msg_server_create_action_request.go | 9 +++++- ..._create_verify_collection_owner_request.go | 7 +++-- 5 files changed, 20 insertions(+), 30 deletions(-) diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml index f9816fbc..0ad1f65c 100644 --- a/docs/static/openapi.yml +++ b/docs/static/openapi.yml @@ -36018,9 +36018,7 @@ paths: type: string contract_owner: type: string - ref_id: - type: string - expired_at: + request_expire: type: string format: date-time hash: @@ -36187,9 +36185,7 @@ paths: type: string contract_owner: type: string - ref_id: - type: string - expired_at: + request_expire: type: string format: date-time hash: @@ -60790,9 +60786,7 @@ definitions: type: string contract_owner: type: string - ref_id: - type: string - expired_at: + request_expire: type: string format: date-time hash: @@ -60992,9 +60986,7 @@ definitions: type: string contract_owner: type: string - ref_id: - type: string - expired_at: + request_expire: type: string format: date-time hash: @@ -61013,9 +61005,7 @@ definitions: type: string contract_owner: type: string - ref_id: - type: string - expired_at: + request_expire: type: string format: date-time thesixnetwork.sixnft.nftoracle.Params: @@ -61192,9 +61182,7 @@ definitions: type: string contract_owner: type: string - ref_id: - type: string - expired_at: + request_expire: type: string format: date-time hash: @@ -61469,9 +61457,7 @@ definitions: type: string contract_owner: type: string - ref_id: - type: string - expired_at: + request_expire: type: string format: date-time hash: diff --git a/go.mod b/go.mod index cc4d31d9..d5bb0ee7 100644 --- a/go.mod +++ b/go.mod @@ -80,7 +80,6 @@ require ( github.com/goccy/go-yaml v1.9.4 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/gateway v1.1.0 // indirect - github.com/golang/glog v1.0.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/snappy v0.0.3 // indirect github.com/google/btree v1.0.0 // indirect @@ -91,7 +90,6 @@ require ( github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.12.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/gtank/merlin v0.1.1 // indirect github.com/gtank/ristretto255 v0.1.2 // indirect diff --git a/go.sum b/go.sum index 48335fb5..abe5dea0 100644 --- a/go.sum +++ b/go.sum @@ -606,8 +606,6 @@ github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2V github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188/go.mod h1:vXjM/+wXQnTPR4KqTKDgJukSZ6amVRtWMPEjE6sQoK8= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= -github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -737,8 +735,6 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.12.0 h1:kr3j8iIMR4ywO/O0rvksXaJvauGGCMg2zAZIiNZ9uIQ= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.12.0/go.mod h1:ummNFgdgLhhX7aIiy35vVmQNS0rWXknfPE0qe6fmFXg= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/gtank/merlin v0.1.1-0.20191105220539-8318aed1a79f/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= diff --git a/x/nftoracle/keeper/msg_server_create_action_request.go b/x/nftoracle/keeper/msg_server_create_action_request.go index b99bd822..c49b39a0 100644 --- a/x/nftoracle/keeper/msg_server_create_action_request.go +++ b/x/nftoracle/keeper/msg_server_create_action_request.go @@ -4,6 +4,7 @@ import ( "context" "encoding/base64" "strconv" + "time" "github.com/thesixnetwork/sixnft/x/nftoracle/types" @@ -65,7 +66,13 @@ func (k msgServer) CreateActionRequest(goCtx context.Context, msg *types.MsgCrea createdAt := ctx.BlockTime() endTime := createdAt.Add(k.ActionRequestActiveDuration(ctx)) - if len(actionParam.ExpiredAt.String()) == 0 { + // validate time given format as RFC3339 + _, err = time.Parse(time.RFC3339, actionParam.ExpiredAt.UTC().Format(time.RFC3339)) + if err != nil || len(actionParam.ExpiredAt.String()) == 0 || actionParam.ExpiredAt.Before(time.Now().UTC()){ + actionParam.ExpiredAt = endTime + } + + if len(actionParam.ExpiredAt.String()) == 0 || actionParam.ExpiredAt.Before(time.Now().UTC()){ actionParam.ExpiredAt = endTime } diff --git a/x/nftoracle/keeper/msg_server_create_verify_collection_owner_request.go b/x/nftoracle/keeper/msg_server_create_verify_collection_owner_request.go index a89b7a8e..9e3f672b 100644 --- a/x/nftoracle/keeper/msg_server_create_verify_collection_owner_request.go +++ b/x/nftoracle/keeper/msg_server_create_verify_collection_owner_request.go @@ -4,6 +4,7 @@ import ( "context" "encoding/base64" "strconv" + "time" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" @@ -61,10 +62,12 @@ func (k msgServer) CreateVerifyCollectionOwnerRequest(goCtx context.Context, msg createdAt := ctx.BlockTime() endTime := createdAt.Add(k.VerifyRequestActiveDuration(ctx)) - if len(_originContractParam.RequestExpire.String()) == 0 { + // validate time given format as RFC3339 + _, err = time.Parse(time.RFC3339, _originContractParam.RequestExpire.UTC().Format(time.RFC3339)) + if err != nil || len(_originContractParam.RequestExpire.String()) == 0 || _originContractParam.RequestExpire.Before(time.Now().UTC()){ _originContractParam.RequestExpire = endTime } - + id_ := k.Keeper.AppendCollectionOwnerRequest(ctx, types.CollectionOwnerRequest{ NftSchemaCode: msg.NftSchemaCode, Signer: *signer, From d22449597a1f7877d0c94405a6d6635ce8c340e8 Mon Sep 17 00:00:00 2001 From: dDee-D-six Date: Thu, 20 Oct 2022 12:19:28 +0700 Subject: [PATCH 05/10] hadle simulate test --- ...te_verify_collection_owner_request_test.go | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 x/nftoracle/keeper/msg_server_create_verify_collection_owner_request_test.go diff --git a/x/nftoracle/keeper/msg_server_create_verify_collection_owner_request_test.go b/x/nftoracle/keeper/msg_server_create_verify_collection_owner_request_test.go new file mode 100644 index 00000000..d7146c3a --- /dev/null +++ b/x/nftoracle/keeper/msg_server_create_verify_collection_owner_request_test.go @@ -0,0 +1,31 @@ +package keeper_test + +import ( + "testing" + + // sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + "github.com/stretchr/testify/require" + + "github.com/thesixnetwork/sixnft/x/nftoracle/types" +) + +func TestCollectionOwnerRequestMsgServerCreate(t *testing.T) { + srv, ctx := setupMsgServer(t) + creator := "A" + for i := 0; i < 5; i++ { + resp, err := srv.CreateVerifyCollectionOwnerRequest(ctx, &types.MsgCreateVerifyCollectionOwnerRequest{Creator: creator}) + require.NoError(t, err) + require.Equal(t, i, int(resp.Id)) + } +} + + +func TestCollectionOwnerRequestMsgServerSubmit(t *testing.T) { + srv, ctx := setupMsgServer(t) + creator := "A" + for i := 0; i < 5; i++ { + resp, err := srv.SubmitVerifyCollectionOwner(ctx, &types.MsgSubmitVerifyCollectionOwner{Creator: creator}) + require.NoError(t, err) + require.Equal(t, i, int(resp.VerifyRequestID)) + } +} \ No newline at end of file From 1f7dd78aeba10e68b7d0e1f73431d9c0351c357d Mon Sep 17 00:00:00 2001 From: dDee-D-six Date: Thu, 20 Oct 2022 15:22:02 +0700 Subject: [PATCH 06/10] update script --- scripts/menu.sh | 2 +- scripts/verify-collection-owner.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/menu.sh b/scripts/menu.sh index c08a1985..81a1d5d6 100755 --- a/scripts/menu.sh +++ b/scripts/menu.sh @@ -1,5 +1,6 @@ EVMSIGN=./evmsign default_schema_code=$1 +timestamp=$(date -u +"%Y-%m-%dT%H:%M:%S.000z") echo "#############################################" echo "## ##" echo "## Welcome to the menu script ##" @@ -22,7 +23,6 @@ echo "## 13. Oracle - Get Verify Request ##" echo "## 14. Oracle - Submit Verify Response ##" echo "## 15. Add Attribute ##" echo "## 16. Add Action ##" -echo "## Your choice: ##" echo "## ##" echo "#############################################" read -p "Your choice: " choice diff --git a/scripts/verify-collection-owner.json b/scripts/verify-collection-owner.json index d84be6d5..30ffb246 100644 --- a/scripts/verify-collection-owner.json +++ b/scripts/verify-collection-owner.json @@ -1,5 +1,6 @@ { "chain":"GOERLI", "contract_address" : "0x9EC14dfF0049F8De41FE106f3221a50313F941aB", - "contract_owner" : "0xb7c2468b9481CbDfD029998d6bA98c55072d932e" + "contract_owner" : "0xb7c2468b9481CbDfD029998d6bA98c55072d932e", + "request_expire" : "2022-10-20T03:44:00Z" } \ No newline at end of file From bcfe364ba4aa2bc020bfb0ea9e3126ec078557e9 Mon Sep 17 00:00:00 2001 From: dDee-D-six Date: Tue, 25 Oct 2022 11:29:28 +0700 Subject: [PATCH 07/10] soft merge with verion 0.6.1 --- schema.after_token_appen.json | 455 +++++++++++++++++++ x/nftmngr/keeper/msg_server_add_attribute.go | 1 - 2 files changed, 455 insertions(+), 1 deletion(-) create mode 100644 schema.after_token_appen.json diff --git a/schema.after_token_appen.json b/schema.after_token_appen.json new file mode 100644 index 00000000..e2b46843 --- /dev/null +++ b/schema.after_token_appen.json @@ -0,0 +1,455 @@ +{ + "nFTSchema": { + "code": "mhrs1", + "name": "MHRS#1", + "owner": "6nft1q3566qhn4hnjf8l0zt90daew2ade2yc6l5usaq", + "origin_data": { + "origin_chain": "ethereum", + "origin_contract_address": "", + "origin_base_uri": "", + "attribute_overriding": "CHAIN", + "metadata_format": "opensea", + "origin_attributes": [ + { + "name": "tribe", + "data_type": "string", + "required": false, + "display_value_field": "value", + "display_option": { + "bool_true_value": "", + "bool_false_value": "", + "opensea": { + "display_type": "", + "trait_type": "Tribe", + "max_value": "0" + } + }, + "default_mint_value": "", + "hidden_to_marketplace": false + }, + { + "name": "facial_expression", + "data_type": "string", + "required": false, + "display_value_field": "value", + "display_option": { + "bool_true_value": "", + "bool_false_value": "", + "opensea": { + "display_type": "", + "trait_type": "Facial Expression", + "max_value": "0" + } + }, + "default_mint_value": "", + "hidden_to_marketplace": false + }, + { + "name": "cloth", + "data_type": "string", + "required": false, + "display_value_field": "value", + "display_option": { + "bool_true_value": "", + "bool_false_value": "", + "opensea": { + "display_type": "", + "trait_type": "Cloth", + "max_value": "0" + } + }, + "default_mint_value": "", + "hidden_to_marketplace": false + }, + { + "name": "skin", + "data_type": "string", + "required": false, + "display_value_field": "value", + "display_option": { + "bool_true_value": "", + "bool_false_value": "", + "opensea": { + "display_type": "", + "trait_type": "Skin", + "max_value": "0" + } + }, + "default_mint_value": "", + "hidden_to_marketplace": false + }, + { + "name": "hairstyle", + "data_type": "string", + "required": false, + "display_value_field": "value", + "display_option": { + "bool_true_value": "", + "bool_false_value": "", + "opensea": { + "display_type": "", + "trait_type": "Hairstyle", + "max_value": "0" + } + }, + "default_mint_value": "", + "hidden_to_marketplace": false + }, + { + "name": "hand_objects", + "data_type": "string", + "required": false, + "display_value_field": "value", + "display_option": { + "bool_true_value": "", + "bool_false_value": "", + "opensea": { + "display_type": "", + "trait_type": "Hand Objects", + "max_value": "0" + } + }, + "default_mint_value": "", + "hidden_to_marketplace": false + }, + { + "name": "accessories", + "data_type": "string", + "required": false, + "display_value_field": "value", + "display_option": { + "bool_true_value": "", + "bool_false_value": "", + "opensea": { + "display_type": "", + "trait_type": "Accessories", + "max_value": "0" + } + }, + "default_mint_value": "", + "hidden_to_marketplace": false + }, + { + "name": "background", + "data_type": "string", + "required": false, + "display_value_field": "value", + "display_option": { + "bool_true_value": "", + "bool_false_value": "", + "opensea": { + "display_type": "", + "trait_type": "Background", + "max_value": "0" + } + }, + "default_mint_value": "", + "hidden_to_marketplace": false + }, + { + "name": "legendary", + "data_type": "string", + "required": false, + "display_value_field": "value", + "display_option": { + "bool_true_value": "", + "bool_false_value": "", + "opensea": { + "display_type": "", + "trait_type": "Legendary", + "max_value": "0" + } + }, + "default_mint_value": "", + "hidden_to_marketplace": false + } + ], + "uri_retrieval_method": "BASE" + }, + "onchain_data": { + "reveal_required": false, + "reveal_secret": null, + "nft_attributes": [ + { + "name": "new_attribute_definition", + "data_type": "number", + "required": false, + "display_value_field": "value", + "display_option": { + "bool_true_value": "Yes", + "bool_false_value": "No", + "opensea": { + "display_type": "hehe", + "trait_type": "Background", + "max_value": "0" + } + }, + "default_mint_value": "10", + "hidden_to_marketplace": false + } + ], + "token_attributes": [ + { + "name": "fest_passes", + "data_type": "number", + "required": true, + "display_value_field": "value", + "display_option": { + "bool_true_value": "", + "bool_false_value": "", + "opensea": { + "display_type": "number", + "trait_type": "Fest Passes", + "max_value": "1" + } + }, + "default_mint_value": "0", + "hidden_to_marketplace": false + }, + { + "name": "exp2_passes", + "data_type": "number", + "required": true, + "display_value_field": "value", + "display_option": { + "bool_true_value": "", + "bool_false_value": "", + "opensea": { + "display_type": "number", + "trait_type": "Exp2 Passes", + "max_value": "1" + } + }, + "default_mint_value": "0", + "hidden_to_marketplace": false + }, + { + "name": "beers", + "data_type": "number", + "required": true, + "display_value_field": "value", + "display_option": { + "bool_true_value": "", + "bool_false_value": "", + "opensea": { + "display_type": "number", + "trait_type": "Beers", + "max_value": "5" + } + }, + "default_mint_value": "0", + "hidden_to_marketplace": false + }, + { + "name": "discount", + "data_type": "boolean", + "required": true, + "display_value_field": "value", + "display_option": { + "bool_true_value": "Yes", + "bool_false_value": "No", + "opensea": { + "display_type": "", + "trait_type": "Discount", + "max_value": "0" + } + }, + "default_mint_value": "true", + "hidden_to_marketplace": false + }, + { + "name": "stage_1_qr", + "data_type": "boolean", + "required": true, + "display_value_field": "value", + "display_option": { + "bool_true_value": "Yes", + "bool_false_value": "No", + "opensea": { + "display_type": "", + "trait_type": "Stage 1 QR", + "max_value": "0" + } + }, + "default_mint_value": "false", + "hidden_to_marketplace": false + }, + { + "name": "stage_2_qr", + "data_type": "boolean", + "required": true, + "display_value_field": "value", + "display_option": { + "bool_true_value": "Yes", + "bool_false_value": "No", + "opensea": { + "display_type": "", + "trait_type": "Stage 2 QR", + "max_value": "0" + } + }, + "default_mint_value": "false", + "hidden_to_marketplace": false + }, + { + "name": "stage_3_qr", + "data_type": "boolean", + "required": true, + "display_value_field": "value", + "display_option": { + "bool_true_value": "Yes", + "bool_false_value": "No", + "opensea": { + "display_type": "", + "trait_type": "Stage 3 QR", + "max_value": "0" + } + }, + "default_mint_value": "false", + "hidden_to_marketplace": false + }, + { + "name": "merch", + "data_type": "boolean", + "required": true, + "display_value_field": "value", + "display_option": { + "bool_true_value": "Yes", + "bool_false_value": "No", + "opensea": { + "display_type": "", + "trait_type": "Merch", + "max_value": "0" + } + }, + "default_mint_value": "false", + "hidden_to_marketplace": false + }, + { + "name": "merch_completed", + "data_type": "boolean", + "required": true, + "display_value_field": "value", + "display_option": { + "bool_true_value": "Yes", + "bool_false_value": "No", + "opensea": { + "display_type": "", + "trait_type": "Merch Completed", + "max_value": "0" + } + }, + "default_mint_value": "false", + "hidden_to_marketplace": false + }, + { + "name": "new_attribute_definition", + "data_type": "number", + "required": false, + "display_value_field": "value", + "display_option": { + "bool_true_value": "Yes", + "bool_false_value": "No", + "opensea": { + "display_type": "hehe", + "trait_type": "Background", + "max_value": "0" + } + }, + "default_mint_value": "10", + "hidden_to_marketplace": false + }, + { + "name": "exp2_passes_2", + "data_type": "number", + "required": true, + "display_value_field": "value", + "display_option": { + "bool_true_value": "", + "bool_false_value": "", + "opensea": { + "display_type": "number", + "trait_type": "Exp2 Passes 2", + "max_value": "1" + } + }, + "default_mint_value": "0", + "hidden_to_marketplace": false + } + ], + "actions": [ + { + "name": "useFestPass", + "desc": "Use Festival Pass", + "when": "meta.GetNumber('fest_passes') == 0", + "then": [ + "meta.SetNumber('fest_passes',meta.GetNumber('fest_passes') + 1)" + ] + }, + { + "name": "useEXP2Pass", + "desc": "Use Festival Pass", + "when": "meta.GetNumber('exp2_passes') == 0", + "then": [ + "meta.SetNumber('exp2_passes',meta.GetNumber('exp2_passes') + 1)" + ] + }, + { + "name": "useBeerCoupon", + "desc": "Use Beer Pass", + "when": "meta.GetNumber('beers') \u003c 5", + "then": ["meta.SetNumber('beers',meta.GetNumber('beers') + 1)"] + }, + { + "name": "checkStage1QR", + "desc": "Check Stage 1 QR", + "when": "meta.GetBoolean('stage_1_qr') == false", + "then": ["meta.SetBoolean('stage_1_qr',true)"] + }, + { + "name": "checkStage2QR", + "desc": "Check Stage 2 QR", + "when": "meta.GetBoolean('stage_2_qr') == false", + "then": ["meta.SetBoolean('stage_2_qr',true)"] + }, + { + "name": "checkStage3QR", + "desc": "Check Stage 3 QR", + "when": "meta.GetBoolean('stage_3_qr') == false", + "then": ["meta.SetBoolean('stage_3_qr',true)"] + }, + { + "name": "markMerch", + "desc": "Mark Merch", + "when": "meta.GetBoolean('merch') == false", + "then": ["meta.SetBoolean('merch',true)"] + }, + { + "name": "markMerchComplete", + "desc": "Mark Merch Complete", + "when": "meta.GetBoolean('merch_completed') == false", + "then": ["meta.SetBoolean('merch_completed',true)"] + }, + { + "name": "changeImage", + "desc": "Change Image", + "when": "1 == 1", + "then": [ + "meta.SetImage(meta.ReplaceAllString(meta.GetImage(),'.png','-l.png'))" + ] + }, + { + "name": "useEXP2Pass2", + "desc": "Use Festival Pass2", + "when": "meta.GetNumber('exp2_passes_2') == 0", + "then": [ + "meta.SetNumber('exp2_passes',meta.GetNumber('exp2_passes_2') + 1)" + ] + } + ], + "status": { "first_mint_complete": false }, + "on_off_switch": { "active": true }, + "nft_attributes_value": [] + } + } +} diff --git a/x/nftmngr/keeper/msg_server_add_attribute.go b/x/nftmngr/keeper/msg_server_add_attribute.go index 6621ea2d..734f10e3 100644 --- a/x/nftmngr/keeper/msg_server_add_attribute.go +++ b/x/nftmngr/keeper/msg_server_add_attribute.go @@ -3,7 +3,6 @@ package keeper import ( "context" "encoding/base64" - // "strconv" "github.com/thesixnetwork/sixnft/x/nftmngr/types" From 8d23000c7d25245a0d08a856ab5617b4e802bf6c Mon Sep 17 00:00:00 2001 From: dDee-D-six Date: Tue, 25 Oct 2022 11:31:12 +0700 Subject: [PATCH 08/10] static docs --- docs/static/openapi.yml | 204 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 204 insertions(+) diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml index 9caf267a..e0fdb07f 100644 --- a/docs/static/openapi.yml +++ b/docs/static/openapi.yml @@ -11434,6 +11434,140 @@ paths: type: string tags: - Query + /cosmos/mint/v1beta1/annual_provisions: + get: + summary: AnnualProvisions current minting annual provisions value. + operationId: CosmosMintV1Beta1AnnualProvisions + responses: + '200': + description: A successful response. + schema: + type: object + properties: + annual_provisions: + type: string + format: byte + description: >- + annual_provisions is the current minting annual provisions + value. + description: |- + QueryAnnualProvisionsResponse is the response type for the + Query/AnnualProvisions RPC method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query + /cosmos/mint/v1beta1/inflation: + get: + summary: Inflation returns the current minting inflation value. + operationId: CosmosMintV1Beta1Inflation + responses: + '200': + description: A successful response. + schema: + type: object + properties: + inflation: + type: string + format: byte + description: inflation is the current minting inflation value. + description: >- + QueryInflationResponse is the response type for the + Query/Inflation RPC + + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query + /cosmos/mint/v1beta1/params: + get: + summary: Params returns the total set of minting parameters. + operationId: CosmosMintV1Beta1Params + responses: + '200': + description: A successful response. + schema: + type: object + properties: + params: + description: params defines the parameters of the module. + type: object + properties: + mint_denom: + type: string + title: type of coin to mint + inflation_rate_change: + type: string + title: maximum annual change in inflation rate + inflation_max: + type: string + title: maximum inflation rate + inflation_min: + type: string + title: minimum inflation rate + goal_bonded: + type: string + title: goal of percent bonded atoms + blocks_per_year: + type: string + format: uint64 + title: expected blocks per year + description: >- + QueryParamsResponse is the response type for the Query/Params RPC + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query /cosmos/params/v1beta1/params: get: summary: |- @@ -45072,6 +45206,76 @@ definitions: WeightedVoteOption defines a unit of vote for vote split. Since: cosmos-sdk 0.43 + cosmos.mint.v1beta1.Params: + type: object + properties: + mint_denom: + type: string + title: type of coin to mint + inflation_rate_change: + type: string + title: maximum annual change in inflation rate + inflation_max: + type: string + title: maximum inflation rate + inflation_min: + type: string + title: minimum inflation rate + goal_bonded: + type: string + title: goal of percent bonded atoms + blocks_per_year: + type: string + format: uint64 + title: expected blocks per year + description: Params holds parameters for the mint module. + cosmos.mint.v1beta1.QueryAnnualProvisionsResponse: + type: object + properties: + annual_provisions: + type: string + format: byte + description: annual_provisions is the current minting annual provisions value. + description: |- + QueryAnnualProvisionsResponse is the response type for the + Query/AnnualProvisions RPC method. + cosmos.mint.v1beta1.QueryInflationResponse: + type: object + properties: + inflation: + type: string + format: byte + description: inflation is the current minting inflation value. + description: |- + QueryInflationResponse is the response type for the Query/Inflation RPC + method. + cosmos.mint.v1beta1.QueryParamsResponse: + type: object + properties: + params: + description: params defines the parameters of the module. + type: object + properties: + mint_denom: + type: string + title: type of coin to mint + inflation_rate_change: + type: string + title: maximum annual change in inflation rate + inflation_max: + type: string + title: maximum inflation rate + inflation_min: + type: string + title: minimum inflation rate + goal_bonded: + type: string + title: goal of percent bonded atoms + blocks_per_year: + type: string + format: uint64 + title: expected blocks per year + description: QueryParamsResponse is the response type for the Query/Params RPC method. cosmos.params.v1beta1.ParamChange: type: object properties: From d555778a69e6b9bd65fed563549dead492248317 Mon Sep 17 00:00:00 2001 From: dDee-D-six Date: Tue, 25 Oct 2022 11:38:50 +0700 Subject: [PATCH 09/10] merge to version 0.6.1 --- schema.after_token_appen.json | 455 ------------------ .../cli/query_nft_schema_by_contract_test.go | 2 - x/nftmngr/genesis_test.go | 2 - .../grpc_query_nft_schema_by_contract_test.go | 3 - x/nftmngr/keeper/msg_server_add_attribute.go | 1 + .../keeper/nft_schema_by_contract_test.go | 4 - 6 files changed, 1 insertion(+), 466 deletions(-) delete mode 100644 schema.after_token_appen.json diff --git a/schema.after_token_appen.json b/schema.after_token_appen.json deleted file mode 100644 index e2b46843..00000000 --- a/schema.after_token_appen.json +++ /dev/null @@ -1,455 +0,0 @@ -{ - "nFTSchema": { - "code": "mhrs1", - "name": "MHRS#1", - "owner": "6nft1q3566qhn4hnjf8l0zt90daew2ade2yc6l5usaq", - "origin_data": { - "origin_chain": "ethereum", - "origin_contract_address": "", - "origin_base_uri": "", - "attribute_overriding": "CHAIN", - "metadata_format": "opensea", - "origin_attributes": [ - { - "name": "tribe", - "data_type": "string", - "required": false, - "display_value_field": "value", - "display_option": { - "bool_true_value": "", - "bool_false_value": "", - "opensea": { - "display_type": "", - "trait_type": "Tribe", - "max_value": "0" - } - }, - "default_mint_value": "", - "hidden_to_marketplace": false - }, - { - "name": "facial_expression", - "data_type": "string", - "required": false, - "display_value_field": "value", - "display_option": { - "bool_true_value": "", - "bool_false_value": "", - "opensea": { - "display_type": "", - "trait_type": "Facial Expression", - "max_value": "0" - } - }, - "default_mint_value": "", - "hidden_to_marketplace": false - }, - { - "name": "cloth", - "data_type": "string", - "required": false, - "display_value_field": "value", - "display_option": { - "bool_true_value": "", - "bool_false_value": "", - "opensea": { - "display_type": "", - "trait_type": "Cloth", - "max_value": "0" - } - }, - "default_mint_value": "", - "hidden_to_marketplace": false - }, - { - "name": "skin", - "data_type": "string", - "required": false, - "display_value_field": "value", - "display_option": { - "bool_true_value": "", - "bool_false_value": "", - "opensea": { - "display_type": "", - "trait_type": "Skin", - "max_value": "0" - } - }, - "default_mint_value": "", - "hidden_to_marketplace": false - }, - { - "name": "hairstyle", - "data_type": "string", - "required": false, - "display_value_field": "value", - "display_option": { - "bool_true_value": "", - "bool_false_value": "", - "opensea": { - "display_type": "", - "trait_type": "Hairstyle", - "max_value": "0" - } - }, - "default_mint_value": "", - "hidden_to_marketplace": false - }, - { - "name": "hand_objects", - "data_type": "string", - "required": false, - "display_value_field": "value", - "display_option": { - "bool_true_value": "", - "bool_false_value": "", - "opensea": { - "display_type": "", - "trait_type": "Hand Objects", - "max_value": "0" - } - }, - "default_mint_value": "", - "hidden_to_marketplace": false - }, - { - "name": "accessories", - "data_type": "string", - "required": false, - "display_value_field": "value", - "display_option": { - "bool_true_value": "", - "bool_false_value": "", - "opensea": { - "display_type": "", - "trait_type": "Accessories", - "max_value": "0" - } - }, - "default_mint_value": "", - "hidden_to_marketplace": false - }, - { - "name": "background", - "data_type": "string", - "required": false, - "display_value_field": "value", - "display_option": { - "bool_true_value": "", - "bool_false_value": "", - "opensea": { - "display_type": "", - "trait_type": "Background", - "max_value": "0" - } - }, - "default_mint_value": "", - "hidden_to_marketplace": false - }, - { - "name": "legendary", - "data_type": "string", - "required": false, - "display_value_field": "value", - "display_option": { - "bool_true_value": "", - "bool_false_value": "", - "opensea": { - "display_type": "", - "trait_type": "Legendary", - "max_value": "0" - } - }, - "default_mint_value": "", - "hidden_to_marketplace": false - } - ], - "uri_retrieval_method": "BASE" - }, - "onchain_data": { - "reveal_required": false, - "reveal_secret": null, - "nft_attributes": [ - { - "name": "new_attribute_definition", - "data_type": "number", - "required": false, - "display_value_field": "value", - "display_option": { - "bool_true_value": "Yes", - "bool_false_value": "No", - "opensea": { - "display_type": "hehe", - "trait_type": "Background", - "max_value": "0" - } - }, - "default_mint_value": "10", - "hidden_to_marketplace": false - } - ], - "token_attributes": [ - { - "name": "fest_passes", - "data_type": "number", - "required": true, - "display_value_field": "value", - "display_option": { - "bool_true_value": "", - "bool_false_value": "", - "opensea": { - "display_type": "number", - "trait_type": "Fest Passes", - "max_value": "1" - } - }, - "default_mint_value": "0", - "hidden_to_marketplace": false - }, - { - "name": "exp2_passes", - "data_type": "number", - "required": true, - "display_value_field": "value", - "display_option": { - "bool_true_value": "", - "bool_false_value": "", - "opensea": { - "display_type": "number", - "trait_type": "Exp2 Passes", - "max_value": "1" - } - }, - "default_mint_value": "0", - "hidden_to_marketplace": false - }, - { - "name": "beers", - "data_type": "number", - "required": true, - "display_value_field": "value", - "display_option": { - "bool_true_value": "", - "bool_false_value": "", - "opensea": { - "display_type": "number", - "trait_type": "Beers", - "max_value": "5" - } - }, - "default_mint_value": "0", - "hidden_to_marketplace": false - }, - { - "name": "discount", - "data_type": "boolean", - "required": true, - "display_value_field": "value", - "display_option": { - "bool_true_value": "Yes", - "bool_false_value": "No", - "opensea": { - "display_type": "", - "trait_type": "Discount", - "max_value": "0" - } - }, - "default_mint_value": "true", - "hidden_to_marketplace": false - }, - { - "name": "stage_1_qr", - "data_type": "boolean", - "required": true, - "display_value_field": "value", - "display_option": { - "bool_true_value": "Yes", - "bool_false_value": "No", - "opensea": { - "display_type": "", - "trait_type": "Stage 1 QR", - "max_value": "0" - } - }, - "default_mint_value": "false", - "hidden_to_marketplace": false - }, - { - "name": "stage_2_qr", - "data_type": "boolean", - "required": true, - "display_value_field": "value", - "display_option": { - "bool_true_value": "Yes", - "bool_false_value": "No", - "opensea": { - "display_type": "", - "trait_type": "Stage 2 QR", - "max_value": "0" - } - }, - "default_mint_value": "false", - "hidden_to_marketplace": false - }, - { - "name": "stage_3_qr", - "data_type": "boolean", - "required": true, - "display_value_field": "value", - "display_option": { - "bool_true_value": "Yes", - "bool_false_value": "No", - "opensea": { - "display_type": "", - "trait_type": "Stage 3 QR", - "max_value": "0" - } - }, - "default_mint_value": "false", - "hidden_to_marketplace": false - }, - { - "name": "merch", - "data_type": "boolean", - "required": true, - "display_value_field": "value", - "display_option": { - "bool_true_value": "Yes", - "bool_false_value": "No", - "opensea": { - "display_type": "", - "trait_type": "Merch", - "max_value": "0" - } - }, - "default_mint_value": "false", - "hidden_to_marketplace": false - }, - { - "name": "merch_completed", - "data_type": "boolean", - "required": true, - "display_value_field": "value", - "display_option": { - "bool_true_value": "Yes", - "bool_false_value": "No", - "opensea": { - "display_type": "", - "trait_type": "Merch Completed", - "max_value": "0" - } - }, - "default_mint_value": "false", - "hidden_to_marketplace": false - }, - { - "name": "new_attribute_definition", - "data_type": "number", - "required": false, - "display_value_field": "value", - "display_option": { - "bool_true_value": "Yes", - "bool_false_value": "No", - "opensea": { - "display_type": "hehe", - "trait_type": "Background", - "max_value": "0" - } - }, - "default_mint_value": "10", - "hidden_to_marketplace": false - }, - { - "name": "exp2_passes_2", - "data_type": "number", - "required": true, - "display_value_field": "value", - "display_option": { - "bool_true_value": "", - "bool_false_value": "", - "opensea": { - "display_type": "number", - "trait_type": "Exp2 Passes 2", - "max_value": "1" - } - }, - "default_mint_value": "0", - "hidden_to_marketplace": false - } - ], - "actions": [ - { - "name": "useFestPass", - "desc": "Use Festival Pass", - "when": "meta.GetNumber('fest_passes') == 0", - "then": [ - "meta.SetNumber('fest_passes',meta.GetNumber('fest_passes') + 1)" - ] - }, - { - "name": "useEXP2Pass", - "desc": "Use Festival Pass", - "when": "meta.GetNumber('exp2_passes') == 0", - "then": [ - "meta.SetNumber('exp2_passes',meta.GetNumber('exp2_passes') + 1)" - ] - }, - { - "name": "useBeerCoupon", - "desc": "Use Beer Pass", - "when": "meta.GetNumber('beers') \u003c 5", - "then": ["meta.SetNumber('beers',meta.GetNumber('beers') + 1)"] - }, - { - "name": "checkStage1QR", - "desc": "Check Stage 1 QR", - "when": "meta.GetBoolean('stage_1_qr') == false", - "then": ["meta.SetBoolean('stage_1_qr',true)"] - }, - { - "name": "checkStage2QR", - "desc": "Check Stage 2 QR", - "when": "meta.GetBoolean('stage_2_qr') == false", - "then": ["meta.SetBoolean('stage_2_qr',true)"] - }, - { - "name": "checkStage3QR", - "desc": "Check Stage 3 QR", - "when": "meta.GetBoolean('stage_3_qr') == false", - "then": ["meta.SetBoolean('stage_3_qr',true)"] - }, - { - "name": "markMerch", - "desc": "Mark Merch", - "when": "meta.GetBoolean('merch') == false", - "then": ["meta.SetBoolean('merch',true)"] - }, - { - "name": "markMerchComplete", - "desc": "Mark Merch Complete", - "when": "meta.GetBoolean('merch_completed') == false", - "then": ["meta.SetBoolean('merch_completed',true)"] - }, - { - "name": "changeImage", - "desc": "Change Image", - "when": "1 == 1", - "then": [ - "meta.SetImage(meta.ReplaceAllString(meta.GetImage(),'.png','-l.png'))" - ] - }, - { - "name": "useEXP2Pass2", - "desc": "Use Festival Pass2", - "when": "meta.GetNumber('exp2_passes_2') == 0", - "then": [ - "meta.SetNumber('exp2_passes',meta.GetNumber('exp2_passes_2') + 1)" - ] - } - ], - "status": { "first_mint_complete": false }, - "on_off_switch": { "active": true }, - "nft_attributes_value": [] - } - } -} diff --git a/x/nftmngr/client/cli/query_nft_schema_by_contract_test.go b/x/nftmngr/client/cli/query_nft_schema_by_contract_test.go index 442ccdd9..58208594 100644 --- a/x/nftmngr/client/cli/query_nft_schema_by_contract_test.go +++ b/x/nftmngr/client/cli/query_nft_schema_by_contract_test.go @@ -30,7 +30,6 @@ func networkWithNFTSchemaByContractObjects(t *testing.T, n int) (*network.Networ for i := 0; i < n; i++ { nFTSchemaByContract := types.NFTSchemaByContract{ OriginContractAddress: strconv.Itoa(i), - Chain: strconv.Itoa(i), } nullify.Fill(&nFTSchemaByContract) state.NFTSchemaByContractList = append(state.NFTSchemaByContractList, nFTSchemaByContract) @@ -60,7 +59,6 @@ func TestShowNFTSchemaByContract(t *testing.T) { { desc: "found", idOriginContractAddress: objs[0].OriginContractAddress, - idChain: objs[0].Chain, args: common, obj: objs[0], diff --git a/x/nftmngr/genesis_test.go b/x/nftmngr/genesis_test.go index 07eddae8..0aa243f8 100644 --- a/x/nftmngr/genesis_test.go +++ b/x/nftmngr/genesis_test.go @@ -60,11 +60,9 @@ func TestGenesis(t *testing.T) { NFTSchemaByContractList: []types.NFTSchemaByContract{ { OriginContractAddress: "0", - Chain: "0", }, { OriginContractAddress: "1", - Chain: "1", }, }, NftFeeConfig: &types.NFTFeeConfig{}, diff --git a/x/nftmngr/keeper/grpc_query_nft_schema_by_contract_test.go b/x/nftmngr/keeper/grpc_query_nft_schema_by_contract_test.go index a0d98fad..ef1a3c4d 100644 --- a/x/nftmngr/keeper/grpc_query_nft_schema_by_contract_test.go +++ b/x/nftmngr/keeper/grpc_query_nft_schema_by_contract_test.go @@ -32,7 +32,6 @@ func TestNFTSchemaByContractQuerySingle(t *testing.T) { desc: "First", request: &types.QueryGetNFTSchemaByContractRequest{ OriginContractAddress: msgs[0].OriginContractAddress, - Chain: msgs[0].Chain, }, response: &types.QueryGetNFTSchemaByContractResponse{NFTSchemaByContract: msgs[0]}, }, @@ -40,7 +39,6 @@ func TestNFTSchemaByContractQuerySingle(t *testing.T) { desc: "Second", request: &types.QueryGetNFTSchemaByContractRequest{ OriginContractAddress: msgs[1].OriginContractAddress, - Chain: msgs[1].Chain, }, response: &types.QueryGetNFTSchemaByContractResponse{NFTSchemaByContract: msgs[1]}, }, @@ -48,7 +46,6 @@ func TestNFTSchemaByContractQuerySingle(t *testing.T) { desc: "KeyNotFound", request: &types.QueryGetNFTSchemaByContractRequest{ OriginContractAddress: strconv.Itoa(100000), - Chain: strconv.Itoa(100000), }, err: status.Error(codes.NotFound, "not found"), }, diff --git a/x/nftmngr/keeper/msg_server_add_attribute.go b/x/nftmngr/keeper/msg_server_add_attribute.go index 734f10e3..6621ea2d 100644 --- a/x/nftmngr/keeper/msg_server_add_attribute.go +++ b/x/nftmngr/keeper/msg_server_add_attribute.go @@ -3,6 +3,7 @@ package keeper import ( "context" "encoding/base64" + // "strconv" "github.com/thesixnetwork/sixnft/x/nftmngr/types" diff --git a/x/nftmngr/keeper/nft_schema_by_contract_test.go b/x/nftmngr/keeper/nft_schema_by_contract_test.go index 435c56c8..737b65de 100644 --- a/x/nftmngr/keeper/nft_schema_by_contract_test.go +++ b/x/nftmngr/keeper/nft_schema_by_contract_test.go @@ -19,7 +19,6 @@ func createNNFTSchemaByContract(keeper *keeper.Keeper, ctx sdk.Context, n int) [ items := make([]types.NFTSchemaByContract, n) for i := range items { items[i].OriginContractAddress = strconv.Itoa(i) - items[i].Chain = strconv.Itoa(i) keeper.SetNFTSchemaByContract(ctx, items[i]) } @@ -32,7 +31,6 @@ func TestNFTSchemaByContractGet(t *testing.T) { for _, item := range items { rst, found := keeper.GetNFTSchemaByContract(ctx, item.OriginContractAddress, - item.Chain, ) require.True(t, found) require.Equal(t, @@ -47,11 +45,9 @@ func TestNFTSchemaByContractRemove(t *testing.T) { for _, item := range items { keeper.RemoveNFTSchemaByContract(ctx, item.OriginContractAddress, - item.Chain, ) _, found := keeper.GetNFTSchemaByContract(ctx, item.OriginContractAddress, - item.Chain, ) require.False(t, found) } From 41c284be6fac4d20173dba3c5e1be7aa0a475da8 Mon Sep 17 00:00:00 2001 From: dDee-D-six Date: Wed, 26 Oct 2022 14:05:35 +0700 Subject: [PATCH 10/10] query of 'sixnft' to 'thesixnetwork/sixnft' --- docs/static/openapi.yml | 2464 ++++++++++++++--------------- proto/evmsupport/query.proto | 6 +- proto/nftadmin/query.proto | 4 +- proto/nftmngr/query.proto | 18 +- proto/nftoracle/query.proto | 10 +- x/evmsupport/types/query.pb.go | 70 +- x/evmsupport/types/query.pb.gw.go | 6 +- x/nftadmin/types/query.pb.go | 52 +- x/nftadmin/types/query.pb.gw.go | 4 +- x/nftmngr/types/query.pb.go | 190 +-- x/nftmngr/types/query.pb.gw.go | 18 +- x/nftoracle/types/query.pb.go | 108 +- x/nftoracle/types/query.pb.gw.go | 10 +- 13 files changed, 1445 insertions(+), 1515 deletions(-) diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml index e0fdb07f..c3aadc3d 100644 --- a/docs/static/openapi.yml +++ b/docs/static/openapi.yml @@ -30372,7 +30372,7 @@ paths: additionalProperties: {} tags: - Query - /sixnft/evmsupport/address_binding: + /thesixnetwork/sixnft/evmsupport/address_binding: get: summary: Queries a list of AddressBinding items. operationId: ThesixnetworkSixnftEvmsupportAddressBindingAll @@ -30495,7 +30495,7 @@ paths: type: boolean tags: - Query - '/sixnft/evmsupport/address_binding/{ethAddress}/{nativeAddress}': + '/thesixnetwork/sixnft/evmsupport/address_binding/{ethAddress}/{nativeAddress}': get: summary: Queries a AddressBinding by index. operationId: ThesixnetworkSixnftEvmsupportAddressBinding @@ -30541,7 +30541,7 @@ paths: type: string tags: - Query - /sixnft/evmsupport/params: + /thesixnetwork/sixnft/evmsupport/params: get: summary: Parameters queries the parameters of the module. operationId: ThesixnetworkSixnftEvmsupportParams @@ -30552,8 +30552,8 @@ paths: type: object properties: params: - description: params holds all the parameters of this module. type: object + description: Params defines the parameters for the module. description: >- QueryParamsResponse is response type for the Query/Params RPC method. @@ -30577,7 +30577,7 @@ paths: additionalProperties: {} tags: - Query - /sixnft/nftadmin/authorization: + /thesixnetwork/sixnft/nftadmin/authorization: get: summary: Queries a Authorization by index. operationId: ThesixnetworkSixnftNftadminAuthorization @@ -30624,7 +30624,7 @@ paths: additionalProperties: {} tags: - Query - /sixnft/nftadmin/params: + /thesixnetwork/sixnft/nftadmin/params: get: summary: Parameters queries the parameters of the module. operationId: ThesixnetworkSixnftNftadminParams @@ -30635,8 +30635,8 @@ paths: type: object properties: params: - description: params holds all the parameters of this module. type: object + description: Params defines the parameters for the module. description: >- QueryParamsResponse is response type for the Query/Params RPC method. @@ -30660,7 +30660,7 @@ paths: additionalProperties: {} tags: - Query - /sixnft/nftmngr/action_by_ref_id: + /thesixnetwork/sixnft/nftmngr/action_by_ref_id: get: summary: Queries a list of ActionByRefId items. operationId: ThesixnetworkSixnftNftmngrActionByRefIdAll @@ -30944,19 +30944,9 @@ paths: in: query required: false type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean tags: - Query - '/sixnft/nftmngr/action_by_ref_id/{refId}': + '/thesixnetwork/sixnft/nftmngr/action_by_ref_id/{refId}': get: summary: Queries a ActionByRefId by index. operationId: ThesixnetworkSixnftNftmngrActionByRefId @@ -31171,97 +31161,32 @@ paths: type: string tags: - Query - /sixnft/nftmngr/nft_data: + /thesixnetwork/sixnft/nftmngr/metadata_creator: get: - summary: Queries a list of NftData items. - operationId: ThesixnetworkSixnftNftmngrNftDataAll + summary: Queries a list of MetadataCreator items. + operationId: ThesixnetworkSixnftNftmngrMetadataCreatorAll responses: '200': description: A successful response. schema: type: object properties: - nftData: + metadataCreator: type: array items: type: object properties: - nft_schema_code: - type: string - token_id: - type: string - token_owner: - type: string - owner_address_type: - type: string - enum: - - ORIGIN_ADDRESS - - INTERNAL_ADDRESS - default: ORIGIN_ADDRESS - origin_image: - type: string - onchain_image: - type: string - token_uri: + nftSchemaCode: type: string - origin_attributes: + metadataMintedBy: type: array items: type: object properties: - name: + token_id: type: string - number_attribute_value: - type: object - properties: - value: - type: string - format: uint64 - string_attribute_value: - type: object - properties: - value: - type: string - boolean_attribute_value: - type: object - properties: - value: - type: boolean - float_attribute_value: - type: object - properties: - value: - type: number - format: double - onchain_attributes: - type: array - items: - type: object - properties: - name: + minter: type: string - number_attribute_value: - type: object - properties: - value: - type: string - format: uint64 - string_attribute_value: - type: object - properties: - value: - type: string - boolean_attribute_value: - type: object - properties: - value: - type: boolean - float_attribute_value: - type: object - properties: - value: - type: number - format: double pagination: type: object properties: @@ -31521,107 +31446,32 @@ paths: in: query required: false type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean tags: - Query - '/sixnft/nftmngr/nft_data/{nftSchemaCode}/{tokenId}': + '/thesixnetwork/sixnft/nftmngr/metadata_creator/{nftSchemaCode}': get: - summary: Queries a NftData by index. - operationId: ThesixnetworkSixnftNftmngrNftData + summary: Queries a MetadataCreator by index. + operationId: ThesixnetworkSixnftNftmngrMetadataCreator responses: '200': description: A successful response. schema: type: object properties: - nftData: + metadataCreator: type: object properties: - nft_schema_code: - type: string - token_id: - type: string - token_owner: - type: string - owner_address_type: - type: string - enum: - - ORIGIN_ADDRESS - - INTERNAL_ADDRESS - default: ORIGIN_ADDRESS - origin_image: - type: string - onchain_image: - type: string - token_uri: + nftSchemaCode: type: string - origin_attributes: + metadataMintedBy: type: array items: type: object properties: - name: + token_id: type: string - number_attribute_value: - type: object - properties: - value: - type: string - format: uint64 - string_attribute_value: - type: object - properties: - value: - type: string - boolean_attribute_value: - type: object - properties: - value: - type: boolean - float_attribute_value: - type: object - properties: - value: - type: number - format: double - onchain_attributes: - type: array - items: - type: object - properties: - name: + minter: type: string - number_attribute_value: - type: object - properties: - value: - type: string - format: uint64 - string_attribute_value: - type: object - properties: - value: - type: string - boolean_attribute_value: - type: object - properties: - value: - type: boolean - float_attribute_value: - type: object - properties: - value: - type: number - format: double default: description: An unexpected error response. schema: @@ -31812,315 +31662,101 @@ paths: in: path required: true type: string - - name: tokenId - in: path - required: true - type: string tags: - Query - /sixnft/nftmngr/nft_schema: + '/thesixnetwork/sixnft/nftmngr/nft_collection/{nftSchemaCode}': get: - summary: Queries a list of NFTSchema items. - operationId: ThesixnetworkSixnftNftmngrNFTSchemaAll + summary: Queries a NftCollection by index. + operationId: ThesixnetworkSixnftNftmngrNftCollection responses: '200': description: A successful response. schema: type: object properties: - nFTSchema: + nftCollection: type: array items: type: object properties: - code: + nft_schema_code: type: string - name: + token_id: type: string - owner: + token_owner: type: string - system_actioners: + owner_address_type: + type: string + enum: + - ORIGIN_ADDRESS + - INTERNAL_ADDRESS + default: ORIGIN_ADDRESS + origin_image: + type: string + onchain_image: + type: string + token_uri: + type: string + origin_attributes: type: array items: - type: string - origin_data: - type: object - properties: - origin_chain: - type: string - origin_contract_address: - type: string - origin_base_uri: - type: string - attribute_overriding: - type: string - enum: - - ORIGIN - - CHAIN - default: ORIGIN - metadata_format: - type: string - origin_attributes: - type: array - items: + type: object + properties: + name: + type: string + number_attribute_value: type: object properties: - name: + value: type: string - data_type: + format: uint64 + string_attribute_value: + type: object + properties: + value: type: string - required: + boolean_attribute_value: + type: object + properties: + value: type: boolean - display_value_field: - type: string - display_option: - type: object - properties: - bool_true_value: - type: string - bool_false_value: - type: string - opensea: - type: object - properties: - display_type: - type: string - trait_type: - type: string - max_value: - type: string - format: uint64 - default_mint_value: - type: object - properties: - number_attribute_value: - type: object - properties: - value: - type: string - format: uint64 - string_attribute_value: - type: object - properties: - value: - type: string - boolean_attribute_value: - type: object - properties: - value: - type: boolean - float_attribute_value: - type: object - properties: - value: - type: number - format: double - hidden_to_marketplace: - type: boolean - index: - type: string - format: uint64 - uri_retrieval_method: - type: string - enum: - - BASE - - TOKEN - default: BASE - onchain_data: - type: object - properties: - reveal_required: - type: boolean - reveal_secret: - type: string - format: byte - nft_attributes: - type: array - items: + float_attribute_value: type: object properties: - name: - type: string - data_type: - type: string - required: - type: boolean - display_value_field: - type: string - display_option: - type: object - properties: - bool_true_value: - type: string - bool_false_value: - type: string - opensea: - type: object - properties: - display_type: - type: string - trait_type: - type: string - max_value: - type: string - format: uint64 - default_mint_value: - type: object - properties: - number_attribute_value: - type: object - properties: - value: - type: string - format: uint64 - string_attribute_value: - type: object - properties: - value: - type: string - boolean_attribute_value: - type: object - properties: - value: - type: boolean - float_attribute_value: - type: object - properties: - value: - type: number - format: double - hidden_to_marketplace: - type: boolean - index: - type: string - format: uint64 - token_attributes: - type: array - items: + value: + type: number + format: double + onchain_attributes: + type: array + items: + type: object + properties: + name: + type: string + number_attribute_value: type: object properties: - name: - type: string - data_type: - type: string - required: - type: boolean - display_value_field: - type: string - display_option: - type: object - properties: - bool_true_value: - type: string - bool_false_value: - type: string - opensea: - type: object - properties: - display_type: - type: string - trait_type: - type: string - max_value: - type: string - format: uint64 - default_mint_value: - type: object - properties: - number_attribute_value: - type: object - properties: - value: - type: string - format: uint64 - string_attribute_value: - type: object - properties: - value: - type: string - boolean_attribute_value: - type: object - properties: - value: - type: boolean - float_attribute_value: - type: object - properties: - value: - type: number - format: double - hidden_to_marketplace: - type: boolean - index: + value: type: string format: uint64 - actions: - type: array - items: + string_attribute_value: type: object properties: - name: - type: string - desc: + value: type: string - disable: + boolean_attribute_value: + type: object + properties: + value: type: boolean - when: - type: string - then: - type: array - items: - type: string - allowed_actioner: - type: string - enum: - - ALLOWED_ACTIONER_ALL - - ALLOWED_ACTIONER_SYSTEM_ONLY - - ALLOWED_ACTIONER_USER_ONLY - default: ALLOWED_ACTIONER_ALL - status: - type: object - additionalProperties: - type: boolean - on_off_switch: - type: object - additionalProperties: - type: boolean - nft_attributes_value: - type: array - items: + float_attribute_value: type: object properties: - name: - type: string - number_attribute_value: - type: object - properties: - value: - type: string - format: uint64 - string_attribute_value: - type: object - properties: - value: - type: string - boolean_attribute_value: - type: object - properties: - value: - type: boolean - float_attribute_value: - type: object - properties: - value: - type: number - format: double - isVerified: - type: boolean - mint_authorization: - type: string - pagination: - type: object + value: + type: number + format: double + pagination: + type: object properties: next_key: type: string @@ -32332,6 +31968,10 @@ paths: "value": "1.212s" } parameters: + - name: nftSchemaCode + in: path + required: true + type: string - name: pagination.key description: |- key is a value returned in PageResponse.next_key to begin @@ -32378,317 +32018,126 @@ paths: in: query required: false type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean tags: - Query - '/sixnft/nftmngr/nft_schema/{code}': + /thesixnetwork/sixnft/nftmngr/nft_data: get: - summary: Queries a NFTSchema by index. - operationId: ThesixnetworkSixnftNftmngrNFTSchema + summary: Queries a list of NftData items. + operationId: ThesixnetworkSixnftNftmngrNftDataAll responses: '200': description: A successful response. schema: type: object properties: - nFTSchema: - type: object - properties: - code: - type: string - name: - type: string - owner: - type: string - system_actioners: - type: array - items: + nftData: + type: array + items: + type: object + properties: + nft_schema_code: type: string - origin_data: - type: object - properties: - origin_chain: - type: string - origin_contract_address: - type: string - origin_base_uri: - type: string - attribute_overriding: - type: string - enum: - - ORIGIN - - CHAIN - default: ORIGIN - metadata_format: - type: string - origin_attributes: - type: array - items: - type: object - properties: - name: - type: string - data_type: - type: string - required: - type: boolean - display_value_field: - type: string - display_option: - type: object - properties: - bool_true_value: - type: string - bool_false_value: - type: string - opensea: - type: object - properties: - display_type: - type: string - trait_type: - type: string - max_value: - type: string - format: uint64 - default_mint_value: - type: object - properties: - number_attribute_value: - type: object - properties: - value: - type: string - format: uint64 - string_attribute_value: - type: object - properties: - value: - type: string - boolean_attribute_value: - type: object - properties: - value: - type: boolean - float_attribute_value: - type: object - properties: - value: - type: number - format: double - hidden_to_marketplace: - type: boolean - index: - type: string - format: uint64 - uri_retrieval_method: - type: string - enum: - - BASE - - TOKEN - default: BASE - onchain_data: - type: object - properties: - reveal_required: - type: boolean - reveal_secret: - type: string - format: byte - nft_attributes: - type: array - items: - type: object - properties: - name: - type: string - data_type: - type: string - required: - type: boolean - display_value_field: - type: string - display_option: - type: object - properties: - bool_true_value: - type: string - bool_false_value: - type: string - opensea: - type: object - properties: - display_type: - type: string - trait_type: - type: string - max_value: - type: string - format: uint64 - default_mint_value: - type: object - properties: - number_attribute_value: - type: object - properties: - value: - type: string - format: uint64 - string_attribute_value: - type: object - properties: - value: - type: string - boolean_attribute_value: - type: object - properties: - value: - type: boolean - float_attribute_value: - type: object - properties: - value: - type: number - format: double - hidden_to_marketplace: - type: boolean - index: - type: string - format: uint64 - token_attributes: - type: array - items: - type: object - properties: - name: - type: string - data_type: - type: string - required: - type: boolean - display_value_field: - type: string - display_option: - type: object - properties: - bool_true_value: - type: string - bool_false_value: - type: string - opensea: - type: object - properties: - display_type: - type: string - trait_type: - type: string - max_value: - type: string - format: uint64 - default_mint_value: - type: object - properties: - number_attribute_value: - type: object - properties: - value: - type: string - format: uint64 - string_attribute_value: - type: object - properties: - value: - type: string - boolean_attribute_value: - type: object - properties: - value: - type: boolean - float_attribute_value: - type: object - properties: - value: - type: number - format: double - hidden_to_marketplace: - type: boolean - index: - type: string - format: uint64 - actions: - type: array - items: - type: object - properties: - name: - type: string - desc: - type: string - disable: - type: boolean - when: - type: string - then: - type: array - items: - type: string - allowed_actioner: - type: string - enum: - - ALLOWED_ACTIONER_ALL - - ALLOWED_ACTIONER_SYSTEM_ONLY - - ALLOWED_ACTIONER_USER_ONLY - default: ALLOWED_ACTIONER_ALL - status: + token_id: + type: string + token_owner: + type: string + owner_address_type: + type: string + enum: + - ORIGIN_ADDRESS + - INTERNAL_ADDRESS + default: ORIGIN_ADDRESS + origin_image: + type: string + onchain_image: + type: string + token_uri: + type: string + origin_attributes: + type: array + items: type: object - additionalProperties: - type: boolean - on_off_switch: + properties: + name: + type: string + number_attribute_value: + type: object + properties: + value: + type: string + format: uint64 + string_attribute_value: + type: object + properties: + value: + type: string + boolean_attribute_value: + type: object + properties: + value: + type: boolean + float_attribute_value: + type: object + properties: + value: + type: number + format: double + onchain_attributes: + type: array + items: type: object - additionalProperties: - type: boolean - nft_attributes_value: - type: array - items: - type: object - properties: - name: - type: string - number_attribute_value: - type: object - properties: - value: - type: string - format: uint64 - string_attribute_value: - type: object - properties: - value: - type: string - boolean_attribute_value: - type: object - properties: - value: - type: boolean - float_attribute_value: - type: object - properties: - value: - type: number - format: double - isVerified: - type: boolean - mint_authorization: + properties: + name: + type: string + number_attribute_value: + type: object + properties: + value: + type: string + format: uint64 + string_attribute_value: + type: object + properties: + value: + type: string + boolean_attribute_value: + type: object + properties: + value: + type: boolean + float_attribute_value: + type: object + properties: + value: + type: number + format: double + pagination: + type: object + properties: + next_key: + type: string + format: byte + title: |- + next_key is the key to be passed to PageRequest.key to + query the next page most efficiently + total: type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + description: >- + PageResponse is to be embedded in gRPC response messages where + the + + corresponding request message has used PageRequest. + + message SomeResponse { + repeated Bar results = 1; + PageResponse page = 2; + } default: description: An unexpected error response. schema: @@ -32875,58 +32324,143 @@ paths: "value": "1.212s" } parameters: - - name: code - in: path - required: true + - name: pagination.key + description: |- + key is a value returned in PageResponse.next_key to begin + querying the next page most efficiently. Only one of offset or key + should be set. + in: query + required: false + type: string + format: byte + - name: pagination.offset + description: >- + offset is a numeric offset that can be used when key is unavailable. + + It is less efficient than using key. Only one of offset or key + should + + be set. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + description: >- + limit is the total number of results to be returned in the result + page. + + If left empty it will default to a value to be set by each app. + in: query + required: false type: string + format: uint64 + - name: pagination.count_total + description: >- + count_total is set to true to indicate that the result set should + include + + a count of the total number of items available for pagination in + UIs. + + count_total is only respected when offset is used. It is ignored + when key + + is set. + in: query + required: false + type: boolean tags: - Query - /sixnft/nftmngr/organization: + '/thesixnetwork/sixnft/nftmngr/nft_data/{nftSchemaCode}/{tokenId}': get: - summary: Queries a list of Organization items. - operationId: ThesixnetworkSixnftNftmngrOrganizationAll + summary: Queries a NftData by index. + operationId: ThesixnetworkSixnftNftmngrNftData responses: '200': description: A successful response. schema: type: object properties: - organization: - type: array - items: - type: object - properties: - name: - type: string - owner: - type: string - pagination: + nftData: type: object properties: - next_key: + nft_schema_code: type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: + token_id: type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise - description: >- - PageResponse is to be embedded in gRPC response messages where - the - - corresponding request message has used PageRequest. - - message SomeResponse { - repeated Bar results = 1; - PageResponse page = 2; - } + token_owner: + type: string + owner_address_type: + type: string + enum: + - ORIGIN_ADDRESS + - INTERNAL_ADDRESS + default: ORIGIN_ADDRESS + origin_image: + type: string + onchain_image: + type: string + token_uri: + type: string + origin_attributes: + type: array + items: + type: object + properties: + name: + type: string + number_attribute_value: + type: object + properties: + value: + type: string + format: uint64 + string_attribute_value: + type: object + properties: + value: + type: string + boolean_attribute_value: + type: object + properties: + value: + type: boolean + float_attribute_value: + type: object + properties: + value: + type: number + format: double + onchain_attributes: + type: array + items: + type: object + properties: + name: + type: string + number_attribute_value: + type: object + properties: + value: + type: string + format: uint64 + string_attribute_value: + type: object + properties: + value: + type: string + boolean_attribute_value: + type: object + properties: + value: + type: boolean + float_attribute_value: + type: object + properties: + value: + type: number + format: double default: description: An unexpected error response. schema: @@ -33106,88 +32640,40 @@ paths: `value` which holds the custom JSON in addition to the `@type` - field. Example (for message [google.protobuf.Duration][]): - - { - "@type": "type.googleapis.com/google.protobuf.Duration", - "value": "1.212s" - } - parameters: - - name: pagination.key - description: |- - key is a value returned in PageResponse.next_key to begin - querying the next page most efficiently. Only one of offset or key - should be set. - in: query - required: false - type: string - format: byte - - name: pagination.offset - description: >- - offset is a numeric offset that can be used when key is unavailable. - - It is less efficient than using key. Only one of offset or key - should - - be set. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - description: >- - limit is the total number of results to be returned in the result - page. - - If left empty it will default to a value to be set by each app. - in: query - required: false - type: string - format: uint64 - - name: pagination.count_total - description: >- - count_total is set to true to indicate that the result set should - include - - a count of the total number of items available for pagination in - UIs. - - count_total is only respected when offset is used. It is ignored - when key - - is set. - in: query - required: false - type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean + field. Example (for message [google.protobuf.Duration][]): + + { + "@type": "type.googleapis.com/google.protobuf.Duration", + "value": "1.212s" + } + parameters: + - name: nftSchemaCode + in: path + required: true + type: string + - name: tokenId + in: path + required: true + type: string tags: - Query - '/sixnft/nftmngr/organization/{name}': + /thesixnetwork/sixnft/nftmngr/nft_fee_balance: get: - summary: Queries a Organization by index. - operationId: ThesixnetworkSixnftNftmngrOrganization + summary: Queries a NFTFeeBalance by index. + operationId: ThesixnetworkSixnftNftmngrNFTFeeBalance responses: '200': description: A successful response. schema: type: object properties: - organization: + NFTFeeBalance: type: object properties: - name: - type: string - owner: - type: string + fee_balances: + type: object + additionalProperties: + type: string default: description: An unexpected error response. schema: @@ -33373,29 +32859,41 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } - parameters: - - name: name - in: path - required: true - type: string tags: - Query - /sixnft/nftmngr/params: + /thesixnetwork/sixnft/nftmngr/nft_fee_config: get: - summary: Parameters queries the parameters of the module. - operationId: ThesixnetworkSixnftNftmngrParams + summary: Queries a NFTFeeConfig by index. + operationId: ThesixnetworkSixnftNftmngrNFTFeeConfig responses: '200': description: A successful response. schema: type: object properties: - params: + NFTFeeConfig: type: object - description: Params defines the parameters for the module. - description: >- - QueryParamsResponse is response type for the Query/Params RPC - method. + properties: + schema_fee: + type: object + properties: + fee_amount: + type: string + fee_distributions: + type: array + items: + type: object + properties: + method: + type: string + enum: + - BURN + - REWARD_POOL + - TRANSFER + default: BURN + portion: + type: number + format: float default: description: An unexpected error response. schema: @@ -33583,32 +33081,307 @@ paths: } tags: - Query - /thesixnetwork/sixnft/nftmngr/metadata_creator: + /thesixnetwork/sixnft/nftmngr/nft_schema: get: - summary: Queries a list of MetadataCreator items. - operationId: ThesixnetworkSixnftNftmngrMetadataCreatorAll + summary: Queries a list of NFTSchema items. + operationId: ThesixnetworkSixnftNftmngrNFTSchemaAll responses: '200': description: A successful response. schema: type: object properties: - metadataCreator: + nFTSchema: type: array items: type: object properties: - nftSchemaCode: + code: + type: string + name: + type: string + owner: + type: string + system_actioners: + type: array + items: + type: string + origin_data: + type: object + properties: + origin_chain: + type: string + origin_contract_address: + type: string + origin_base_uri: + type: string + attribute_overriding: + type: string + enum: + - ORIGIN + - CHAIN + default: ORIGIN + metadata_format: + type: string + origin_attributes: + type: array + items: + type: object + properties: + name: + type: string + data_type: + type: string + required: + type: boolean + display_value_field: + type: string + display_option: + type: object + properties: + bool_true_value: + type: string + bool_false_value: + type: string + opensea: + type: object + properties: + display_type: + type: string + trait_type: + type: string + max_value: + type: string + format: uint64 + default_mint_value: + type: object + properties: + number_attribute_value: + type: object + properties: + value: + type: string + format: uint64 + string_attribute_value: + type: object + properties: + value: + type: string + boolean_attribute_value: + type: object + properties: + value: + type: boolean + float_attribute_value: + type: object + properties: + value: + type: number + format: double + hidden_to_marketplace: + type: boolean + index: + type: string + format: uint64 + uri_retrieval_method: + type: string + enum: + - BASE + - TOKEN + default: BASE + onchain_data: + type: object + properties: + reveal_required: + type: boolean + reveal_secret: + type: string + format: byte + nft_attributes: + type: array + items: + type: object + properties: + name: + type: string + data_type: + type: string + required: + type: boolean + display_value_field: + type: string + display_option: + type: object + properties: + bool_true_value: + type: string + bool_false_value: + type: string + opensea: + type: object + properties: + display_type: + type: string + trait_type: + type: string + max_value: + type: string + format: uint64 + default_mint_value: + type: object + properties: + number_attribute_value: + type: object + properties: + value: + type: string + format: uint64 + string_attribute_value: + type: object + properties: + value: + type: string + boolean_attribute_value: + type: object + properties: + value: + type: boolean + float_attribute_value: + type: object + properties: + value: + type: number + format: double + hidden_to_marketplace: + type: boolean + index: + type: string + format: uint64 + token_attributes: + type: array + items: + type: object + properties: + name: + type: string + data_type: + type: string + required: + type: boolean + display_value_field: + type: string + display_option: + type: object + properties: + bool_true_value: + type: string + bool_false_value: + type: string + opensea: + type: object + properties: + display_type: + type: string + trait_type: + type: string + max_value: + type: string + format: uint64 + default_mint_value: + type: object + properties: + number_attribute_value: + type: object + properties: + value: + type: string + format: uint64 + string_attribute_value: + type: object + properties: + value: + type: string + boolean_attribute_value: + type: object + properties: + value: + type: boolean + float_attribute_value: + type: object + properties: + value: + type: number + format: double + hidden_to_marketplace: + type: boolean + index: + type: string + format: uint64 + actions: + type: array + items: + type: object + properties: + name: + type: string + desc: + type: string + disable: + type: boolean + when: + type: string + then: + type: array + items: + type: string + allowed_actioner: + type: string + enum: + - ALLOWED_ACTIONER_ALL + - ALLOWED_ACTIONER_SYSTEM_ONLY + - ALLOWED_ACTIONER_USER_ONLY + default: ALLOWED_ACTIONER_ALL + status: + type: object + additionalProperties: + type: boolean + on_off_switch: + type: object + additionalProperties: + type: boolean + nft_attributes_value: + type: array + items: + type: object + properties: + name: + type: string + number_attribute_value: + type: object + properties: + value: + type: string + format: uint64 + string_attribute_value: + type: object + properties: + value: + type: string + boolean_attribute_value: + type: object + properties: + value: + type: boolean + float_attribute_value: + type: object + properties: + value: + type: number + format: double + isVerified: + type: boolean + mint_authorization: type: string - metadataMintedBy: - type: array - items: - type: object - properties: - token_id: - type: string - minter: - type: string pagination: type: object properties: @@ -33868,42 +33641,307 @@ paths: in: query required: false type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean tags: - Query - '/thesixnetwork/sixnft/nftmngr/metadata_creator/{nftSchemaCode}': + '/thesixnetwork/sixnft/nftmngr/nft_schema/{code}': get: - summary: Queries a MetadataCreator by index. - operationId: ThesixnetworkSixnftNftmngrMetadataCreator + summary: Queries a NFTSchema by index. + operationId: ThesixnetworkSixnftNftmngrNFTSchema responses: '200': description: A successful response. schema: type: object properties: - metadataCreator: + nFTSchema: type: object properties: - nftSchemaCode: + code: + type: string + name: + type: string + owner: + type: string + system_actioners: + type: array + items: + type: string + origin_data: + type: object + properties: + origin_chain: + type: string + origin_contract_address: + type: string + origin_base_uri: + type: string + attribute_overriding: + type: string + enum: + - ORIGIN + - CHAIN + default: ORIGIN + metadata_format: + type: string + origin_attributes: + type: array + items: + type: object + properties: + name: + type: string + data_type: + type: string + required: + type: boolean + display_value_field: + type: string + display_option: + type: object + properties: + bool_true_value: + type: string + bool_false_value: + type: string + opensea: + type: object + properties: + display_type: + type: string + trait_type: + type: string + max_value: + type: string + format: uint64 + default_mint_value: + type: object + properties: + number_attribute_value: + type: object + properties: + value: + type: string + format: uint64 + string_attribute_value: + type: object + properties: + value: + type: string + boolean_attribute_value: + type: object + properties: + value: + type: boolean + float_attribute_value: + type: object + properties: + value: + type: number + format: double + hidden_to_marketplace: + type: boolean + index: + type: string + format: uint64 + uri_retrieval_method: + type: string + enum: + - BASE + - TOKEN + default: BASE + onchain_data: + type: object + properties: + reveal_required: + type: boolean + reveal_secret: + type: string + format: byte + nft_attributes: + type: array + items: + type: object + properties: + name: + type: string + data_type: + type: string + required: + type: boolean + display_value_field: + type: string + display_option: + type: object + properties: + bool_true_value: + type: string + bool_false_value: + type: string + opensea: + type: object + properties: + display_type: + type: string + trait_type: + type: string + max_value: + type: string + format: uint64 + default_mint_value: + type: object + properties: + number_attribute_value: + type: object + properties: + value: + type: string + format: uint64 + string_attribute_value: + type: object + properties: + value: + type: string + boolean_attribute_value: + type: object + properties: + value: + type: boolean + float_attribute_value: + type: object + properties: + value: + type: number + format: double + hidden_to_marketplace: + type: boolean + index: + type: string + format: uint64 + token_attributes: + type: array + items: + type: object + properties: + name: + type: string + data_type: + type: string + required: + type: boolean + display_value_field: + type: string + display_option: + type: object + properties: + bool_true_value: + type: string + bool_false_value: + type: string + opensea: + type: object + properties: + display_type: + type: string + trait_type: + type: string + max_value: + type: string + format: uint64 + default_mint_value: + type: object + properties: + number_attribute_value: + type: object + properties: + value: + type: string + format: uint64 + string_attribute_value: + type: object + properties: + value: + type: string + boolean_attribute_value: + type: object + properties: + value: + type: boolean + float_attribute_value: + type: object + properties: + value: + type: number + format: double + hidden_to_marketplace: + type: boolean + index: + type: string + format: uint64 + actions: + type: array + items: + type: object + properties: + name: + type: string + desc: + type: string + disable: + type: boolean + when: + type: string + then: + type: array + items: + type: string + allowed_actioner: + type: string + enum: + - ALLOWED_ACTIONER_ALL + - ALLOWED_ACTIONER_SYSTEM_ONLY + - ALLOWED_ACTIONER_USER_ONLY + default: ALLOWED_ACTIONER_ALL + status: + type: object + additionalProperties: + type: boolean + on_off_switch: + type: object + additionalProperties: + type: boolean + nft_attributes_value: + type: array + items: + type: object + properties: + name: + type: string + number_attribute_value: + type: object + properties: + value: + type: string + format: uint64 + string_attribute_value: + type: object + properties: + value: + type: string + boolean_attribute_value: + type: object + properties: + value: + type: boolean + float_attribute_value: + type: object + properties: + value: + type: number + format: double + isVerified: + type: boolean + mint_authorization: type: string - metadataMintedBy: - type: array - items: - type: object - properties: - token_id: - type: string - minter: - type: string default: description: An unexpected error response. schema: @@ -34090,103 +34128,33 @@ paths: "value": "1.212s" } parameters: - - name: nftSchemaCode + - name: code in: path required: true type: string tags: - Query - '/thesixnetwork/sixnft/nftmngr/nft_collection/{nftSchemaCode}': + /thesixnetwork/sixnft/nftmngr/nft_schema_by_contract: get: - summary: Queries a NftCollection by index. - operationId: ThesixnetworkSixnftNftmngrNftCollection + summary: Queries a list of NFTSchemaByContract items. + operationId: ThesixnetworkSixnftNftmngrNFTSchemaByContractAll responses: '200': description: A successful response. schema: type: object properties: - nftCollection: + nFTSchemaByContract: type: array items: type: object - properties: - nft_schema_code: - type: string - token_id: - type: string - token_owner: - type: string - owner_address_type: - type: string - enum: - - ORIGIN_ADDRESS - - INTERNAL_ADDRESS - default: ORIGIN_ADDRESS - origin_image: - type: string - onchain_image: - type: string - token_uri: - type: string - origin_attributes: - type: array - items: - type: object - properties: - name: - type: string - number_attribute_value: - type: object - properties: - value: - type: string - format: uint64 - string_attribute_value: - type: object - properties: - value: - type: string - boolean_attribute_value: - type: object - properties: - value: - type: boolean - float_attribute_value: - type: object - properties: - value: - type: number - format: double - onchain_attributes: - type: array - items: - type: object - properties: - name: - type: string - number_attribute_value: - type: object - properties: - value: - type: string - format: uint64 - string_attribute_value: - type: object - properties: - value: - type: string - boolean_attribute_value: - type: object - properties: - value: - type: boolean - float_attribute_value: - type: object - properties: - value: - type: number - format: double + properties: + originContractAddress: + type: string + schemaCodes: + type: array + items: + type: string pagination: type: object properties: @@ -34400,10 +34368,6 @@ paths: "value": "1.212s" } parameters: - - name: nftSchemaCode - in: path - required: true - type: string - name: pagination.key description: |- key is a value returned in PageResponse.next_key to begin @@ -34450,34 +34414,26 @@ paths: in: query required: false type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean tags: - Query - /thesixnetwork/sixnft/nftmngr/nft_fee_balance: + '/thesixnetwork/sixnft/nftmngr/nft_schema_by_contract/{originContractAddress}': get: - summary: Queries a NFTFeeBalance by index. - operationId: ThesixnetworkSixnftNftmngrNFTFeeBalance + summary: Queries a NFTSchemaByContract by index. + operationId: ThesixnetworkSixnftNftmngrNFTSchemaByContract responses: '200': description: A successful response. schema: type: object properties: - NFTFeeBalance: + nFTSchemaByContract: type: object properties: - fee_balances: - type: object - additionalProperties: + originContractAddress: + type: string + schemaCodes: + type: array + items: type: string default: description: An unexpected error response. @@ -34664,41 +34620,59 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } + parameters: + - name: originContractAddress + in: path + required: true + type: string tags: - Query - /thesixnetwork/sixnft/nftmngr/nft_fee_config: + /thesixnetwork/sixnft/nftmngr/organization: get: - summary: Queries a NFTFeeConfig by index. - operationId: ThesixnetworkSixnftNftmngrNFTFeeConfig + summary: Queries a list of Organization items. + operationId: ThesixnetworkSixnftNftmngrOrganizationAll responses: '200': description: A successful response. schema: type: object properties: - NFTFeeConfig: + organization: + type: array + items: + type: object + properties: + name: + type: string + owner: + type: string + pagination: type: object properties: - schema_fee: - type: object - properties: - fee_amount: - type: string - fee_distributions: - type: array - items: - type: object - properties: - method: - type: string - enum: - - BURN - - REWARD_POOL - - TRANSFER - default: BURN - portion: - type: number - format: float + next_key: + type: string + format: byte + title: |- + next_key is the key to be passed to PageRequest.key to + query the next page most efficiently + total: + type: string + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + description: >- + PageResponse is to be embedded in gRPC response messages where + the + + corresponding request message has used PageRequest. + + message SomeResponse { + repeated Bar results = 1; + PageResponse page = 2; + } default: description: An unexpected error response. schema: @@ -34884,56 +34858,72 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } + parameters: + - name: pagination.key + description: |- + key is a value returned in PageResponse.next_key to begin + querying the next page most efficiently. Only one of offset or key + should be set. + in: query + required: false + type: string + format: byte + - name: pagination.offset + description: >- + offset is a numeric offset that can be used when key is unavailable. + + It is less efficient than using key. Only one of offset or key + should + + be set. + in: query + required: false + type: string + format: uint64 + - name: pagination.limit + description: >- + limit is the total number of results to be returned in the result + page. + + If left empty it will default to a value to be set by each app. + in: query + required: false + type: string + format: uint64 + - name: pagination.count_total + description: >- + count_total is set to true to indicate that the result set should + include + + a count of the total number of items available for pagination in + UIs. + + count_total is only respected when offset is used. It is ignored + when key + + is set. + in: query + required: false + type: boolean tags: - Query - /thesixnetwork/sixnft/nftmngr/nft_schema_by_contract: + '/thesixnetwork/sixnft/nftmngr/organization/{name}': get: - summary: Queries a list of NFTSchemaByContract items. - operationId: ThesixnetworkSixnftNftmngrNFTSchemaByContractAll + summary: Queries a Organization by index. + operationId: ThesixnetworkSixnftNftmngrOrganization responses: '200': description: A successful response. schema: type: object properties: - nFTSchemaByContract: - type: array - items: - type: object - properties: - originContractAddress: - type: string - schemaCodes: - type: array - items: - type: string - pagination: + organization: type: object properties: - next_key: + name: type: string - format: byte - title: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently - total: + owner: type: string - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise - description: >- - PageResponse is to be embedded in gRPC response messages where - the - - corresponding request message has used PageRequest. - - message SomeResponse { - repeated Bar results = 1; - PageResponse page = 2; - } default: description: An unexpected error response. schema: @@ -35120,83 +35110,28 @@ paths: "value": "1.212s" } parameters: - - name: pagination.key - description: |- - key is a value returned in PageResponse.next_key to begin - querying the next page most efficiently. Only one of offset or key - should be set. - in: query - required: false - type: string - format: byte - - name: pagination.offset - description: >- - offset is a numeric offset that can be used when key is unavailable. - - It is less efficient than using key. Only one of offset or key - should - - be set. - in: query - required: false - type: string - format: uint64 - - name: pagination.limit - description: >- - limit is the total number of results to be returned in the result - page. - - If left empty it will default to a value to be set by each app. - in: query - required: false + - name: name + in: path + required: true type: string - format: uint64 - - name: pagination.count_total - description: >- - count_total is set to true to indicate that the result set should - include - - a count of the total number of items available for pagination in - UIs. - - count_total is only respected when offset is used. It is ignored - when key - - is set. - in: query - required: false - type: boolean - - name: pagination.reverse - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - required: false - type: boolean tags: - Query - '/thesixnetwork/sixnft/nftmngr/nft_schema_by_contract/{originContractAddress}': + /thesixnetwork/sixnft/nftmngr/params: get: - summary: Queries a NFTSchemaByContract by index. - operationId: ThesixnetworkSixnftNftmngrNFTSchemaByContract + summary: Parameters queries the parameters of the module. + operationId: ThesixnetworkSixnftNftmngrParams responses: '200': description: A successful response. schema: type: object properties: - nFTSchemaByContract: + params: type: object - properties: - originContractAddress: - type: string - schemaCodes: - type: array - items: - type: string + description: Params defines the parameters for the module. + description: >- + QueryParamsResponse is response type for the Query/Params RPC + method. default: description: An unexpected error response. schema: @@ -35382,14 +35317,9 @@ paths: "@type": "type.googleapis.com/google.protobuf.Duration", "value": "1.212s" } - parameters: - - name: originContractAddress - in: path - required: true - type: string tags: - Query - /sixnft/nftoracle/action_request: + /thesixnetwork/sixnft/nftoracle/action_request: get: summary: Queries a list of ActionRequest items. operationId: ThesixnetworkSixnftNftoracleActionRequestAll @@ -35574,7 +35504,7 @@ paths: type: boolean tags: - Query - '/sixnft/nftoracle/action_request/{id}': + '/thesixnetwork/sixnft/nftoracle/action_request/{id}': get: summary: Queries a ActionRequest by id. operationId: ThesixnetworkSixnftNftoracleActionRequest @@ -35689,17 +35619,17 @@ paths: format: uint64 tags: - Query - /sixnft/nftoracle/mint_request: + /thesixnetwork/sixnft/nftoracle/collection_owner_request: get: - summary: Queries a list of MintRequest items. - operationId: ThesixnetworkSixnftNftoracleMintRequestAll + summary: Queries a list of CollectionOwnerRequest items. + operationId: ThesixnetworkSixnftNftoracleCollectionOwnerRequestAll responses: '200': description: A successful response. schema: type: object properties: - MintRequest: + CollectionOwnerRequest: type: array items: type: object @@ -35707,9 +35637,9 @@ paths: id: type: string format: uint64 - nft_schema_code: + nftSchemaCode: type: string - token_id: + signer: type: string required_confirm: type: string @@ -35734,35 +35664,26 @@ paths: created_at: type: string format: date-time - title: NftOriginData nft_origin_data = 8; valid_until: type: string format: date-time - data_hashes: + contract_info: type: array items: type: object properties: - origin_data: + contractOriginDataInfo: type: object properties: - image: + chain: type: string - holder_address: + contract_address: type: string - traits: - type: array - items: - type: object - properties: - trait_type: - type: string - value: - type: string - display_type: - type: string - max_value: - type: string + contract_owner: + type: string + request_expire: + type: string + format: date-time hash: type: string format: byte @@ -35867,25 +35788,25 @@ paths: type: boolean tags: - Query - '/sixnft/nftoracle/mint_request/{id}': + '/thesixnetwork/sixnft/nftoracle/collection_owner_request/{id}': get: - summary: Queries a MintRequest by id. - operationId: ThesixnetworkSixnftNftoracleMintRequest + summary: Queries a CollectionOwnerRequest by id. + operationId: ThesixnetworkSixnftNftoracleCollectionOwnerRequest responses: '200': description: A successful response. schema: type: object properties: - MintRequest: + CollectionOwnerRequest: type: object properties: id: type: string format: uint64 - nft_schema_code: + nftSchemaCode: type: string - token_id: + signer: type: string required_confirm: type: string @@ -35910,35 +35831,26 @@ paths: created_at: type: string format: date-time - title: NftOriginData nft_origin_data = 8; valid_until: type: string format: date-time - data_hashes: + contract_info: type: array items: type: object properties: - origin_data: + contractOriginDataInfo: type: object properties: - image: + chain: type: string - holder_address: + contract_address: type: string - traits: - type: array - items: - type: object - properties: - trait_type: - type: string - value: - type: string - display_type: - type: string - max_value: - type: string + contract_owner: + type: string + request_expire: + type: string + format: date-time hash: type: string format: byte @@ -35975,60 +35887,17 @@ paths: format: uint64 tags: - Query - /sixnft/nftoracle/params: - get: - summary: Parameters queries the parameters of the module. - operationId: ThesixnetworkSixnftNftoracleParams - responses: - '200': - description: A successful response. - schema: - type: object - properties: - params: - type: object - properties: - mint_request_active_duration: - type: string - action_request_active_duration: - type: string - verify_request_active_duration: - type: string - description: Params defines the parameters for the module. - description: >- - QueryParamsResponse is response type for the Query/Params RPC - method. - default: - description: An unexpected error response. - schema: - type: object - properties: - code: - type: integer - format: int32 - message: - type: string - details: - type: array - items: - type: object - properties: - '@type': - type: string - additionalProperties: {} - tags: - - Query - /thesixnetwork/sixnft/nftoracle/collection_owner_request: + /thesixnetwork/sixnft/nftoracle/mint_request: get: - summary: Queries a list of CollectionOwnerRequest items. - operationId: ThesixnetworkSixnftNftoracleCollectionOwnerRequestAll + summary: Queries a list of MintRequest items. + operationId: ThesixnetworkSixnftNftoracleMintRequestAll responses: '200': description: A successful response. schema: type: object properties: - CollectionOwnerRequest: + MintRequest: type: array items: type: object @@ -36036,9 +35905,9 @@ paths: id: type: string format: uint64 - nftSchemaCode: + nft_schema_code: type: string - signer: + token_id: type: string required_confirm: type: string @@ -36063,26 +35932,35 @@ paths: created_at: type: string format: date-time + title: NftOriginData nft_origin_data = 8; valid_until: type: string format: date-time - contract_info: + data_hashes: type: array items: type: object properties: - contractOriginDataInfo: + origin_data: type: object properties: - chain: - type: string - contract_address: - type: string - contract_owner: + image: type: string - request_expire: + holder_address: type: string - format: date-time + traits: + type: array + items: + type: object + properties: + trait_type: + type: string + value: + type: string + display_type: + type: string + max_value: + type: string hash: type: string format: byte @@ -36187,25 +36065,25 @@ paths: type: boolean tags: - Query - '/thesixnetwork/sixnft/nftoracle/collection_owner_request/{id}': + '/thesixnetwork/sixnft/nftoracle/mint_request/{id}': get: - summary: Queries a CollectionOwnerRequest by id. - operationId: ThesixnetworkSixnftNftoracleCollectionOwnerRequest + summary: Queries a MintRequest by id. + operationId: ThesixnetworkSixnftNftoracleMintRequest responses: '200': description: A successful response. schema: type: object properties: - CollectionOwnerRequest: + MintRequest: type: object properties: id: type: string format: uint64 - nftSchemaCode: + nft_schema_code: type: string - signer: + token_id: type: string required_confirm: type: string @@ -36230,26 +36108,35 @@ paths: created_at: type: string format: date-time + title: NftOriginData nft_origin_data = 8; valid_until: type: string format: date-time - contract_info: + data_hashes: type: array items: type: object properties: - contractOriginDataInfo: + origin_data: type: object properties: - chain: - type: string - contract_address: - type: string - contract_owner: + image: type: string - request_expire: + holder_address: type: string - format: date-time + traits: + type: array + items: + type: object + properties: + trait_type: + type: string + value: + type: string + display_type: + type: string + max_value: + type: string hash: type: string format: byte @@ -36322,6 +36209,49 @@ paths: additionalProperties: {} tags: - Query + /thesixnetwork/sixnft/nftoracle/params: + get: + summary: Parameters queries the parameters of the module. + operationId: ThesixnetworkSixnftNftoracleParams + responses: + '200': + description: A successful response. + schema: + type: object + properties: + params: + type: object + properties: + mint_request_active_duration: + type: string + action_request_active_duration: + type: string + verify_request_active_duration: + type: string + description: Params defines the parameters for the module. + description: >- + QueryParamsResponse is response type for the Query/Params RPC + method. + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + tags: + - Query definitions: cosmos.auth.v1beta1.Params: type: object @@ -57801,8 +57731,8 @@ definitions: type: object properties: params: - description: params holds all the parameters of this module. type: object + description: Params defines the parameters for the module. description: QueryParamsResponse is response type for the Query/Params RPC method. thesixnetwork.sixnft.nftadmin.AddressList: type: object @@ -57891,8 +57821,8 @@ definitions: type: object properties: params: - description: params holds all the parameters of this module. type: object + description: Params defines the parameters for the module. description: QueryParamsResponse is response type for the Query/Params RPC method. thesixnetwork.sixnft.nftmngr.Action: type: object diff --git a/proto/evmsupport/query.proto b/proto/evmsupport/query.proto index 72e75326..e906f8fc 100644 --- a/proto/evmsupport/query.proto +++ b/proto/evmsupport/query.proto @@ -14,16 +14,16 @@ option go_package = "github.com/thesixnetwork/sixnft/x/evmsupport/types"; service Query { // Parameters queries the parameters of the module. rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { - option (google.api.http).get = "/sixnft/evmsupport/params"; + option (google.api.http).get = "/thesixnetwork/sixnft/evmsupport/params"; } // Queries a AddressBinding by index. rpc AddressBinding(QueryGetAddressBindingRequest) returns (QueryGetAddressBindingResponse) { - option (google.api.http).get = "/sixnft/evmsupport/address_binding/{ethAddress}/{nativeAddress}"; + option (google.api.http).get = "/thesixnetwork/sixnft/evmsupport/address_binding/{ethAddress}/{nativeAddress}"; } // Queries a list of AddressBinding items. rpc AddressBindingAll(QueryAllAddressBindingRequest) returns (QueryAllAddressBindingResponse) { - option (google.api.http).get = "/sixnft/evmsupport/address_binding"; + option (google.api.http).get = "/thesixnetwork/sixnft/evmsupport/address_binding"; } // this line is used by starport scaffolding # 2 diff --git a/proto/nftadmin/query.proto b/proto/nftadmin/query.proto index 7c640178..da159389 100644 --- a/proto/nftadmin/query.proto +++ b/proto/nftadmin/query.proto @@ -14,11 +14,11 @@ option go_package = "github.com/thesixnetwork/sixnft/x/nftadmin/types"; service Query { // Parameters queries the parameters of the module. rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { - option (google.api.http).get = "/sixnft/nftadmin/params"; + option (google.api.http).get = "/thesixnetwork/sixnft/nftadmin/params"; } // Queries a Authorization by index. rpc Authorization(QueryGetAuthorizationRequest) returns (QueryGetAuthorizationResponse) { - option (google.api.http).get = "/sixnft/nftadmin/authorization"; + option (google.api.http).get = "/thesixnetwork/sixnft/nftadmin/authorization"; } // this line is used by starport scaffolding # 2 } diff --git a/proto/nftmngr/query.proto b/proto/nftmngr/query.proto index 1386543c..2fe0a34f 100644 --- a/proto/nftmngr/query.proto +++ b/proto/nftmngr/query.proto @@ -22,46 +22,46 @@ option go_package = "github.com/thesixnetwork/sixnft/x/nftmngr/types"; service Query { // Parameters queries the parameters of the module. rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { - option (google.api.http).get = "/sixnft/nftmngr/params"; + option (google.api.http).get = "/thesixnetwork/sixnft/nftmngr/params"; } // Queries a NFTSchema by index. rpc NFTSchema(QueryGetNFTSchemaRequest) returns (QueryGetNFTSchemaResponse) { - option (google.api.http).get = "/sixnft/nftmngr/nft_schema/{code}"; + option (google.api.http).get = "/thesixnetwork/sixnft/nftmngr/nft_schema/{code}"; } // Queries a list of NFTSchema items. rpc NFTSchemaAll(QueryAllNFTSchemaRequest) returns (QueryAllNFTSchemaResponse) { - option (google.api.http).get = "/sixnft/nftmngr/nft_schema"; + option (google.api.http).get = "/thesixnetwork/sixnft/nftmngr/nft_schema"; } // Queries a NftData by index. rpc NftData(QueryGetNftDataRequest) returns (QueryGetNftDataResponse) { - option (google.api.http).get = "/sixnft/nftmngr/nft_data/{nftSchemaCode}/{tokenId}"; + option (google.api.http).get = "/thesixnetwork/sixnft/nftmngr/nft_data/{nftSchemaCode}/{tokenId}"; } // Queries a list of NftData items. rpc NftDataAll(QueryAllNftDataRequest) returns (QueryAllNftDataResponse) { - option (google.api.http).get = "/sixnft/nftmngr/nft_data"; + option (google.api.http).get = "/thesixnetwork/sixnft/nftmngr/nft_data"; } // Queries a ActionByRefId by index. rpc ActionByRefId(QueryGetActionByRefIdRequest) returns (QueryGetActionByRefIdResponse) { - option (google.api.http).get = "/sixnft/nftmngr/action_by_ref_id/{refId}"; + option (google.api.http).get = "/thesixnetwork/sixnft/nftmngr/action_by_ref_id/{refId}"; } // Queries a list of ActionByRefId items. rpc ActionByRefIdAll(QueryAllActionByRefIdRequest) returns (QueryAllActionByRefIdResponse) { - option (google.api.http).get = "/sixnft/nftmngr/action_by_ref_id"; + option (google.api.http).get = "/thesixnetwork/sixnft/nftmngr/action_by_ref_id"; } // Queries a Organization by index. rpc Organization(QueryGetOrganizationRequest) returns (QueryGetOrganizationResponse) { - option (google.api.http).get = "/sixnft/nftmngr/organization/{name}"; + option (google.api.http).get = "/thesixnetwork/sixnft/nftmngr/organization/{name}"; } // Queries a list of Organization items. rpc OrganizationAll(QueryAllOrganizationRequest) returns (QueryAllOrganizationResponse) { - option (google.api.http).get = "/sixnft/nftmngr/organization"; + option (google.api.http).get = "/thesixnetwork/sixnft/nftmngr/organization"; } // Queries a NftCollection by index. diff --git a/proto/nftoracle/query.proto b/proto/nftoracle/query.proto index 08500650..91775cb6 100644 --- a/proto/nftoracle/query.proto +++ b/proto/nftoracle/query.proto @@ -17,26 +17,26 @@ option go_package = "github.com/thesixnetwork/sixnft/x/nftoracle/types"; service Query { // Parameters queries the parameters of the module. rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { - option (google.api.http).get = "/sixnft/nftoracle/params"; + option (google.api.http).get = "/thesixnetwork/sixnft/nftoracle/params"; } // Queries a MintRequest by id. rpc MintRequest(QueryGetMintRequestRequest) returns (QueryGetMintRequestResponse) { - option (google.api.http).get = "/sixnft/nftoracle/mint_request/{id}"; + option (google.api.http).get = "/thesixnetwork/sixnft/nftoracle/mint_request/{id}"; } // Queries a list of MintRequest items. rpc MintRequestAll(QueryAllMintRequestRequest) returns (QueryAllMintRequestResponse) { - option (google.api.http).get = "/sixnft/nftoracle/mint_request"; + option (google.api.http).get = "/thesixnetwork/sixnft/nftoracle/mint_request"; } // Queries a ActionRequest by id. rpc ActionRequest(QueryGetActionRequestRequest) returns (QueryGetActionRequestResponse) { - option (google.api.http).get = "/sixnft/nftoracle/action_request/{id}"; + option (google.api.http).get = "/thesixnetwork/sixnft/nftoracle/action_request/{id}"; } // Queries a list of ActionRequest items. rpc ActionRequestAll(QueryAllActionRequestRequest) returns (QueryAllActionRequestResponse) { - option (google.api.http).get = "/sixnft/nftoracle/action_request"; + option (google.api.http).get = "/thesixnetwork/sixnft/nftoracle/action_request"; } // Queries a CollectionOwnerRequest by id. diff --git a/x/evmsupport/types/query.pb.go b/x/evmsupport/types/query.pb.go index 2e0ba69e..5f31101e 100644 --- a/x/evmsupport/types/query.pb.go +++ b/x/evmsupport/types/query.pb.go @@ -317,41 +317,41 @@ func init() { func init() { proto.RegisterFile("evmsupport/query.proto", fileDescriptor_08c1066b9e14fb0e) } var fileDescriptor_08c1066b9e14fb0e = []byte{ - // 538 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x4f, 0x6b, 0x13, 0x4f, - 0x18, 0xc7, 0x33, 0xf9, 0xf5, 0x17, 0x70, 0xc4, 0x82, 0x63, 0xf1, 0x4f, 0xd4, 0x6d, 0x1d, 0x8a, - 0x4a, 0x0f, 0x33, 0x34, 0xf5, 0x6c, 0x49, 0x40, 0x73, 0xf1, 0x50, 0x73, 0x14, 0x45, 0x66, 0x9b, - 0x71, 0xb2, 0xb8, 0xd9, 0xd9, 0xee, 0x4c, 0x62, 0x4b, 0x29, 0x82, 0xaf, 0x40, 0x10, 0x7c, 0x3d, - 0x3d, 0xe6, 0x58, 0xf0, 0x22, 0x1e, 0x44, 0x12, 0x5f, 0x88, 0xec, 0xcc, 0x84, 0xec, 0xb4, 0x89, - 0x1b, 0xc5, 0xdb, 0x32, 0xf3, 0x3c, 0xdf, 0xef, 0xf7, 0x93, 0x79, 0x9e, 0xc0, 0xeb, 0x7c, 0xd8, - 0x57, 0x83, 0x34, 0x95, 0x99, 0xa6, 0x07, 0x03, 0x9e, 0x1d, 0x91, 0x34, 0x93, 0x5a, 0xa2, 0x75, - 0xdd, 0xe3, 0x2a, 0x3a, 0x4c, 0xb8, 0x7e, 0x27, 0xb3, 0xb7, 0x24, 0xff, 0x7c, 0xa3, 0xc9, 0xac, - 0xb8, 0xbe, 0x26, 0xa4, 0x90, 0xa6, 0x96, 0xe6, 0x5f, 0xb6, 0xad, 0x7e, 0x47, 0x48, 0x29, 0x62, - 0x4e, 0x59, 0x1a, 0x51, 0x96, 0x24, 0x52, 0x33, 0x1d, 0xc9, 0x44, 0xb9, 0xdb, 0xad, 0x7d, 0xa9, - 0xfa, 0x52, 0xd1, 0x90, 0x29, 0x6e, 0xdd, 0xe8, 0x70, 0x3b, 0xe4, 0x9a, 0x6d, 0xd3, 0x94, 0x89, - 0x28, 0x31, 0xc5, 0xae, 0xf6, 0x46, 0x21, 0x58, 0xca, 0x32, 0xd6, 0x9f, 0x8a, 0x6c, 0x14, 0x2e, - 0x58, 0xb7, 0x9b, 0x71, 0xa5, 0x5e, 0x87, 0x51, 0xd2, 0x8d, 0x12, 0x61, 0x2b, 0xf0, 0x1a, 0x44, - 0xcf, 0x73, 0xf1, 0x3d, 0xd3, 0xd6, 0xe1, 0x07, 0x03, 0xae, 0x34, 0x7e, 0x09, 0xaf, 0x79, 0xa7, - 0x2a, 0x95, 0x89, 0xe2, 0xe8, 0x09, 0xac, 0x59, 0xf9, 0x9b, 0x60, 0x03, 0x3c, 0xbc, 0xdc, 0x78, - 0x40, 0x4a, 0xc8, 0x89, 0x15, 0x68, 0xad, 0x8c, 0xbe, 0xaf, 0x57, 0x3a, 0xae, 0x19, 0x73, 0x78, - 0xd7, 0xa8, 0xb7, 0xb9, 0x6e, 0xda, 0x50, 0x2d, 0x9b, 0xc9, 0xd9, 0xa3, 0x00, 0x42, 0xae, 0x7b, - 0xee, 0xce, 0x78, 0x5d, 0xea, 0x14, 0x4e, 0xd0, 0x26, 0xbc, 0x92, 0xf3, 0x0f, 0xf9, 0xb4, 0xa4, - 0x6a, 0x4a, 0xfc, 0x43, 0xfc, 0x1e, 0x06, 0x8b, 0x6c, 0x1c, 0xcf, 0x2b, 0xb8, 0xca, 0xbc, 0x1b, - 0xc7, 0x45, 0x4b, 0xb9, 0x7c, 0x41, 0xc7, 0x77, 0x4e, 0x0c, 0x0b, 0xc7, 0xd9, 0x8c, 0xe3, 0xf9, - 0x9c, 0x4f, 0x21, 0x9c, 0xbd, 0xa5, 0xf3, 0xbe, 0x4f, 0xec, 0xc3, 0x93, 0xfc, 0xe1, 0x89, 0x1d, - 0x33, 0xf7, 0xf0, 0x64, 0x8f, 0x09, 0xee, 0x7a, 0x3b, 0x85, 0x4e, 0x3c, 0x02, 0x0e, 0x75, 0x8e, - 0xd3, 0x6f, 0x50, 0xff, 0xfb, 0x67, 0xa8, 0xa8, 0xed, 0x91, 0x54, 0xdd, 0x74, 0x94, 0x91, 0xd8, - 0x6c, 0x45, 0x94, 0xc6, 0xe9, 0x0a, 0xfc, 0xdf, 0xa0, 0xa0, 0xcf, 0x00, 0xd6, 0xec, 0xf8, 0xa0, - 0x9d, 0xd2, 0x90, 0x17, 0x67, 0xb8, 0xfe, 0xe8, 0xcf, 0x9a, 0x6c, 0x16, 0x7c, 0xef, 0xc3, 0x97, - 0x9f, 0x9f, 0xaa, 0xb7, 0xd1, 0x2d, 0x6a, 0xeb, 0xe9, 0x85, 0xd5, 0x42, 0xdf, 0x00, 0x5c, 0xf5, - 0x7f, 0x14, 0xf4, 0x78, 0x39, 0xaf, 0x45, 0x03, 0x5f, 0xdf, 0xfd, 0xeb, 0x7e, 0x17, 0xbb, 0x6d, - 0x62, 0x37, 0xd1, 0xee, 0x9c, 0xd8, 0xe7, 0x16, 0x9f, 0x1e, 0xcf, 0x36, 0xe9, 0x84, 0x1e, 0x7b, - 0x3b, 0x73, 0x82, 0x4e, 0x01, 0xbc, 0xea, 0x7b, 0x34, 0xe3, 0x78, 0x59, 0xbe, 0x45, 0x83, 0xbe, - 0x2c, 0xdf, 0xc2, 0xf1, 0xc5, 0x5b, 0x86, 0x6f, 0x13, 0xe1, 0x72, 0xbe, 0xd6, 0xb3, 0xd1, 0x38, - 0x00, 0x67, 0xe3, 0x00, 0xfc, 0x18, 0x07, 0xe0, 0xe3, 0x24, 0xa8, 0x9c, 0x4d, 0x82, 0xca, 0xd7, - 0x49, 0x50, 0x79, 0xd1, 0x10, 0x91, 0xee, 0x0d, 0x42, 0xb2, 0x2f, 0xfb, 0xd4, 0x0b, 0x34, 0x55, - 0x3d, 0x2c, 0xea, 0xea, 0xa3, 0x94, 0xab, 0xb0, 0x66, 0xfe, 0x27, 0x77, 0x7e, 0x05, 0x00, 0x00, - 0xff, 0xff, 0x15, 0x7f, 0x8a, 0xdf, 0xfd, 0x05, 0x00, 0x00, + // 540 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0xc1, 0x6a, 0x13, 0x41, + 0x18, 0xc7, 0xb3, 0xb1, 0x06, 0x1c, 0xb1, 0xe0, 0x58, 0x54, 0x82, 0x6e, 0xcb, 0x22, 0x56, 0x3d, + 0xcc, 0xd8, 0xd4, 0x83, 0x27, 0x25, 0x01, 0xed, 0x45, 0xb1, 0x06, 0xbc, 0x88, 0x22, 0xb3, 0xcd, + 0xe7, 0x64, 0x71, 0xb3, 0xb3, 0xdd, 0x99, 0xc4, 0x96, 0x52, 0x04, 0x9f, 0x40, 0xf0, 0x15, 0x7c, + 0x98, 0x9c, 0xa4, 0xe0, 0xc5, 0x93, 0x48, 0xe2, 0x41, 0x7c, 0x0a, 0xd9, 0x99, 0x29, 0xd9, 0x69, + 0x13, 0x37, 0x95, 0xde, 0x96, 0x99, 0xef, 0xff, 0xff, 0x7f, 0xbf, 0x9d, 0x6f, 0x06, 0x5d, 0x86, + 0x41, 0x4f, 0xf6, 0xd3, 0x54, 0x64, 0x8a, 0x6e, 0xf7, 0x21, 0xdb, 0x25, 0x69, 0x26, 0x94, 0xc0, + 0xcb, 0xaa, 0x0b, 0x32, 0xda, 0x49, 0x40, 0xbd, 0x17, 0xd9, 0x3b, 0x92, 0x7f, 0xbe, 0x55, 0x64, + 0x52, 0x5c, 0x5f, 0xe2, 0x82, 0x0b, 0x5d, 0x4b, 0xf3, 0x2f, 0x23, 0xab, 0x5f, 0xe3, 0x42, 0xf0, + 0x18, 0x28, 0x4b, 0x23, 0xca, 0x92, 0x44, 0x28, 0xa6, 0x22, 0x91, 0x48, 0xbb, 0x7b, 0x67, 0x4b, + 0xc8, 0x9e, 0x90, 0x34, 0x64, 0x12, 0x4c, 0x1a, 0x1d, 0xac, 0x85, 0xa0, 0xd8, 0x1a, 0x4d, 0x19, + 0x8f, 0x12, 0x5d, 0x6c, 0x6b, 0xaf, 0x14, 0x1a, 0x4b, 0x59, 0xc6, 0x7a, 0x87, 0x26, 0x2b, 0x85, + 0x0d, 0xd6, 0xe9, 0x64, 0x20, 0xe5, 0x9b, 0x30, 0x4a, 0x3a, 0x51, 0xc2, 0x4d, 0x45, 0xb0, 0x84, + 0xf0, 0xf3, 0xdc, 0x7c, 0x53, 0xcb, 0xda, 0xb0, 0xdd, 0x07, 0xa9, 0x82, 0x57, 0xe8, 0x92, 0xb3, + 0x2a, 0x53, 0x91, 0x48, 0xc0, 0x8f, 0x50, 0xcd, 0xd8, 0x5f, 0xf5, 0x56, 0xbc, 0x5b, 0xe7, 0x1b, + 0xab, 0xa4, 0x84, 0x9c, 0x18, 0x83, 0xd6, 0xc2, 0xf0, 0xc7, 0x72, 0xa5, 0x6d, 0xc5, 0x01, 0xa0, + 0xeb, 0xda, 0x7d, 0x03, 0x54, 0xd3, 0x34, 0xd5, 0x32, 0x3d, 0xd9, 0x78, 0xec, 0x23, 0x04, 0xaa, + 0x6b, 0xf7, 0x74, 0xd6, 0xb9, 0x76, 0x61, 0x05, 0xdf, 0x40, 0x17, 0x72, 0xfe, 0x01, 0x1c, 0x96, + 0x54, 0x75, 0x89, 0xbb, 0x18, 0x7c, 0x40, 0xfe, 0xac, 0x18, 0xcb, 0xf3, 0x1a, 0x2d, 0x32, 0x67, + 0xc7, 0x72, 0xd1, 0x52, 0x2e, 0xd7, 0xd0, 0xf2, 0x1d, 0x31, 0x0b, 0xb8, 0xe5, 0x6c, 0xc6, 0xf1, + 0x74, 0xce, 0xc7, 0x08, 0x4d, 0xce, 0xd2, 0x66, 0xdf, 0x24, 0xe6, 0xe0, 0x49, 0x7e, 0xf0, 0xc4, + 0x8c, 0x99, 0x3d, 0x78, 0xb2, 0xc9, 0x38, 0x58, 0x6d, 0xbb, 0xa0, 0x0c, 0x86, 0x9e, 0x45, 0x9d, + 0x92, 0xf4, 0x0f, 0xd4, 0x33, 0xa7, 0x86, 0x8a, 0x37, 0x1c, 0x92, 0xaa, 0x9d, 0x8e, 0x32, 0x12, + 0xd3, 0x5b, 0x11, 0xa5, 0xf1, 0x67, 0x01, 0x9d, 0xd5, 0x28, 0xf8, 0x8b, 0x87, 0x6a, 0x66, 0x7c, + 0xf0, 0x7a, 0x69, 0x93, 0xc7, 0x67, 0xb8, 0x7e, 0xef, 0x64, 0x22, 0xd3, 0x4b, 0x40, 0x3f, 0x7e, + 0xfb, 0xf5, 0xb9, 0x7a, 0x1b, 0xaf, 0x52, 0x47, 0x4d, 0x8d, 0x9a, 0x1e, 0xbb, 0x68, 0xf8, 0xb7, + 0x87, 0x16, 0xdd, 0x5f, 0x84, 0x1f, 0xcc, 0x97, 0x3c, 0x6b, 0xfc, 0xeb, 0x0f, 0xff, 0x5b, 0x6f, + 0x21, 0x5e, 0x68, 0x88, 0x67, 0xf8, 0x69, 0x29, 0xc4, 0x91, 0x47, 0x81, 0xee, 0x4d, 0x6e, 0xd9, + 0x3e, 0xdd, 0x73, 0xee, 0xd3, 0x3e, 0xfe, 0xea, 0xa1, 0x8b, 0x6e, 0x62, 0x33, 0x8e, 0xe7, 0xa5, + 0x9d, 0x75, 0x09, 0xe6, 0xa5, 0x9d, 0x39, 0xda, 0xc1, 0x7d, 0x4d, 0xdb, 0xc0, 0x77, 0x4f, 0x4a, + 0xdb, 0x7a, 0x32, 0x1c, 0xf9, 0xde, 0xc1, 0xc8, 0xf7, 0x7e, 0x8e, 0x7c, 0xef, 0xd3, 0xd8, 0xaf, + 0x1c, 0x8c, 0xfd, 0xca, 0xf7, 0xb1, 0x5f, 0x79, 0xd9, 0xe0, 0x91, 0xea, 0xf6, 0x43, 0xb2, 0x25, + 0x7a, 0xd3, 0x5d, 0x77, 0x8a, 0xbe, 0x6a, 0x37, 0x05, 0x19, 0xd6, 0xf4, 0x8b, 0xba, 0xfe, 0x37, + 0x00, 0x00, 0xff, 0xff, 0x97, 0x0d, 0xe4, 0xfa, 0x27, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/evmsupport/types/query.pb.gw.go b/x/evmsupport/types/query.pb.gw.go index 78417cd5..a30aa616 100644 --- a/x/evmsupport/types/query.pb.gw.go +++ b/x/evmsupport/types/query.pb.gw.go @@ -343,11 +343,11 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"sixnft", "evmsupport", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"thesixnetwork", "sixnft", "evmsupport", "params"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_AddressBinding_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"sixnft", "evmsupport", "address_binding", "ethAddress", "nativeAddress"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_AddressBinding_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"thesixnetwork", "sixnft", "evmsupport", "address_binding", "ethAddress", "nativeAddress"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_AddressBindingAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"sixnft", "evmsupport", "address_binding"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_AddressBindingAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"thesixnetwork", "sixnft", "evmsupport", "address_binding"}, "", runtime.AssumeColonVerbOpt(true))) ) var ( diff --git a/x/nftadmin/types/query.pb.go b/x/nftadmin/types/query.pb.go index 2c92ef52..4a3d9c9b 100644 --- a/x/nftadmin/types/query.pb.go +++ b/x/nftadmin/types/query.pb.go @@ -203,32 +203,32 @@ func init() { func init() { proto.RegisterFile("nftadmin/query.proto", fileDescriptor_e204fd8fb94d1b57) } var fileDescriptor_e204fd8fb94d1b57 = []byte{ - // 392 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xc1, 0x4e, 0xea, 0x40, - 0x14, 0x86, 0x5b, 0x72, 0x2f, 0x8b, 0xb9, 0xb9, 0x9b, 0x11, 0xa3, 0x36, 0x30, 0x90, 0x26, 0x1a, - 0x63, 0x4c, 0x47, 0x70, 0xa9, 0x1b, 0x71, 0x61, 0xe2, 0x4a, 0x59, 0x19, 0x76, 0x53, 0x1c, 0x4a, - 0xa3, 0x9d, 0x29, 0x9d, 0xa9, 0x82, 0x4b, 0x9f, 0x80, 0xc4, 0x37, 0xf1, 0x29, 0xd8, 0x49, 0xe2, - 0xc6, 0x95, 0x31, 0xe0, 0x83, 0x18, 0xda, 0x29, 0x52, 0x08, 0xa2, 0xee, 0x26, 0x73, 0xfe, 0xff, - 0x3f, 0xdf, 0x99, 0x39, 0x20, 0xc7, 0x9a, 0x92, 0x5c, 0x7a, 0x2e, 0xc3, 0xed, 0x90, 0x06, 0x5d, - 0xcb, 0x0f, 0xb8, 0xe4, 0xb0, 0x20, 0x5b, 0x54, 0xb8, 0x1d, 0x46, 0xe5, 0x2d, 0x0f, 0xae, 0xac, - 0xf1, 0xb1, 0x29, 0xad, 0x44, 0x6a, 0xe4, 0x1c, 0xee, 0xf0, 0x48, 0x89, 0xc7, 0xa7, 0xd8, 0x64, - 0xe4, 0x1d, 0xce, 0x9d, 0x6b, 0x8a, 0x89, 0xef, 0x62, 0xc2, 0x18, 0x97, 0x44, 0xba, 0x9c, 0x09, - 0x55, 0xdd, 0x69, 0x70, 0xe1, 0x71, 0x81, 0x6d, 0x22, 0x68, 0xdc, 0x0b, 0xdf, 0x94, 0x6d, 0x2a, - 0x49, 0x19, 0xfb, 0xc4, 0x71, 0x59, 0x24, 0x56, 0xda, 0xd5, 0x09, 0x94, 0x4f, 0x02, 0xe2, 0x25, - 0x11, 0xf9, 0xc9, 0x35, 0x09, 0x65, 0x8b, 0x07, 0xee, 0xdd, 0x94, 0xc9, 0xcc, 0x01, 0x78, 0x3e, - 0x8e, 0x3d, 0x8b, 0x2c, 0x35, 0xda, 0x0e, 0xa9, 0x90, 0x66, 0x1d, 0xac, 0xa4, 0x6e, 0x85, 0xcf, - 0x99, 0xa0, 0xf0, 0x18, 0x64, 0xe3, 0xe8, 0x75, 0xbd, 0xa4, 0x6f, 0xff, 0xab, 0x6c, 0x5a, 0x5f, - 0x4e, 0x6c, 0xc5, 0xf6, 0xea, 0x9f, 0xfe, 0x6b, 0x51, 0xab, 0x29, 0xab, 0x89, 0x40, 0x3e, 0xca, - 0x3e, 0xa1, 0xf2, 0x68, 0x1a, 0x28, 0xe9, 0xdd, 0x05, 0x85, 0x05, 0x75, 0x45, 0x71, 0x01, 0xfe, - 0xa7, 0x0a, 0x0a, 0x66, 0x77, 0x09, 0x4c, 0xca, 0xa3, 0x98, 0xd2, 0x41, 0x95, 0xa7, 0x0c, 0xf8, - 0x1b, 0xf5, 0x86, 0x3d, 0x1d, 0x64, 0x63, 0x7a, 0x58, 0x5e, 0x92, 0x3b, 0xff, 0x7c, 0x46, 0xe5, - 0x27, 0x96, 0x78, 0x2a, 0xb3, 0x78, 0xff, 0xfc, 0xfe, 0x90, 0xd9, 0x80, 0x6b, 0x38, 0x56, 0xe3, - 0x99, 0xdf, 0x84, 0x8f, 0xfa, 0xcc, 0xdc, 0xf0, 0xe0, 0x3b, 0x6d, 0x16, 0x3c, 0xb3, 0x71, 0xf8, - 0x3b, 0xb3, 0xa2, 0xdd, 0x8a, 0x68, 0x4b, 0x10, 0xcd, 0xd1, 0xa6, 0x96, 0xac, 0x7a, 0xda, 0x1f, - 0x22, 0x7d, 0x30, 0x44, 0xfa, 0xdb, 0x10, 0xe9, 0xbd, 0x11, 0xd2, 0x06, 0x23, 0xa4, 0xbd, 0x8c, - 0x90, 0x56, 0xdf, 0x73, 0x5c, 0xd9, 0x0a, 0x6d, 0xab, 0xc1, 0x3d, 0x9c, 0x22, 0x49, 0x12, 0x3b, - 0x9f, 0x99, 0xb2, 0xeb, 0x53, 0x61, 0x67, 0xa3, 0x8d, 0xdd, 0xff, 0x08, 0x00, 0x00, 0xff, 0xff, - 0x12, 0x99, 0x51, 0xe8, 0x7d, 0x03, 0x00, 0x00, + // 391 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0x31, 0x4f, 0xc2, 0x40, + 0x14, 0xc7, 0x5b, 0xa2, 0x0c, 0x67, 0x5c, 0x4e, 0x4c, 0x4c, 0x03, 0xd5, 0x34, 0x21, 0x1a, 0x83, + 0x3d, 0x41, 0x37, 0x5d, 0xc4, 0xc1, 0xc4, 0x49, 0x99, 0x0c, 0xdb, 0x15, 0x8f, 0xd2, 0x68, 0xef, + 0x95, 0xde, 0x55, 0xc1, 0xd1, 0x4f, 0x60, 0xe2, 0xee, 0x67, 0x71, 0x64, 0x24, 0x71, 0x71, 0x32, + 0x06, 0xdc, 0xfc, 0x12, 0x86, 0xb6, 0x20, 0x45, 0x11, 0x75, 0x6b, 0xee, 0xbd, 0xdf, 0xff, 0xfd, + 0xee, 0xf5, 0x50, 0x86, 0xd7, 0x25, 0x3d, 0x77, 0x1d, 0x4e, 0x9a, 0x01, 0xf3, 0xdb, 0xa6, 0xe7, + 0x83, 0x04, 0x9c, 0x93, 0x0d, 0x26, 0x9c, 0x16, 0x67, 0xf2, 0x1a, 0xfc, 0x0b, 0x73, 0xf0, 0x59, + 0x97, 0xe6, 0xb0, 0x55, 0xcb, 0xd8, 0x60, 0x43, 0xd8, 0x49, 0x06, 0x5f, 0x11, 0xa4, 0x65, 0x6d, + 0x00, 0xfb, 0x92, 0x11, 0xea, 0x39, 0x84, 0x72, 0x0e, 0x92, 0x4a, 0x07, 0xb8, 0x88, 0xab, 0x9b, + 0x35, 0x10, 0x2e, 0x08, 0x62, 0x51, 0xc1, 0xa2, 0x59, 0xe4, 0xaa, 0x68, 0x31, 0x49, 0x8b, 0xc4, + 0xa3, 0xb6, 0xc3, 0xc3, 0xe6, 0xb8, 0x77, 0x79, 0x24, 0xe5, 0x51, 0x9f, 0xba, 0xc3, 0x88, 0xec, + 0xe8, 0x98, 0x06, 0xb2, 0x01, 0xbe, 0x73, 0x33, 0x06, 0x19, 0x19, 0x84, 0x4f, 0x07, 0xb1, 0x27, + 0x21, 0x52, 0x61, 0xcd, 0x80, 0x09, 0x69, 0x54, 0xd1, 0x52, 0xe2, 0x54, 0x78, 0xc0, 0x05, 0xc3, + 0x87, 0x28, 0x1d, 0x45, 0xaf, 0xa8, 0x6b, 0xea, 0xc6, 0x42, 0x29, 0x6f, 0xfe, 0x78, 0x63, 0x33, + 0xc2, 0xcb, 0x73, 0x9d, 0x97, 0x55, 0xa5, 0x12, 0xa3, 0x86, 0x8e, 0xb2, 0x61, 0xf6, 0x11, 0x93, + 0x07, 0xe3, 0x42, 0xc3, 0xd9, 0x6d, 0x94, 0x9b, 0x52, 0x8f, 0x2d, 0xce, 0xd0, 0x62, 0xa2, 0x10, + 0xcb, 0x14, 0x66, 0xc8, 0x24, 0x98, 0xd8, 0x29, 0x19, 0x54, 0x7a, 0x4f, 0xa1, 0xf9, 0x70, 0x36, + 0x7e, 0x50, 0x51, 0x3a, 0xb2, 0xc7, 0xc5, 0x19, 0xb9, 0x5f, 0xd7, 0xa7, 0x95, 0xfe, 0x82, 0x44, + 0xb7, 0x32, 0xb6, 0x6e, 0x9f, 0xde, 0xee, 0x53, 0xeb, 0x38, 0x4f, 0x12, 0x2c, 0x89, 0x58, 0x32, + 0xf1, 0x6f, 0xf1, 0xa3, 0x3a, 0xb1, 0x05, 0xbc, 0xf7, 0x9b, 0xa1, 0x53, 0x96, 0xae, 0xed, 0xff, + 0x0f, 0x8e, 0xdd, 0x77, 0x43, 0x77, 0x13, 0x17, 0x66, 0xb8, 0x27, 0x1e, 0x60, 0xf9, 0xb8, 0xd3, + 0xd3, 0xd5, 0x6e, 0x4f, 0x57, 0x5f, 0x7b, 0xba, 0x7a, 0xd7, 0xd7, 0x95, 0x6e, 0x5f, 0x57, 0x9e, + 0xfb, 0xba, 0x52, 0xdd, 0xb6, 0x1d, 0xd9, 0x08, 0x2c, 0xb3, 0x06, 0xee, 0xf7, 0x89, 0xad, 0xcf, + 0x4c, 0xd9, 0xf6, 0x98, 0xb0, 0xd2, 0xe1, 0x6b, 0xde, 0xf9, 0x08, 0x00, 0x00, 0xff, 0xff, 0x46, + 0x48, 0x07, 0x17, 0x99, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/nftadmin/types/query.pb.gw.go b/x/nftadmin/types/query.pb.gw.go index e2b5ca53..21c72324 100644 --- a/x/nftadmin/types/query.pb.gw.go +++ b/x/nftadmin/types/query.pb.gw.go @@ -206,9 +206,9 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"sixnft", "nftadmin", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"thesixnetwork", "sixnft", "nftadmin", "params"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_Authorization_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"sixnft", "nftadmin", "authorization"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Authorization_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"thesixnetwork", "sixnft", "nftadmin", "authorization"}, "", runtime.AssumeColonVerbOpt(true))) ) var ( diff --git a/x/nftmngr/types/query.pb.go b/x/nftmngr/types/query.pb.go index 85e06a5d..e5a8874e 100644 --- a/x/nftmngr/types/query.pb.go +++ b/x/nftmngr/types/query.pb.go @@ -1527,101 +1527,101 @@ func init() { func init() { proto.RegisterFile("nftmngr/query.proto", fileDescriptor_1406c74dd8ff3e6a) } var fileDescriptor_1406c74dd8ff3e6a = []byte{ - // 1499 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x59, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xce, 0x34, 0xfd, 0xa1, 0x0c, 0x8d, 0x8a, 0x26, 0x21, 0x0d, 0x4b, 0xea, 0x96, 0x69, 0x0a, - 0xa5, 0xa5, 0xbb, 0x4d, 0x71, 0x8b, 0x1a, 0x42, 0x55, 0x27, 0xc5, 0x55, 0x05, 0x84, 0xd6, 0x44, - 0x02, 0x2a, 0xa1, 0x74, 0x6d, 0x8f, 0x1d, 0xab, 0xeb, 0xdd, 0x74, 0x77, 0x0a, 0x0d, 0x91, 0x25, - 0xc4, 0x19, 0xa4, 0x4a, 0x1c, 0x39, 0x72, 0x40, 0x5c, 0x90, 0x40, 0xe2, 0x42, 0x85, 0x10, 0xb7, - 0xf6, 0x82, 0x2a, 0x21, 0x21, 0x10, 0x08, 0xa1, 0x96, 0x3f, 0x80, 0x3f, 0x01, 0xed, 0xec, 0x5b, - 0xef, 0xce, 0xee, 0xd8, 0x5e, 0x3b, 0x7b, 0xb3, 0xe7, 0xed, 0x7b, 0xef, 0xfb, 0xbe, 0x79, 0xfb, - 0x66, 0x9e, 0x8d, 0xa7, 0xec, 0x06, 0x6f, 0xdb, 0x4d, 0xd7, 0xb8, 0x75, 0x9b, 0xb9, 0x5b, 0xfa, - 0xa6, 0xeb, 0x70, 0x87, 0xcc, 0xf1, 0x0d, 0xe6, 0xb5, 0xee, 0xd8, 0x8c, 0x7f, 0xe8, 0xb8, 0x37, - 0x75, 0xff, 0x63, 0x83, 0xeb, 0xf0, 0xa4, 0x36, 0xdd, 0x74, 0x9a, 0x8e, 0x78, 0xd0, 0xf0, 0x3f, - 0x05, 0x3e, 0xda, 0x5c, 0xd3, 0x71, 0x9a, 0x16, 0x33, 0xcc, 0xcd, 0x96, 0x61, 0xda, 0xb6, 0xc3, - 0x4d, 0xde, 0x72, 0x6c, 0x0f, 0xac, 0x27, 0x6a, 0x8e, 0xd7, 0x76, 0x3c, 0xa3, 0x6a, 0x7a, 0x2c, - 0x48, 0x65, 0x7c, 0xb0, 0x50, 0x65, 0xdc, 0x5c, 0x30, 0x36, 0xcd, 0x66, 0xcb, 0x16, 0x0f, 0xc3, - 0xb3, 0xd3, 0x21, 0xa4, 0x4d, 0xd3, 0x35, 0xdb, 0x61, 0x84, 0xd9, 0x70, 0xd5, 0x6e, 0xf0, 0x75, - 0xaf, 0xb6, 0xc1, 0xda, 0x26, 0x58, 0x0a, 0xa1, 0xc5, 0xac, 0xf9, 0x51, 0xd6, 0xab, 0x5b, 0xeb, - 0x2e, 0x6b, 0xac, 0xb7, 0xea, 0x60, 0xd7, 0x42, 0xbb, 0xe3, 0x36, 0x4d, 0xbb, 0xf5, 0x51, 0x3c, - 0xd7, 0x5c, 0x3c, 0x6a, 0xcd, 0xb1, 0x2c, 0x56, 0x8b, 0x59, 0xe7, 0xd3, 0x39, 0xfd, 0xe8, 0x35, - 0xc7, 0xe6, 0xae, 0x59, 0xe3, 0xaa, 0x18, 0x0d, 0xc6, 0x7c, 0x7b, 0xa3, 0xd5, 0x04, 0xeb, 0xa1, - 0xa4, 0xb5, 0x6a, 0x5a, 0xa6, 0x5d, 0x63, 0x49, 0xf0, 0x6d, 0xc6, 0xcd, 0xba, 0xc9, 0xcd, 0xf5, - 0x9a, 0xcb, 0x4c, 0xee, 0xb8, 0x60, 0x9f, 0x89, 0xbb, 0xfb, 0xf6, 0x60, 0x9d, 0x4e, 0x63, 0x72, - 0xcd, 0x97, 0xf1, 0xaa, 0xd0, 0xa8, 0xc2, 0x6e, 0xdd, 0x66, 0x1e, 0xa7, 0xef, 0xe1, 0x29, 0x69, - 0xd5, 0xdb, 0x74, 0x6c, 0x8f, 0x91, 0x65, 0xbc, 0x37, 0xd0, 0x72, 0x16, 0x1d, 0x41, 0xc7, 0x9f, - 0x38, 0x33, 0xaf, 0xf7, 0xdb, 0x60, 0x3d, 0xf0, 0x5e, 0xde, 0x7d, 0xff, 0xef, 0xc3, 0x63, 0x15, - 0xf0, 0xa4, 0x3a, 0x9e, 0x15, 0xa1, 0x2f, 0x33, 0xbe, 0x5a, 0x5e, 0x7b, 0x5b, 0x88, 0x01, 0x69, - 0x09, 0xc1, 0xbb, 0x6b, 0x4e, 0x9d, 0x89, 0xe8, 0x13, 0x15, 0xf1, 0x99, 0x6e, 0xe0, 0xa7, 0x15, - 0xcf, 0x03, 0xa0, 0xd7, 0xf1, 0x84, 0x1d, 0x2e, 0x02, 0xa6, 0xe7, 0xfb, 0x63, 0xea, 0xc6, 0x00, - 0x58, 0x91, 0x3f, 0xad, 0x02, 0xb2, 0x92, 0x65, 0xa5, 0x90, 0x95, 0x31, 0x8e, 0xea, 0x0b, 0x32, - 0x3d, 0xa7, 0x07, 0xc5, 0xa8, 0xfb, 0xc5, 0xa8, 0x07, 0x75, 0x0f, 0xc5, 0xa8, 0x5f, 0x35, 0x9b, - 0x0c, 0x7c, 0x2b, 0x31, 0x4f, 0xfa, 0x2d, 0x02, 0x3a, 0x72, 0x12, 0x35, 0x9d, 0xf1, 0x9d, 0xd0, - 0x21, 0x97, 0x25, 0xc8, 0xbb, 0x40, 0x9c, 0x41, 0x90, 0x03, 0x24, 0x12, 0xe6, 0x77, 0xf1, 0x4c, - 0x77, 0x07, 0x1a, 0xfc, 0x92, 0xc9, 0xbb, 0xaa, 0xcc, 0xe3, 0x49, 0xbb, 0xc1, 0x83, 0x7c, 0x2b, - 0xd1, 0xc6, 0xc9, 0x8b, 0x64, 0x16, 0xef, 0xe3, 0xce, 0x4d, 0x66, 0x5f, 0xa9, 0x0b, 0x14, 0x13, - 0x95, 0xf0, 0x2b, 0xbd, 0x81, 0x0f, 0xa6, 0x22, 0x83, 0x14, 0xaf, 0xe1, 0x7d, 0x76, 0xb0, 0x04, - 0x6a, 0x1f, 0x1b, 0x20, 0x44, 0xf0, 0x30, 0xc8, 0x10, 0xfa, 0xd2, 0x1b, 0x80, 0xdd, 0x97, 0x5b, - 0xc6, 0x9e, 0xd7, 0x8e, 0x7e, 0x8d, 0x80, 0x44, 0x3c, 0x85, 0x8a, 0xc4, 0xf8, 0xa8, 0x24, 0xf2, - 0xdb, 0xc9, 0x22, 0x9e, 0x0b, 0xf5, 0x2e, 0x89, 0xfe, 0xb4, 0xbc, 0x55, 0x61, 0x8d, 0x2b, 0xf5, - 0x50, 0x93, 0x69, 0xbc, 0xc7, 0xf5, 0xbf, 0xc3, 0x3e, 0x06, 0x5f, 0xe8, 0x1d, 0x7c, 0xa8, 0x87, - 0x17, 0xd0, 0x7c, 0x07, 0x4f, 0x9a, 0x71, 0x03, 0xa8, 0x79, 0xb2, 0x3f, 0x59, 0x29, 0x16, 0x50, - 0x96, 0xe3, 0xd0, 0x06, 0xe0, 0x2d, 0x59, 0x96, 0x12, 0x6f, 0x5e, 0x7b, 0xf8, 0x33, 0x02, 0x8a, - 0xe9, 0x44, 0xbd, 0x29, 0x8e, 0xe7, 0x41, 0x31, 0xbf, 0xbd, 0x5d, 0xc0, 0xcf, 0x84, 0xbb, 0xf4, - 0x56, 0xec, 0x7c, 0x8a, 0xb5, 0x56, 0xdb, 0x6c, 0x77, 0x5b, 0xab, 0xff, 0x99, 0xf2, 0xa8, 0x1c, - 0x64, 0x17, 0x20, 0xbd, 0x86, 0xf7, 0xc7, 0x8f, 0x3a, 0x10, 0xf8, 0x44, 0x7f, 0xce, 0xf1, 0x48, - 0x40, 0x59, 0x8a, 0x42, 0x19, 0x00, 0x2d, 0x59, 0x96, 0x0a, 0x68, 0x5e, 0x7b, 0xfa, 0x23, 0x8a, - 0x8a, 0x27, 0x23, 0xbb, 0xf1, 0x9d, 0xb3, 0xcb, 0x6f, 0x3f, 0x3f, 0x45, 0xd1, 0xee, 0xac, 0x36, - 0xf8, 0x4a, 0xf7, 0x4e, 0x31, 0x5c, 0xf3, 0x2d, 0x2b, 0xf0, 0x8c, 0x22, 0xe7, 0x3d, 0x14, 0x75, - 0x81, 0x04, 0x1c, 0xd0, 0xf3, 0x9a, 0xc0, 0x13, 0x19, 0x86, 0x6f, 0x79, 0xa8, 0x22, 0x47, 0xc8, - 0x4f, 0xcc, 0xeb, 0x98, 0xa6, 0x2e, 0x11, 0xcb, 0x5b, 0x2b, 0x70, 0xff, 0x0a, 0x15, 0x2d, 0xe2, - 0xa7, 0x1c, 0xb7, 0xd5, 0x6c, 0xd9, 0xa1, 0xa1, 0x54, 0xaf, 0xbb, 0xcc, 0xf3, 0x40, 0x59, 0xb5, - 0x91, 0xde, 0x45, 0xf8, 0x68, 0xdf, 0xe0, 0xa0, 0x4f, 0x0b, 0x4f, 0xd9, 0x69, 0x33, 0x54, 0xf8, - 0x42, 0xd6, 0x63, 0xbe, 0xeb, 0x08, 0xd5, 0xa7, 0x8a, 0x49, 0x2d, 0xa0, 0x1b, 0xbf, 0x64, 0xa4, - 0xe9, 0xe6, 0xf5, 0xa6, 0xfd, 0x11, 0x0a, 0xd0, 0x2b, 0xdd, 0x20, 0x01, 0xc6, 0xf3, 0x16, 0x20, - 0xbf, 0xc2, 0x39, 0x14, 0x75, 0xd5, 0xd5, 0xf2, 0x5a, 0x99, 0xb1, 0x15, 0x71, 0x27, 0x0f, 0xef, - 0xc9, 0xb1, 0x0e, 0x2a, 0x9b, 0xa3, 0x1e, 0x13, 0x5f, 0xcf, 0xd6, 0x41, 0xe3, 0x1e, 0x61, 0x8f, - 0x89, 0xaf, 0xd1, 0x42, 0x32, 0xeb, 0x72, 0x30, 0x0a, 0x84, 0xa8, 0x62, 0x07, 0x76, 0xc2, 0x1e, - 0x9d, 0x66, 0x92, 0x21, 0xdb, 0x81, 0x2d, 0xb9, 0x84, 0xa7, 0x99, 0xb4, 0x48, 0xcb, 0xb8, 0x10, - 0x66, 0x7e, 0x13, 0xe6, 0x90, 0x95, 0x60, 0x0c, 0x19, 0xaa, 0x6b, 0xd1, 0x8f, 0x11, 0x3e, 0xdc, - 0x33, 0x10, 0x90, 0x78, 0x1f, 0x1f, 0x68, 0xcb, 0x26, 0xa0, 0x71, 0xaa, 0x3f, 0x8d, 0x44, 0x3c, - 0x20, 0x92, 0x8c, 0x45, 0x37, 0x80, 0x4a, 0xc9, 0xb2, 0x7a, 0x50, 0xc9, 0xeb, 0xfd, 0x79, 0x10, - 0x92, 0x55, 0xa5, 0xea, 0x47, 0x76, 0x3c, 0x2f, 0xb2, 0xb9, 0xbd, 0x2f, 0x67, 0xfe, 0x3a, 0x88, - 0xf7, 0x08, 0x2e, 0xe4, 0x33, 0x84, 0xf7, 0x06, 0x03, 0x20, 0x39, 0xdd, 0x1f, 0x63, 0x7a, 0xfe, - 0xd4, 0x16, 0x86, 0xf0, 0x08, 0x50, 0xd0, 0xc2, 0x27, 0xbf, 0xfe, 0xfb, 0xf9, 0xae, 0x59, 0x32, - 0x63, 0x04, 0x0f, 0x1b, 0xf2, 0xf4, 0x4f, 0xbe, 0x42, 0x78, 0xa2, 0xdb, 0x45, 0xc8, 0xb9, 0x0c, - 0x09, 0x14, 0x13, 0xaa, 0xf6, 0xf2, 0xd0, 0x7e, 0x00, 0xef, 0x05, 0x01, 0xef, 0x28, 0x79, 0x36, - 0x09, 0x2f, 0xfa, 0x49, 0xc0, 0xd8, 0xf6, 0x07, 0xde, 0x0e, 0xf9, 0x12, 0x89, 0xae, 0x11, 0x04, - 0x28, 0x59, 0x56, 0x26, 0xb0, 0x8a, 0xa1, 0x35, 0x13, 0x58, 0xd5, 0x1c, 0x4a, 0xa9, 0x00, 0x3b, - 0x47, 0xb4, 0xde, 0x60, 0xc9, 0x77, 0x08, 0xef, 0x83, 0xc3, 0x9b, 0x14, 0x33, 0xaa, 0x22, 0x4d, - 0x60, 0xda, 0xd9, 0x21, 0xbd, 0x00, 0xdc, 0xa2, 0x00, 0x57, 0x24, 0x67, 0x54, 0xe0, 0xfc, 0xa2, - 0x36, 0xb6, 0xa5, 0x66, 0xd2, 0x31, 0xb6, 0x61, 0xde, 0xec, 0x90, 0x2f, 0x10, 0xc6, 0x10, 0xcf, - 0x17, 0xb6, 0x98, 0x51, 0xa0, 0xe1, 0x71, 0xa7, 0x87, 0x41, 0x7a, 0x44, 0xe0, 0xd6, 0xc8, 0x6c, - 0x2f, 0xdc, 0xe4, 0x07, 0x84, 0x27, 0xa5, 0x91, 0x81, 0x2c, 0x66, 0x93, 0x48, 0x35, 0x1c, 0x69, - 0xaf, 0x8c, 0xe4, 0x0b, 0x60, 0x4f, 0x0b, 0xb0, 0x27, 0xc8, 0xf1, 0x24, 0xd8, 0xe4, 0x6f, 0x63, - 0xc6, 0xb6, 0x18, 0x12, 0x3b, 0xe4, 0x7b, 0x84, 0x9f, 0x94, 0x62, 0xf9, 0x02, 0x2f, 0x66, 0x93, - 0x6a, 0x64, 0xfc, 0xbd, 0xe6, 0x35, 0x7a, 0x5c, 0xe0, 0xa7, 0xe4, 0xc8, 0x20, 0xfc, 0x7e, 0x1d, - 0xef, 0x8f, 0xdf, 0xea, 0xc9, 0xf9, 0x6c, 0xba, 0x29, 0x66, 0x17, 0x6d, 0x71, 0x14, 0x57, 0x40, - 0x7c, 0x52, 0x20, 0x3e, 0x46, 0x8e, 0x26, 0x11, 0xc7, 0xc7, 0x0b, 0x63, 0xdb, 0x1f, 0xdc, 0x3a, - 0xe4, 0x1b, 0x84, 0x0f, 0xc4, 0xa3, 0xf8, 0x5a, 0x9f, 0xcf, 0xa6, 0xd7, 0xa8, 0xb8, 0x7b, 0x8c, - 0x51, 0x74, 0x5e, 0xe0, 0x2e, 0x90, 0xb9, 0x7e, 0xb8, 0xc9, 0x2f, 0x08, 0x4f, 0x4a, 0x63, 0x43, - 0xd6, 0xd2, 0x56, 0x8d, 0x3e, 0x59, 0x4b, 0x5b, 0x39, 0xa7, 0xd0, 0x4b, 0x02, 0xf0, 0x05, 0xb2, - 0x64, 0x48, 0x41, 0x54, 0x6f, 0x65, 0xf4, 0x43, 0x6e, 0xb2, 0xa7, 0x90, 0xff, 0x10, 0x9e, 0x52, - 0x5c, 0x4a, 0xc9, 0xc5, 0x21, 0x0f, 0x88, 0xd4, 0xb5, 0x5c, 0x2b, 0xed, 0x20, 0x02, 0x50, 0x5c, - 0x13, 0x14, 0x57, 0xc9, 0x1b, 0x83, 0x29, 0xa6, 0x7f, 0x8d, 0x36, 0xb6, 0x95, 0x73, 0x4e, 0x87, - 0xfc, 0x89, 0xf0, 0x8c, 0x22, 0xab, 0x5f, 0x7b, 0x17, 0x87, 0x3c, 0x69, 0x46, 0x63, 0xdd, 0x7f, - 0xbe, 0xa0, 0x4b, 0x82, 0xf5, 0x39, 0x52, 0x1c, 0x85, 0x35, 0xb9, 0x87, 0xe4, 0xbb, 0x7a, 0xd6, - 0x3e, 0xa0, 0x18, 0x0b, 0xb2, 0xf6, 0x01, 0xd5, 0xc8, 0x40, 0x8b, 0x82, 0x85, 0x4e, 0x5e, 0x1c, - 0xcc, 0x22, 0xfa, 0x8f, 0x80, 0xfc, 0x84, 0x12, 0x57, 0x7a, 0x32, 0x14, 0x06, 0x79, 0x80, 0xc8, - 0xfc, 0x7e, 0xa9, 0x86, 0x0b, 0x7a, 0x56, 0x10, 0x30, 0xc8, 0xa9, 0x6c, 0x04, 0xe0, 0x6f, 0x0c, - 0xf2, 0x1b, 0xc2, 0x07, 0x12, 0xb7, 0x55, 0xb2, 0x94, 0x0d, 0x87, 0xfa, 0x7e, 0xae, 0xbd, 0x3a, - 0xa2, 0x37, 0xf0, 0x28, 0x0b, 0x1e, 0x17, 0xc9, 0x85, 0xfe, 0x3c, 0x92, 0xff, 0xb7, 0xa4, 0x3a, - 0xc5, 0x03, 0x84, 0x49, 0x22, 0x87, 0xff, 0xca, 0x2c, 0x65, 0x2b, 0xf8, 0x1d, 0x70, 0xeb, 0x3d, - 0x4e, 0xd0, 0x73, 0x82, 0xdb, 0x69, 0xa2, 0x0f, 0xc7, 0x6d, 0xf9, 0xca, 0xfd, 0x47, 0x05, 0xf4, - 0xf0, 0x51, 0x01, 0xfd, 0xf3, 0xa8, 0x80, 0xee, 0x3e, 0x2e, 0x8c, 0x3d, 0x7c, 0x5c, 0x18, 0xfb, - 0xfd, 0x71, 0x61, 0xec, 0xba, 0xd1, 0x6c, 0xf1, 0x8d, 0xdb, 0x55, 0xbd, 0xe6, 0xb4, 0xd5, 0x31, - 0xef, 0x74, 0xa3, 0xf2, 0xad, 0x4d, 0xe6, 0x55, 0xf7, 0x8a, 0xff, 0x9f, 0x5e, 0xfa, 0x3f, 0x00, - 0x00, 0xff, 0xff, 0x71, 0xb6, 0x97, 0xb9, 0x39, 0x1c, 0x00, 0x00, + // 1495 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x59, 0x4f, 0x6f, 0x1b, 0x45, + 0x14, 0xcf, 0x34, 0xfd, 0xa3, 0x0c, 0x8d, 0x8a, 0x26, 0xa1, 0x04, 0x93, 0xba, 0x68, 0x08, 0xa5, + 0x0a, 0xed, 0x6e, 0xdd, 0xa6, 0x29, 0x2d, 0xa1, 0x8a, 0x9d, 0xe2, 0x52, 0x01, 0xa1, 0x35, 0x91, + 0x80, 0x4a, 0x28, 0x5d, 0xdb, 0x63, 0xc7, 0xea, 0x7a, 0x37, 0x5d, 0x4f, 0xa1, 0x21, 0x8a, 0x84, + 0x38, 0x73, 0xa8, 0xc4, 0x91, 0x4f, 0xd0, 0x63, 0x0f, 0x9c, 0x0a, 0x02, 0xc4, 0xa5, 0xbd, 0xa0, + 0x4a, 0x48, 0x88, 0x3f, 0x12, 0x42, 0x2d, 0x1f, 0x80, 0x8f, 0x80, 0x76, 0xf6, 0xad, 0x77, 0x67, + 0x3d, 0x5e, 0x8f, 0x9d, 0xbd, 0xd9, 0xf3, 0xf6, 0xbd, 0xf7, 0xfb, 0xbd, 0x99, 0x79, 0x33, 0xbf, + 0x5d, 0x3c, 0xe5, 0x34, 0x78, 0xdb, 0x69, 0x7a, 0xe6, 0xad, 0xdb, 0xcc, 0xdb, 0x32, 0x36, 0x3d, + 0x97, 0xbb, 0x64, 0x96, 0x6f, 0xb0, 0x4e, 0xeb, 0x8e, 0xc3, 0xf8, 0x67, 0xae, 0x77, 0xd3, 0xf0, + 0x7f, 0x36, 0xb8, 0x01, 0x4f, 0xe6, 0xa6, 0x9b, 0x6e, 0xd3, 0x15, 0x0f, 0x9a, 0xfe, 0xaf, 0xc0, + 0x27, 0x37, 0xdb, 0x74, 0xdd, 0xa6, 0xcd, 0x4c, 0x6b, 0xb3, 0x65, 0x5a, 0x8e, 0xe3, 0x72, 0x8b, + 0xb7, 0x5c, 0xa7, 0x03, 0xd6, 0xf9, 0x9a, 0xdb, 0x69, 0xbb, 0x1d, 0xb3, 0x6a, 0x75, 0x58, 0x90, + 0xca, 0xfc, 0xb4, 0x50, 0x65, 0xdc, 0x2a, 0x98, 0x9b, 0x56, 0xb3, 0xe5, 0x88, 0x87, 0xe1, 0xd9, + 0xe9, 0x10, 0xd2, 0xa6, 0xe5, 0x59, 0xed, 0x30, 0xc2, 0x4c, 0x38, 0xea, 0x34, 0xf8, 0x7a, 0xa7, + 0xb6, 0xc1, 0xda, 0x16, 0x58, 0xf2, 0xa1, 0xc5, 0xaa, 0xf9, 0x51, 0xd6, 0xab, 0x5b, 0xeb, 0x1e, + 0x6b, 0xac, 0xb7, 0xea, 0x60, 0xcf, 0x85, 0x76, 0xd7, 0x6b, 0x5a, 0x4e, 0xeb, 0xf3, 0x78, 0xae, + 0xd9, 0x78, 0xd4, 0x9a, 0x6b, 0xdb, 0xac, 0x16, 0xb3, 0xce, 0xf5, 0xe6, 0xf4, 0xa3, 0xd7, 0x5c, + 0x87, 0x7b, 0x56, 0x8d, 0xab, 0x62, 0x34, 0x18, 0xf3, 0xed, 0x8d, 0x56, 0x13, 0xac, 0x47, 0x92, + 0xd6, 0xaa, 0x65, 0x5b, 0x4e, 0x8d, 0x25, 0xc1, 0xb7, 0x19, 0xb7, 0xea, 0x16, 0xb7, 0xd6, 0x6b, + 0x1e, 0xb3, 0xb8, 0xeb, 0x81, 0xfd, 0x70, 0xdc, 0xdd, 0xb7, 0x07, 0xe3, 0x74, 0x1a, 0x93, 0x6b, + 0x7e, 0x19, 0xaf, 0x8a, 0x1a, 0x55, 0xd8, 0xad, 0xdb, 0xac, 0xc3, 0xe9, 0xc7, 0x78, 0x4a, 0x1a, + 0xed, 0x6c, 0xba, 0x4e, 0x87, 0x91, 0x12, 0xde, 0x1f, 0xd4, 0x72, 0x06, 0xbd, 0x84, 0x8e, 0x3f, + 0x73, 0x7a, 0xce, 0x48, 0x9b, 0x60, 0x23, 0xf0, 0x2e, 0xed, 0x7d, 0xf8, 0xf7, 0xd1, 0xb1, 0x0a, + 0x78, 0x52, 0x03, 0xcf, 0x88, 0xd0, 0x97, 0x19, 0x5f, 0x2d, 0xaf, 0x7d, 0x20, 0x8a, 0x01, 0x69, + 0x09, 0xc1, 0x7b, 0x6b, 0x6e, 0x9d, 0x89, 0xe8, 0x13, 0x15, 0xf1, 0x9b, 0x6e, 0xe0, 0x17, 0x14, + 0xcf, 0x03, 0xa0, 0x77, 0xf0, 0x84, 0x13, 0x0e, 0x02, 0xa6, 0x57, 0xd3, 0x31, 0x75, 0x63, 0x00, + 0xac, 0xc8, 0x9f, 0x56, 0x01, 0x59, 0xd1, 0xb6, 0x7b, 0x90, 0x95, 0x31, 0x8e, 0xd6, 0x17, 0x64, + 0x3a, 0x66, 0x04, 0x8b, 0xd1, 0xf0, 0x17, 0xa3, 0x11, 0xac, 0x7b, 0x58, 0x8c, 0xc6, 0x55, 0xab, + 0xc9, 0xc0, 0xb7, 0x12, 0xf3, 0xa4, 0xf7, 0x11, 0xd0, 0x91, 0x93, 0xa8, 0xe9, 0x8c, 0xef, 0x86, + 0x0e, 0xb9, 0x2c, 0x41, 0xde, 0x03, 0xc5, 0x19, 0x04, 0x39, 0x40, 0x22, 0x61, 0xfe, 0x08, 0x1f, + 0xee, 0xce, 0x40, 0x83, 0x5f, 0xb2, 0x78, 0xb7, 0x2a, 0x73, 0x78, 0xd2, 0x69, 0xf0, 0x20, 0xdf, + 0x4a, 0x34, 0x71, 0xf2, 0x20, 0x99, 0xc1, 0x07, 0xb8, 0x7b, 0x93, 0x39, 0x57, 0xea, 0x02, 0xc5, + 0x44, 0x25, 0xfc, 0x4b, 0x6f, 0xe0, 0xe7, 0x7b, 0x22, 0x43, 0x29, 0xde, 0xc2, 0x07, 0x9c, 0x60, + 0x08, 0xaa, 0xfd, 0xca, 0x80, 0x42, 0x04, 0x0f, 0x43, 0x19, 0x42, 0x5f, 0x7a, 0x03, 0xb0, 0xfb, + 0xe5, 0x96, 0xb1, 0x67, 0x35, 0xa3, 0xf7, 0x10, 0x90, 0x88, 0xa7, 0x50, 0x91, 0x18, 0x1f, 0x95, + 0x44, 0x76, 0x33, 0xb9, 0x80, 0x67, 0xc3, 0x7a, 0x17, 0x45, 0x7f, 0x2a, 0x6d, 0x55, 0x58, 0xe3, + 0x4a, 0x3d, 0xac, 0xc9, 0x34, 0xde, 0xe7, 0xf9, 0xff, 0x61, 0x1e, 0x83, 0x3f, 0xf4, 0x0e, 0x3e, + 0xd2, 0xc7, 0x0b, 0x68, 0x7e, 0x88, 0x27, 0xad, 0xb8, 0x01, 0xaa, 0xf9, 0x5a, 0x3a, 0x59, 0x29, + 0x16, 0x50, 0x96, 0xe3, 0xd0, 0x06, 0xe0, 0x2d, 0xda, 0xb6, 0x12, 0x6f, 0x56, 0x73, 0xf8, 0x13, + 0x02, 0x8a, 0xbd, 0x89, 0xfa, 0x53, 0x1c, 0xcf, 0x82, 0x62, 0x76, 0x73, 0x5b, 0xc0, 0x2f, 0x86, + 0xb3, 0xf4, 0x7e, 0xec, 0x7c, 0x8a, 0xb5, 0x56, 0xc7, 0x6a, 0x77, 0x5b, 0xab, 0xff, 0x9b, 0xf2, + 0x68, 0x39, 0xc8, 0x2e, 0x40, 0x7a, 0x0d, 0x1f, 0x8c, 0x1f, 0x75, 0x50, 0xe0, 0xf9, 0x74, 0xce, + 0xf1, 0x48, 0x40, 0x59, 0x8a, 0x42, 0x19, 0x00, 0x2d, 0xda, 0xb6, 0x0a, 0x68, 0x56, 0x73, 0xfa, + 0x3d, 0x8a, 0x16, 0x8f, 0x26, 0xbb, 0xf1, 0xdd, 0xb3, 0xcb, 0x6e, 0x3e, 0xbf, 0x42, 0xd1, 0xec, + 0xac, 0x36, 0xf8, 0x4a, 0xf7, 0x4e, 0x31, 0x5c, 0xf3, 0x2d, 0x2b, 0xf0, 0x8c, 0x52, 0xce, 0x07, + 0x28, 0xea, 0x02, 0x09, 0x38, 0x50, 0xcf, 0x6b, 0x02, 0x4f, 0x64, 0x18, 0xbe, 0xe5, 0xa1, 0x8a, + 0x1c, 0x21, 0xbb, 0x62, 0x5e, 0xc7, 0xb4, 0xe7, 0x12, 0x51, 0xda, 0x5a, 0x81, 0xfb, 0x57, 0x58, + 0xd1, 0x05, 0xfc, 0x9c, 0xeb, 0xb5, 0x9a, 0x2d, 0x27, 0x34, 0x14, 0xeb, 0x75, 0x8f, 0x75, 0x3a, + 0x50, 0x59, 0xb5, 0x91, 0xde, 0x45, 0xf8, 0xe5, 0xd4, 0xe0, 0x50, 0x9f, 0x16, 0x9e, 0x72, 0x7a, + 0xcd, 0xb0, 0xc2, 0x0b, 0xba, 0xc7, 0x7c, 0xd7, 0x11, 0x56, 0x9f, 0x2a, 0x26, 0xb5, 0x81, 0x6e, + 0xfc, 0x92, 0xd1, 0x4b, 0x37, 0xab, 0x9d, 0xf6, 0x47, 0x58, 0x80, 0x7e, 0xe9, 0x06, 0x15, 0x60, + 0x3c, 0xeb, 0x02, 0x64, 0xb7, 0x70, 0x8e, 0x44, 0x5d, 0x75, 0xb5, 0xbc, 0x56, 0x66, 0x6c, 0x45, + 0xdc, 0xc9, 0xc3, 0x7b, 0x72, 0xac, 0x83, 0xca, 0xe6, 0xa8, 0xc7, 0xc4, 0xc7, 0xf5, 0x3a, 0x68, + 0xdc, 0x23, 0xec, 0x31, 0xf1, 0x31, 0x9a, 0x4f, 0x66, 0x2d, 0x05, 0x52, 0x20, 0x44, 0x15, 0x3b, + 0xb0, 0x13, 0xf6, 0xe8, 0x34, 0x93, 0x0c, 0x7a, 0x07, 0xb6, 0xe4, 0x12, 0x9e, 0x66, 0xd2, 0x20, + 0x2d, 0xe3, 0x7c, 0x98, 0xf9, 0x3d, 0xd0, 0x21, 0x2b, 0x81, 0x0c, 0x19, 0xaa, 0x6b, 0xd1, 0x2f, + 0x10, 0x3e, 0xda, 0x37, 0x10, 0x90, 0xf8, 0x04, 0x1f, 0x6a, 0xcb, 0x26, 0xa0, 0x71, 0x32, 0x9d, + 0x46, 0x22, 0x1e, 0x10, 0x49, 0xc6, 0xa2, 0x1b, 0x40, 0xa5, 0x68, 0xdb, 0x7d, 0xa8, 0x64, 0xb5, + 0x7f, 0x1e, 0x85, 0x64, 0x55, 0xa9, 0xd2, 0xc8, 0x8e, 0x67, 0x45, 0x36, 0xb3, 0xfd, 0x72, 0xfa, + 0xcf, 0x19, 0xbc, 0x4f, 0x70, 0x21, 0xdf, 0x20, 0xbc, 0x3f, 0x10, 0x80, 0xe4, 0x54, 0x3a, 0xc6, + 0x5e, 0xfd, 0x99, 0x2b, 0x0c, 0xe1, 0x11, 0xa0, 0xa0, 0x27, 0xbe, 0xfc, 0xf5, 0xdf, 0xaf, 0xf7, + 0x1c, 0x23, 0x73, 0xa6, 0xe4, 0x6a, 0x06, 0xae, 0xa6, 0xfc, 0x2e, 0x80, 0x7c, 0x8b, 0xf0, 0x44, + 0xb7, 0xa7, 0x90, 0x45, 0x8d, 0x74, 0x0a, 0xbd, 0x9a, 0x3b, 0x37, 0xb4, 0x1f, 0x80, 0x3d, 0x27, + 0xc0, 0x16, 0x88, 0x99, 0x0e, 0x36, 0x7a, 0x5d, 0x60, 0x6e, 0xfb, 0x62, 0x78, 0x87, 0xdc, 0x47, + 0xa2, 0xa3, 0x04, 0xe1, 0x8a, 0xb6, 0xad, 0x05, 0x5d, 0x21, 0x68, 0xb5, 0xa0, 0xab, 0x34, 0x2a, + 0x3d, 0x25, 0xa0, 0xcf, 0x93, 0xe3, 0xba, 0xd0, 0xc9, 0x8f, 0x08, 0x1f, 0x80, 0x63, 0x9e, 0x2c, + 0x68, 0x56, 0x4c, 0xd2, 0x6a, 0xb9, 0xb3, 0x43, 0x7a, 0x01, 0xd4, 0xb7, 0x05, 0xd4, 0x12, 0x59, + 0x1e, 0x0c, 0xd5, 0xdf, 0x0c, 0xe6, 0xb6, 0xd4, 0x84, 0x76, 0xcc, 0x6d, 0xd0, 0xa9, 0x3b, 0xe4, + 0x1e, 0xc2, 0x18, 0xa2, 0xfb, 0x45, 0x5f, 0xd0, 0x2c, 0xde, 0xf0, 0x2c, 0x7a, 0x45, 0x24, 0x35, + 0x04, 0x8b, 0xe3, 0xe4, 0x98, 0x1e, 0x0b, 0xf2, 0x10, 0xe1, 0x49, 0x49, 0x78, 0x90, 0x0b, 0x7a, + 0xe5, 0x53, 0x49, 0xac, 0xdc, 0x1b, 0x23, 0xf9, 0x02, 0xf4, 0x8b, 0x02, 0xfa, 0xeb, 0x64, 0x31, + 0x1d, 0x7a, 0xf2, 0x7d, 0x9b, 0xb9, 0x2d, 0x84, 0xe7, 0x0e, 0xf9, 0x19, 0xe1, 0x67, 0xa5, 0xc8, + 0x7e, 0xf1, 0x2f, 0xe8, 0x95, 0x71, 0x64, 0x36, 0xfd, 0x34, 0x20, 0x5d, 0x14, 0x6c, 0x4e, 0x11, + 0x63, 0x38, 0x36, 0xfe, 0xfa, 0x3f, 0x18, 0xd7, 0x0d, 0xe4, 0xbc, 0x5e, 0x4d, 0x15, 0xea, 0x28, + 0x77, 0x61, 0x14, 0x57, 0xc0, 0x7f, 0x5e, 0xe0, 0x3f, 0x43, 0x0a, 0xe9, 0xf8, 0xe3, 0x72, 0xc6, + 0xdc, 0xf6, 0x85, 0xe2, 0x0e, 0xf9, 0x0e, 0xe1, 0x43, 0xf1, 0x98, 0xfe, 0x3c, 0x9c, 0xd7, 0xab, + 0xe5, 0xa8, 0x2c, 0xfa, 0xc8, 0x36, 0x7a, 0x5a, 0xb0, 0x38, 0x41, 0xe6, 0xf5, 0x59, 0x90, 0x5f, + 0x10, 0x9e, 0x94, 0x44, 0x8b, 0xee, 0x96, 0x50, 0x09, 0x2f, 0xdd, 0x2d, 0xa1, 0x54, 0x49, 0xf4, + 0x92, 0x80, 0x7f, 0x91, 0x2c, 0x0d, 0xde, 0xcd, 0xd1, 0x6b, 0xe4, 0x64, 0x67, 0x22, 0xff, 0x21, + 0x3c, 0xa5, 0xb8, 0x12, 0x93, 0xe5, 0x21, 0x0f, 0xa4, 0x1e, 0x51, 0x90, 0x2b, 0xee, 0x22, 0x02, + 0x50, 0x5c, 0x13, 0x14, 0x57, 0xc9, 0xbb, 0xba, 0x27, 0x44, 0xfc, 0x5d, 0xb8, 0xb9, 0xad, 0x54, + 0x59, 0x3b, 0xe4, 0x2f, 0x84, 0x0f, 0x2b, 0xb2, 0xfa, 0x2b, 0x71, 0x79, 0xc8, 0xb3, 0x6c, 0x34, + 0xd6, 0xe9, 0xea, 0x86, 0x2e, 0x09, 0xd6, 0x8b, 0x64, 0x61, 0x14, 0xd6, 0xe4, 0x01, 0x92, 0x95, + 0x82, 0x6e, 0x8f, 0x50, 0x88, 0x12, 0xdd, 0x1e, 0xa1, 0x12, 0x2c, 0x74, 0x41, 0xb0, 0x30, 0xc8, + 0x89, 0xc1, 0x2c, 0xa2, 0x2f, 0x14, 0xe4, 0x07, 0x94, 0x10, 0x14, 0x64, 0x28, 0x0c, 0xb2, 0x7c, + 0xd1, 0xde, 0x5f, 0x2a, 0x69, 0x43, 0xcf, 0x0a, 0x02, 0x26, 0x39, 0xa9, 0x47, 0x00, 0x3e, 0xa2, + 0x90, 0xdf, 0x10, 0x3e, 0x94, 0xb8, 0x2b, 0x93, 0x25, 0x3d, 0x1c, 0x6a, 0x75, 0x90, 0x7b, 0x73, + 0x44, 0x6f, 0xe0, 0x51, 0x16, 0x3c, 0x96, 0xc9, 0xc5, 0x74, 0x1e, 0xc9, 0xaf, 0x3d, 0x3d, 0x9d, + 0xe2, 0x11, 0xc2, 0x24, 0x91, 0xc3, 0xdf, 0x32, 0x4b, 0x7a, 0x0b, 0x7e, 0x17, 0xdc, 0xfa, 0x8b, + 0x19, 0xdd, 0x83, 0x34, 0xc9, 0xad, 0x74, 0xe5, 0xe1, 0x93, 0x3c, 0x7a, 0xfc, 0x24, 0x8f, 0xfe, + 0x79, 0x92, 0x47, 0x77, 0x9f, 0xe6, 0xc7, 0x1e, 0x3f, 0xcd, 0x8f, 0xfd, 0xfe, 0x34, 0x3f, 0x76, + 0xdd, 0x6c, 0xb6, 0xf8, 0xc6, 0xed, 0xaa, 0x51, 0x73, 0xdb, 0xea, 0x98, 0x77, 0xba, 0x51, 0xf9, + 0xd6, 0x26, 0xeb, 0x54, 0xf7, 0x8b, 0xaf, 0x5f, 0x67, 0xfe, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x91, + 0xec, 0x9d, 0x26, 0xb7, 0x1c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/nftmngr/types/query.pb.gw.go b/x/nftmngr/types/query.pb.gw.go index 0d656854..f6edd53e 100644 --- a/x/nftmngr/types/query.pb.gw.go +++ b/x/nftmngr/types/query.pb.gw.go @@ -1460,23 +1460,23 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"sixnft", "nftmngr", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"thesixnetwork", "sixnft", "nftmngr", "params"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_NFTSchema_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"sixnft", "nftmngr", "nft_schema", "code"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_NFTSchema_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"thesixnetwork", "sixnft", "nftmngr", "nft_schema", "code"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_NFTSchemaAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"sixnft", "nftmngr", "nft_schema"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_NFTSchemaAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"thesixnetwork", "sixnft", "nftmngr", "nft_schema"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_NftData_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"sixnft", "nftmngr", "nft_data", "nftSchemaCode", "tokenId"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_NftData_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"thesixnetwork", "sixnft", "nftmngr", "nft_data", "nftSchemaCode", "tokenId"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_NftDataAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"sixnft", "nftmngr", "nft_data"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_NftDataAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"thesixnetwork", "sixnft", "nftmngr", "nft_data"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_ActionByRefId_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"sixnft", "nftmngr", "action_by_ref_id", "refId"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_ActionByRefId_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"thesixnetwork", "sixnft", "nftmngr", "action_by_ref_id", "refId"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_ActionByRefIdAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"sixnft", "nftmngr", "action_by_ref_id"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_ActionByRefIdAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"thesixnetwork", "sixnft", "nftmngr", "action_by_ref_id"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_Organization_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"sixnft", "nftmngr", "organization", "name"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Organization_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"thesixnetwork", "sixnft", "nftmngr", "organization", "name"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_OrganizationAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"sixnft", "nftmngr", "organization"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_OrganizationAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"thesixnetwork", "sixnft", "nftmngr", "organization"}, "", runtime.AssumeColonVerbOpt(true))) pattern_Query_NftCollection_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"thesixnetwork", "sixnft", "nftmngr", "nft_collection", "nftSchemaCode"}, "", runtime.AssumeColonVerbOpt(true))) diff --git a/x/nftoracle/types/query.pb.go b/x/nftoracle/types/query.pb.go index 8d2a9926..8acf850b 100644 --- a/x/nftoracle/types/query.pb.go +++ b/x/nftoracle/types/query.pb.go @@ -772,60 +772,60 @@ func init() { proto.RegisterFile("nftoracle/query.proto", fileDescriptor_a7d0650 var fileDescriptor_a7d06501fbd25d28 = []byte{ // 859 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcf, 0x4f, 0xdb, 0x48, - 0x14, 0xce, 0x04, 0x96, 0xc3, 0xc0, 0xa2, 0xd5, 0x2c, 0x8b, 0x58, 0x2f, 0x78, 0x23, 0xaf, 0xf8, - 0xa1, 0x05, 0x6c, 0x01, 0xda, 0x6d, 0x45, 0x41, 0x6d, 0xa0, 0xc0, 0xa1, 0xaa, 0xa0, 0x54, 0xaa, - 0xd4, 0xf6, 0x80, 0x9c, 0xc4, 0x31, 0x56, 0x1d, 0x4f, 0xb0, 0x87, 0x5f, 0xad, 0x7a, 0xe9, 0x5f, - 0x50, 0x89, 0x7b, 0x4f, 0xfd, 0x07, 0xaa, 0x9e, 0x2a, 0x2e, 0x95, 0x7a, 0xe1, 0x88, 0xd4, 0x4b, - 0x4f, 0x55, 0x05, 0x95, 0x7a, 0xa9, 0xfa, 0x37, 0x54, 0x9e, 0x79, 0xc1, 0x76, 0xe2, 0xc4, 0x6e, - 0x48, 0x4f, 0x89, 0x3c, 0xef, 0x7d, 0xef, 0xfb, 0xbe, 0x37, 0x7a, 0xcf, 0xc6, 0x7f, 0x38, 0x65, - 0x46, 0x5d, 0xbd, 0x68, 0x1b, 0xda, 0xce, 0xae, 0xe1, 0x1e, 0xaa, 0x55, 0x97, 0x32, 0x4a, 0x64, - 0xb6, 0x6d, 0x78, 0xd6, 0x81, 0x63, 0xb0, 0x7d, 0xea, 0x3e, 0x52, 0xfd, 0xbf, 0x65, 0xa6, 0x5e, - 0xc4, 0x4a, 0x03, 0x26, 0x35, 0x29, 0x0f, 0xd5, 0xfc, 0x7f, 0x22, 0x4b, 0x1a, 0x36, 0x29, 0x35, - 0x6d, 0x43, 0xd3, 0xab, 0x96, 0xa6, 0x3b, 0x0e, 0x65, 0x3a, 0xb3, 0xa8, 0xe3, 0xc1, 0xe9, 0xbf, - 0x45, 0xea, 0x55, 0xa8, 0xa7, 0x15, 0x74, 0x0f, 0x8a, 0x69, 0x7b, 0x33, 0x05, 0x83, 0xe9, 0x33, - 0x5a, 0x55, 0x37, 0x2d, 0x87, 0x07, 0x43, 0xec, 0x60, 0x40, 0xab, 0xaa, 0xbb, 0x7a, 0xa5, 0x86, - 0x31, 0x1c, 0x3c, 0xaf, 0x58, 0x0e, 0xdb, 0x72, 0x8d, 0x9d, 0x5d, 0xc3, 0x63, 0x70, 0x2a, 0x07, - 0xa7, 0x7a, 0xd1, 0x47, 0xab, 0x3b, 0x9f, 0x08, 0xce, 0x8b, 0xd4, 0xb6, 0x0d, 0x11, 0x43, 0xf7, - 0x1d, 0xc3, 0xad, 0x8b, 0x1c, 0x09, 0x22, 0xc5, 0xcf, 0x56, 0x91, 0x3a, 0x65, 0xcb, 0x14, 0xc7, - 0xca, 0x00, 0x26, 0x77, 0x7c, 0x01, 0x1b, 0x9c, 0xdb, 0xa6, 0x48, 0x55, 0x1e, 0xe2, 0xdf, 0x23, - 0x4f, 0xbd, 0x2a, 0x75, 0x3c, 0x83, 0xdc, 0xc4, 0x3d, 0x42, 0xc3, 0x10, 0xca, 0xa1, 0x89, 0xde, - 0xd9, 0x31, 0xb5, 0xb5, 0xb9, 0xaa, 0xc8, 0x5f, 0xea, 0x3e, 0xf9, 0xf8, 0x77, 0x66, 0x13, 0x72, - 0x95, 0x29, 0x2c, 0x71, 0xf0, 0x35, 0x83, 0xdd, 0xb6, 0x1c, 0x06, 0x35, 0xe1, 0x87, 0xf4, 0xe3, - 0xac, 0x55, 0xe2, 0xf8, 0xdd, 0x9b, 0x59, 0xab, 0xa4, 0xb8, 0xf8, 0xaf, 0xd8, 0x68, 0xa0, 0x74, - 0x17, 0xf7, 0x86, 0x1e, 0x03, 0xaf, 0xc9, 0x24, 0x5e, 0xa1, 0x14, 0x20, 0x17, 0x46, 0x51, 0x4a, - 0xc0, 0x30, 0x6f, 0xdb, 0x31, 0x0c, 0x57, 0x31, 0x0e, 0xba, 0x7c, 0xe1, 0x84, 0xb8, 0x12, 0xaa, - 0x7f, 0x25, 0x54, 0x71, 0xff, 0xe0, 0x4a, 0xa8, 0x1b, 0xba, 0x69, 0xd4, 0x20, 0x42, 0x99, 0xca, - 0x31, 0x02, 0x69, 0xf5, 0x65, 0x9a, 0x49, 0xeb, 0xba, 0xbc, 0x34, 0xb2, 0x16, 0x21, 0x9f, 0xe5, - 0xe4, 0xc7, 0x13, 0xc9, 0x0b, 0x46, 0x11, 0xf6, 0x2a, 0x1e, 0xae, 0xf5, 0x25, 0xcf, 0x6f, 0x5f, - 0x42, 0x1f, 0x1f, 0xe3, 0x91, 0x26, 0xf1, 0x20, 0xf7, 0x3e, 0xfe, 0x35, 0x72, 0x00, 0xce, 0x4e, - 0x27, 0x09, 0x8e, 0x24, 0x81, 0xe4, 0x28, 0x92, 0x52, 0x06, 0xae, 0x79, 0xdb, 0x8e, 0xe5, 0xda, - 0xa9, 0x8e, 0xbe, 0x43, 0x20, 0xb2, 0xb1, 0x50, 0x73, 0x91, 0x5d, 0x9d, 0x11, 0xd9, 0xb9, 0xce, - 0x5e, 0xc1, 0xa3, 0xb5, 0x4e, 0x2d, 0x5f, 0xcc, 0x96, 0x75, 0x7f, 0xb4, 0x24, 0xb4, 0xf8, 0x05, - 0xc2, 0x63, 0x49, 0x99, 0xe0, 0x03, 0xc3, 0x83, 0xf1, 0x11, 0xe0, 0xfe, 0xff, 0x49, 0x86, 0xc4, - 0x67, 0x83, 0x33, 0x4d, 0xb0, 0x15, 0x0a, 0xca, 0xf2, 0xb6, 0xdd, 0x5a, 0x59, 0xa7, 0x2e, 0xc4, - 0x97, 0x9a, 0x23, 0x2d, 0x2a, 0xa6, 0x70, 0xa4, 0xeb, 0x67, 0x39, 0xd2, 0xb9, 0x4b, 0x33, 0x12, - 0x8c, 0xe9, 0x75, 0xce, 0x67, 0x99, 0x6f, 0x99, 0x9a, 0xf3, 0x7b, 0xc1, 0xb4, 0x88, 0x1e, 0x83, - 0xfa, 0x7b, 0xb8, 0x2f, 0xfc, 0x1c, 0x2c, 0x9f, 0x4a, 0xd2, 0x1c, 0xce, 0x01, 0xa5, 0x11, 0x9c, - 0xd9, 0x97, 0x7d, 0xf8, 0x17, 0x5e, 0x98, 0x1c, 0x21, 0xdc, 0x23, 0xd6, 0x11, 0x99, 0x4d, 0x82, - 0x6d, 0xdc, 0x88, 0xd2, 0xdc, 0x0f, 0xe5, 0x08, 0x55, 0x4a, 0xee, 0xd9, 0xfb, 0xcf, 0x47, 0x59, - 0x89, 0x0c, 0x69, 0x22, 0x5c, 0xab, 0x7f, 0x17, 0x20, 0xaf, 0x51, 0x64, 0xc8, 0x93, 0xf9, 0x54, - 0x65, 0x62, 0x37, 0xa7, 0x74, 0xad, 0xad, 0x5c, 0xa0, 0x3a, 0xc9, 0xa9, 0x8e, 0x92, 0x7f, 0x1a, - 0xa9, 0x86, 0x5f, 0x4f, 0xb4, 0x27, 0x56, 0xe9, 0x29, 0x79, 0x85, 0x70, 0x7f, 0x08, 0x24, 0x6f, - 0xdb, 0x29, 0x89, 0xc7, 0x2e, 0xd4, 0x94, 0xc4, 0xe3, 0xb7, 0xa4, 0x32, 0xc6, 0x89, 0xe7, 0x88, - 0xdc, 0x9a, 0x38, 0x39, 0x46, 0x75, 0xa3, 0x97, 0x2c, 0xa4, 0xf5, 0x2b, 0x6e, 0x67, 0x48, 0x8b, - 0x6d, 0x66, 0x03, 0xed, 0x69, 0x4e, 0x7b, 0x9c, 0x8c, 0x36, 0xd2, 0x8e, 0xbe, 0xf0, 0x09, 0xc7, - 0xdf, 0x20, 0xfc, 0x5b, 0x04, 0xc8, 0xf7, 0x7c, 0x21, 0xad, 0x6f, 0x97, 0x10, 0xd0, 0x6c, 0x93, - 0x29, 0x13, 0x5c, 0x80, 0x42, 0x72, 0x49, 0x02, 0xc8, 0x37, 0xd4, 0x6c, 0xb4, 0x91, 0x95, 0xb4, - 0x26, 0xb6, 0x1c, 0xd7, 0xd2, 0xea, 0x65, 0x61, 0x40, 0xd3, 0x0a, 0xd7, 0x74, 0x9d, 0x2c, 0x6a, - 0x11, 0xbc, 0x46, 0x85, 0xcd, 0xde, 0xb9, 0x45, 0xb3, 0xbe, 0x22, 0xfc, 0x67, 0x7c, 0x25, 0xbf, - 0x6b, 0x2b, 0x69, 0x7d, 0xef, 0x84, 0xe6, 0xc4, 0xbd, 0xa3, 0xdc, 0xe0, 0x9a, 0xe7, 0xc9, 0xd5, - 0x76, 0x35, 0x93, 0xb7, 0x28, 0x3a, 0xbc, 0x49, 0xea, 0x41, 0x14, 0xb3, 0x29, 0xa4, 0x85, 0xf6, - 0x92, 0x41, 0xcd, 0x7f, 0x5c, 0x8d, 0x46, 0xa6, 0x93, 0xd4, 0x44, 0xbe, 0x85, 0x96, 0x6e, 0x9d, - 0x9c, 0xc9, 0xe8, 0xf4, 0x4c, 0x46, 0x9f, 0xce, 0x64, 0xf4, 0xfc, 0x5c, 0xce, 0x9c, 0x9e, 0xcb, - 0x99, 0x0f, 0xe7, 0x72, 0xe6, 0xc1, 0x8c, 0x69, 0xb1, 0xed, 0xdd, 0x82, 0x5a, 0xa4, 0x95, 0x78, - 0xc8, 0x83, 0x10, 0x28, 0x3b, 0xac, 0x1a, 0x5e, 0xa1, 0x87, 0x7f, 0x59, 0xcd, 0x7d, 0x0f, 0x00, - 0x00, 0xff, 0xff, 0x1f, 0x5e, 0x88, 0x2a, 0x91, 0x0e, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x97, 0xcf, 0x6f, 0xd3, 0x48, + 0x14, 0xc7, 0x33, 0x69, 0xb7, 0x87, 0x69, 0xb7, 0x5a, 0xcd, 0x76, 0xab, 0x5d, 0x6f, 0xeb, 0x5d, + 0x59, 0xda, 0x6e, 0xb5, 0xdb, 0xda, 0xa4, 0xa1, 0x05, 0xfa, 0x43, 0x90, 0x96, 0xb6, 0x07, 0x84, + 0x5a, 0x8a, 0x84, 0x04, 0x1c, 0x2a, 0x27, 0x71, 0x5c, 0x0b, 0xc7, 0x93, 0xda, 0xd3, 0x5f, 0x20, + 0x2e, 0xfc, 0x05, 0x48, 0xdc, 0x91, 0xf8, 0x3b, 0x38, 0x00, 0xe2, 0x40, 0xb9, 0x55, 0xe2, 0xc2, + 0x09, 0xa1, 0x16, 0x09, 0x09, 0x21, 0xfe, 0x06, 0xe4, 0x99, 0x97, 0xda, 0x4e, 0x9d, 0xd8, 0x4d, + 0xc3, 0x29, 0x91, 0xe7, 0xfd, 0xf8, 0x7e, 0xde, 0x1b, 0xbd, 0x67, 0xe3, 0xdf, 0x9c, 0x0a, 0xa3, + 0xae, 0x5e, 0xb2, 0x0d, 0x6d, 0x73, 0xcb, 0x70, 0xf7, 0xd4, 0x9a, 0x4b, 0x19, 0x25, 0x32, 0xdb, + 0x30, 0x3c, 0x6b, 0xd7, 0x31, 0xd8, 0x0e, 0x75, 0xef, 0xa9, 0xfe, 0xdf, 0x0a, 0x53, 0x8f, 0x6d, + 0xa5, 0x01, 0x93, 0x9a, 0x94, 0x9b, 0x6a, 0xfe, 0x3f, 0xe1, 0x25, 0x0d, 0x99, 0x94, 0x9a, 0xb6, + 0xa1, 0xe9, 0x35, 0x4b, 0xd3, 0x1d, 0x87, 0x32, 0x9d, 0x59, 0xd4, 0xf1, 0xe0, 0xf4, 0xbf, 0x12, + 0xf5, 0xaa, 0xd4, 0xd3, 0x8a, 0xba, 0x07, 0xc9, 0xb4, 0xed, 0x5c, 0xd1, 0x60, 0x7a, 0x4e, 0xab, + 0xe9, 0xa6, 0xe5, 0x70, 0x63, 0xb0, 0x1d, 0x0c, 0x64, 0xd5, 0x74, 0x57, 0xaf, 0xd6, 0x63, 0x0c, + 0x05, 0xcf, 0xab, 0x96, 0xc3, 0xd6, 0x5d, 0x63, 0x73, 0xcb, 0xf0, 0x18, 0x9c, 0xca, 0xc1, 0xa9, + 0x5e, 0xf2, 0xa3, 0x35, 0x9c, 0x8f, 0x06, 0xe7, 0x25, 0x6a, 0xdb, 0x86, 0xb0, 0xa1, 0x3b, 0x8e, + 0xe1, 0x36, 0x58, 0x0e, 0x07, 0x96, 0xe2, 0x67, 0xbd, 0x44, 0x9d, 0x8a, 0x65, 0x8a, 0x63, 0x65, + 0x00, 0x93, 0x1b, 0x3e, 0xc0, 0x2a, 0xd7, 0xb6, 0x26, 0x5c, 0x95, 0xbb, 0xf8, 0xd7, 0xc8, 0x53, + 0xaf, 0x46, 0x1d, 0xcf, 0x20, 0x57, 0x71, 0x8f, 0x60, 0xf8, 0x1d, 0xfd, 0x8d, 0x46, 0x7b, 0x27, + 0x46, 0xd4, 0xd6, 0xc5, 0x55, 0x85, 0xff, 0x7c, 0xf7, 0xfe, 0x87, 0xbf, 0x32, 0x6b, 0xe0, 0xab, + 0x8c, 0x61, 0x89, 0x07, 0x5f, 0x36, 0xd8, 0x75, 0xcb, 0x61, 0x90, 0x13, 0x7e, 0x48, 0x3f, 0xce, + 0x5a, 0x65, 0x1e, 0xbf, 0x7b, 0x2d, 0x6b, 0x95, 0x15, 0x17, 0xff, 0x19, 0x6b, 0x0d, 0x92, 0x6e, + 0xe2, 0xde, 0xd0, 0x63, 0xd0, 0xf5, 0x7f, 0x92, 0xae, 0x90, 0x0b, 0x88, 0x0b, 0x47, 0x51, 0xca, + 0xa0, 0xb0, 0x60, 0xdb, 0x31, 0x0a, 0x97, 0x30, 0x0e, 0xba, 0x7c, 0x5c, 0x09, 0x71, 0x25, 0x54, + 0xff, 0x4a, 0xa8, 0xe2, 0xfe, 0xc1, 0x95, 0x50, 0x57, 0x75, 0xd3, 0xa8, 0x87, 0x08, 0x79, 0x2a, + 0xcf, 0x11, 0xa0, 0x35, 0xa6, 0x69, 0x86, 0xd6, 0x75, 0x76, 0x34, 0xb2, 0x1c, 0x11, 0x9f, 0xe5, + 0xe2, 0xff, 0x4d, 0x14, 0x2f, 0x14, 0x45, 0xd4, 0xab, 0x78, 0xa8, 0xde, 0x97, 0x02, 0xbf, 0x7d, + 0x09, 0x7d, 0xbc, 0x8f, 0x87, 0x9b, 0xd8, 0x03, 0xee, 0x6d, 0xfc, 0x73, 0xe4, 0x00, 0x2a, 0x3b, + 0x9e, 0x04, 0x1c, 0x71, 0x02, 0xe4, 0x68, 0x24, 0xa5, 0x02, 0x5a, 0x0b, 0xb6, 0x1d, 0xab, 0xb5, + 0x53, 0x1d, 0x7d, 0x8d, 0x00, 0xf2, 0x64, 0xa2, 0xe6, 0x90, 0x5d, 0x9d, 0x81, 0xec, 0x5c, 0x67, + 0x2f, 0xe0, 0x7f, 0xea, 0x9d, 0x5a, 0x38, 0x9e, 0x2d, 0x2b, 0xfe, 0x68, 0x49, 0x68, 0xf1, 0x53, + 0x84, 0x47, 0x92, 0x3c, 0xa1, 0x0e, 0x0c, 0x0f, 0xc6, 0x5b, 0x40, 0xf5, 0xa7, 0x92, 0x0a, 0x12, + 0xef, 0x0d, 0x95, 0x69, 0x12, 0x5b, 0xa1, 0x40, 0x56, 0xb0, 0xed, 0xd6, 0x64, 0x9d, 0xba, 0x10, + 0x9f, 0xeb, 0x15, 0x69, 0x91, 0x31, 0x45, 0x45, 0xba, 0x7e, 0x54, 0x45, 0x3a, 0x77, 0x69, 0x86, + 0x83, 0x31, 0xbd, 0xc2, 0xf5, 0x2c, 0xf0, 0x2d, 0x53, 0xaf, 0xfc, 0x76, 0x30, 0x2d, 0xa2, 0xc7, + 0x40, 0x7f, 0x0b, 0xf7, 0x85, 0x9f, 0x43, 0xc9, 0xc7, 0x92, 0x98, 0xc3, 0x3e, 0x40, 0x1a, 0x89, + 0x33, 0xf1, 0xa5, 0x0f, 0xff, 0xc4, 0x13, 0x93, 0x67, 0x08, 0xf7, 0x88, 0x75, 0x44, 0x26, 0x92, + 0xc2, 0x9e, 0xdc, 0x88, 0x52, 0xfe, 0x54, 0x3e, 0x82, 0x4a, 0x51, 0x1f, 0xbd, 0xfb, 0xf4, 0x24, + 0x3b, 0x4a, 0x46, 0xb4, 0x88, 0xb3, 0x26, 0x9c, 0xb5, 0xc6, 0x37, 0x03, 0xf2, 0x0a, 0x45, 0x46, + 0x3e, 0x99, 0x4e, 0x95, 0x34, 0x76, 0x8f, 0x4a, 0x33, 0x6d, 0xf9, 0x82, 0xf0, 0x4b, 0x5c, 0x78, + 0x9e, 0xe4, 0x92, 0x84, 0x87, 0x5f, 0x5d, 0xb4, 0x07, 0x56, 0xf9, 0x21, 0x79, 0x81, 0x70, 0x7f, + 0x28, 0x64, 0xc1, 0xb6, 0x53, 0x62, 0xc4, 0x2e, 0xdb, 0x94, 0x18, 0xf1, 0x1b, 0x54, 0x39, 0xcf, + 0x31, 0x54, 0x32, 0x76, 0x1a, 0x0c, 0xf2, 0x16, 0x35, 0x0c, 0x69, 0x32, 0x9b, 0xb6, 0x96, 0x71, + 0xdb, 0x45, 0x9a, 0x6b, 0xd3, 0x1b, 0x20, 0x66, 0x38, 0xc4, 0x24, 0xc9, 0x27, 0x41, 0x44, 0x5f, + 0x14, 0x45, 0x37, 0xde, 0x20, 0xfc, 0x4b, 0x24, 0xac, 0xdf, 0x8f, 0xd9, 0xb4, 0x35, 0x3d, 0x03, + 0x4e, 0xb3, 0x0d, 0xa8, 0x4c, 0x71, 0x9c, 0x73, 0x44, 0x3d, 0x1d, 0x0e, 0xf9, 0x86, 0x9a, 0x0d, + 0x48, 0xb2, 0x98, 0xb6, 0xc0, 0x2d, 0x87, 0xbe, 0xb4, 0x74, 0xd6, 0x30, 0x40, 0xb8, 0xc8, 0x09, + 0x2f, 0x93, 0xb9, 0x24, 0xc2, 0x66, 0x6f, 0xee, 0xa2, 0x75, 0x5f, 0x11, 0xfe, 0x23, 0x3e, 0x93, + 0xdf, 0xc3, 0xc5, 0xb4, 0x5d, 0xe8, 0x04, 0x73, 0xe2, 0xf6, 0x52, 0xae, 0x70, 0xe6, 0x69, 0x72, + 0xb1, 0x5d, 0x66, 0xf2, 0x12, 0x45, 0x57, 0x00, 0x49, 0x3d, 0xc0, 0x62, 0xf6, 0x8d, 0x34, 0xdb, + 0x9e, 0x33, 0xd0, 0x4c, 0x72, 0x1a, 0x8d, 0x8c, 0x27, 0xd1, 0x44, 0xbe, 0xa8, 0xe6, 0xaf, 0xed, + 0x1f, 0xca, 0xe8, 0xe0, 0x50, 0x46, 0x1f, 0x0f, 0x65, 0xf4, 0xf8, 0x48, 0xce, 0x1c, 0x1c, 0xc9, + 0x99, 0xf7, 0x47, 0x72, 0xe6, 0x4e, 0xce, 0xb4, 0xd8, 0xc6, 0x56, 0x51, 0x2d, 0xd1, 0x6a, 0x7c, + 0xc8, 0xdd, 0x50, 0x50, 0xb6, 0x57, 0x33, 0xbc, 0x62, 0x0f, 0xff, 0x3e, 0xcb, 0x7f, 0x0f, 0x00, + 0x00, 0xff, 0xff, 0x70, 0xd0, 0x66, 0x66, 0xd7, 0x0e, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/nftoracle/types/query.pb.gw.go b/x/nftoracle/types/query.pb.gw.go index 76b43663..f7f17274 100644 --- a/x/nftoracle/types/query.pb.gw.go +++ b/x/nftoracle/types/query.pb.gw.go @@ -734,15 +734,15 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"sixnft", "nftoracle", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"thesixnetwork", "sixnft", "nftoracle", "params"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_MintRequest_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"sixnft", "nftoracle", "mint_request", "id"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_MintRequest_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"thesixnetwork", "sixnft", "nftoracle", "mint_request", "id"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_MintRequestAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"sixnft", "nftoracle", "mint_request"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_MintRequestAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"thesixnetwork", "sixnft", "nftoracle", "mint_request"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_ActionRequest_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"sixnft", "nftoracle", "action_request", "id"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_ActionRequest_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"thesixnetwork", "sixnft", "nftoracle", "action_request", "id"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_ActionRequestAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"sixnft", "nftoracle", "action_request"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_ActionRequestAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"thesixnetwork", "sixnft", "nftoracle", "action_request"}, "", runtime.AssumeColonVerbOpt(true))) pattern_Query_CollectionOwnerRequest_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"thesixnetwork", "sixnft", "nftoracle", "collection_owner_request", "id"}, "", runtime.AssumeColonVerbOpt(true)))