diff --git a/package.json b/package.json index 8f1790c..11307b1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@lum-network/sdk-javascript", - "version": "0.4.3", + "version": "0.4.4", "license": "Apache-2.0", "description": "Javascript SDK library for NodeJS and Web browsers to interact with the Lum Network.", "homepage": "https://github.com/lum-network/sdk-javascript#readme", diff --git a/src/codec/chain/beam/beam.ts b/src/codec/chain/beam/beam.ts index 4a7c6c5..edd782b 100644 --- a/src/codec/chain/beam/beam.ts +++ b/src/codec/chain/beam/beam.ts @@ -161,6 +161,8 @@ export interface Beam { hideContent: boolean; schema: string; data?: BeamData; + claimExpiresAtBlock: number; + closesAtBlock: number; } const baseBeamMedia: object = { mimetype: '', url: '', thumbnailUrl: '' }; @@ -1829,7 +1831,20 @@ export const BeamData = { }, }; -const baseBeam: object = { creatorAddress: '', id: '', status: 0, secret: '', claimAddress: '', fundsWithdrawn: false, claimed: false, cancelReason: '', hideContent: false, schema: '' }; +const baseBeam: object = { + creatorAddress: '', + id: '', + status: 0, + secret: '', + claimAddress: '', + fundsWithdrawn: false, + claimed: false, + cancelReason: '', + hideContent: false, + schema: '', + claimExpiresAtBlock: 0, + closesAtBlock: 0, +}; export const Beam = { encode(message: Beam, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { @@ -1869,6 +1884,12 @@ export const Beam = { if (message.data !== undefined) { BeamData.encode(message.data, writer.uint32(98).fork()).ldelim(); } + if (message.claimExpiresAtBlock !== 0) { + writer.uint32(104).int32(message.claimExpiresAtBlock); + } + if (message.closesAtBlock !== 0) { + writer.uint32(112).int32(message.closesAtBlock); + } return writer; }, @@ -1915,6 +1936,12 @@ export const Beam = { case 12: message.data = BeamData.decode(reader, reader.uint32()); break; + case 13: + message.claimExpiresAtBlock = reader.int32(); + break; + case 14: + message.closesAtBlock = reader.int32(); + break; default: reader.skipType(tag & 7); break; @@ -1985,6 +2012,16 @@ export const Beam = { } else { message.data = undefined; } + if (object.claimExpiresAtBlock !== undefined && object.claimExpiresAtBlock !== null) { + message.claimExpiresAtBlock = Number(object.claimExpiresAtBlock); + } else { + message.claimExpiresAtBlock = 0; + } + if (object.closesAtBlock !== undefined && object.closesAtBlock !== null) { + message.closesAtBlock = Number(object.closesAtBlock); + } else { + message.closesAtBlock = 0; + } return message; }, @@ -2002,6 +2039,8 @@ export const Beam = { message.hideContent !== undefined && (obj.hideContent = message.hideContent); message.schema !== undefined && (obj.schema = message.schema); message.data !== undefined && (obj.data = message.data ? BeamData.toJSON(message.data) : undefined); + message.claimExpiresAtBlock !== undefined && (obj.claimExpiresAtBlock = message.claimExpiresAtBlock); + message.closesAtBlock !== undefined && (obj.closesAtBlock = message.closesAtBlock); return obj; }, @@ -2067,6 +2106,16 @@ export const Beam = { } else { message.data = undefined; } + if (object.claimExpiresAtBlock !== undefined && object.claimExpiresAtBlock !== null) { + message.claimExpiresAtBlock = object.claimExpiresAtBlock; + } else { + message.claimExpiresAtBlock = 0; + } + if (object.closesAtBlock !== undefined && object.closesAtBlock !== null) { + message.closesAtBlock = object.closesAtBlock; + } else { + message.closesAtBlock = 0; + } return message; }, }; diff --git a/src/codec/chain/beam/tx.ts b/src/codec/chain/beam/tx.ts index 4296730..49cc5fe 100644 --- a/src/codec/chain/beam/tx.ts +++ b/src/codec/chain/beam/tx.ts @@ -2,7 +2,7 @@ import Long from 'long'; import _m0 from 'protobufjs/minimal'; import { Coin } from '../../cosmos/base/v1beta1/coin'; -import { BeamData, BeamState, beamStateFromJSON, beamStateToJSON } from '../beam/beam'; +import { BeamData, BeamState, beamStateFromJSON, beamStateToJSON } from './beam'; export const protobufPackage = 'lum.network.beam'; @@ -14,6 +14,8 @@ export interface MsgOpenBeam { schema: string; data?: BeamData; claimAddress: string; + claimExpiresAtBlock: number; + closesAtBlock: number; } export interface MsgUpdateBeam { @@ -24,6 +26,9 @@ export interface MsgUpdateBeam { cancelReason: string; hideContent: boolean; data?: BeamData; + claimAddress: string; + claimExpiresAtBlock: number; + closesAtBlock: number; } export interface MsgClaimBeam { @@ -32,7 +37,7 @@ export interface MsgClaimBeam { secret: string; } -const baseMsgOpenBeam: object = { id: '', creatorAddress: '', secret: '', schema: '', claimAddress: '' }; +const baseMsgOpenBeam: object = { id: '', creatorAddress: '', secret: '', schema: '', claimAddress: '', claimExpiresAtBlock: 0, closesAtBlock: 0 }; export const MsgOpenBeam = { encode(message: MsgOpenBeam, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { @@ -57,6 +62,12 @@ export const MsgOpenBeam = { if (message.claimAddress !== '') { writer.uint32(58).string(message.claimAddress); } + if (message.claimExpiresAtBlock !== 0) { + writer.uint32(64).int32(message.claimExpiresAtBlock); + } + if (message.closesAtBlock !== 0) { + writer.uint32(72).int32(message.closesAtBlock); + } return writer; }, @@ -88,6 +99,12 @@ export const MsgOpenBeam = { case 7: message.claimAddress = reader.string(); break; + case 8: + message.claimExpiresAtBlock = reader.int32(); + break; + case 9: + message.closesAtBlock = reader.int32(); + break; default: reader.skipType(tag & 7); break; @@ -133,6 +150,16 @@ export const MsgOpenBeam = { } else { message.claimAddress = ''; } + if (object.claimExpiresAtBlock !== undefined && object.claimExpiresAtBlock !== null) { + message.claimExpiresAtBlock = Number(object.claimExpiresAtBlock); + } else { + message.claimExpiresAtBlock = 0; + } + if (object.closesAtBlock !== undefined && object.closesAtBlock !== null) { + message.closesAtBlock = Number(object.closesAtBlock); + } else { + message.closesAtBlock = 0; + } return message; }, @@ -145,6 +172,8 @@ export const MsgOpenBeam = { message.schema !== undefined && (obj.schema = message.schema); message.data !== undefined && (obj.data = message.data ? BeamData.toJSON(message.data) : undefined); message.claimAddress !== undefined && (obj.claimAddress = message.claimAddress); + message.claimExpiresAtBlock !== undefined && (obj.claimExpiresAtBlock = message.claimExpiresAtBlock); + message.closesAtBlock !== undefined && (obj.closesAtBlock = message.closesAtBlock); return obj; }, @@ -185,11 +214,21 @@ export const MsgOpenBeam = { } else { message.claimAddress = ''; } + if (object.claimExpiresAtBlock !== undefined && object.claimExpiresAtBlock !== null) { + message.claimExpiresAtBlock = object.claimExpiresAtBlock; + } else { + message.claimExpiresAtBlock = 0; + } + if (object.closesAtBlock !== undefined && object.closesAtBlock !== null) { + message.closesAtBlock = object.closesAtBlock; + } else { + message.closesAtBlock = 0; + } return message; }, }; -const baseMsgUpdateBeam: object = { id: '', updaterAddress: '', status: 0, cancelReason: '', hideContent: false }; +const baseMsgUpdateBeam: object = { id: '', updaterAddress: '', status: 0, cancelReason: '', hideContent: false, claimAddress: '', claimExpiresAtBlock: 0, closesAtBlock: 0 }; export const MsgUpdateBeam = { encode(message: MsgUpdateBeam, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { @@ -214,6 +253,15 @@ export const MsgUpdateBeam = { if (message.data !== undefined) { BeamData.encode(message.data, writer.uint32(58).fork()).ldelim(); } + if (message.claimAddress !== '') { + writer.uint32(66).string(message.claimAddress); + } + if (message.claimExpiresAtBlock !== 0) { + writer.uint32(72).int32(message.claimExpiresAtBlock); + } + if (message.closesAtBlock !== 0) { + writer.uint32(80).int32(message.closesAtBlock); + } return writer; }, @@ -245,6 +293,15 @@ export const MsgUpdateBeam = { case 7: message.data = BeamData.decode(reader, reader.uint32()); break; + case 8: + message.claimAddress = reader.string(); + break; + case 9: + message.claimExpiresAtBlock = reader.int32(); + break; + case 10: + message.closesAtBlock = reader.int32(); + break; default: reader.skipType(tag & 7); break; @@ -290,6 +347,21 @@ export const MsgUpdateBeam = { } else { message.data = undefined; } + if (object.claimAddress !== undefined && object.claimAddress !== null) { + message.claimAddress = String(object.claimAddress); + } else { + message.claimAddress = ''; + } + if (object.claimExpiresAtBlock !== undefined && object.claimExpiresAtBlock !== null) { + message.claimExpiresAtBlock = Number(object.claimExpiresAtBlock); + } else { + message.claimExpiresAtBlock = 0; + } + if (object.closesAtBlock !== undefined && object.closesAtBlock !== null) { + message.closesAtBlock = Number(object.closesAtBlock); + } else { + message.closesAtBlock = 0; + } return message; }, @@ -302,6 +374,9 @@ export const MsgUpdateBeam = { message.cancelReason !== undefined && (obj.cancelReason = message.cancelReason); message.hideContent !== undefined && (obj.hideContent = message.hideContent); message.data !== undefined && (obj.data = message.data ? BeamData.toJSON(message.data) : undefined); + message.claimAddress !== undefined && (obj.claimAddress = message.claimAddress); + message.claimExpiresAtBlock !== undefined && (obj.claimExpiresAtBlock = message.claimExpiresAtBlock); + message.closesAtBlock !== undefined && (obj.closesAtBlock = message.closesAtBlock); return obj; }, @@ -342,6 +417,21 @@ export const MsgUpdateBeam = { } else { message.data = undefined; } + if (object.claimAddress !== undefined && object.claimAddress !== null) { + message.claimAddress = object.claimAddress; + } else { + message.claimAddress = ''; + } + if (object.claimExpiresAtBlock !== undefined && object.claimExpiresAtBlock !== null) { + message.claimExpiresAtBlock = object.claimExpiresAtBlock; + } else { + message.claimExpiresAtBlock = 0; + } + if (object.closesAtBlock !== undefined && object.closesAtBlock !== null) { + message.closesAtBlock = object.closesAtBlock; + } else { + message.closesAtBlock = 0; + } return message; }, }; diff --git a/src/messages/beam/MsgOpenBeam.ts b/src/messages/beam/MsgOpenBeam.ts index f234038..1b2468c 100644 --- a/src/messages/beam/MsgOpenBeam.ts +++ b/src/messages/beam/MsgOpenBeam.ts @@ -5,7 +5,17 @@ import { Coin } from '../../types'; export const MsgOpenBeamUrl = '/lum.network.beam.MsgOpenBeam'; -export const BuildMsgOpenBeam = (id: string, creatorAddress: string, claimAddress: string, amount: Coin, secret: string, schema: string, data?: BeamData): Message => { +export const BuildMsgOpenBeam = ( + id: string, + creatorAddress: string, + claimAddress: string, + amount: Coin, + secret: string, + schema: string, + data?: BeamData, + closesAtBlock = 0, + claimExpiresAtBlock = 0, +): Message => { return { typeUrl: MsgOpenBeamUrl, value: { @@ -16,6 +26,8 @@ export const BuildMsgOpenBeam = (id: string, creatorAddress: string, claimAddres secret, schema, data, + claimExpiresAtBlock, + closesAtBlock, } as MsgOpenBeam, }; }; diff --git a/src/messages/beam/MsgUpdateBeam.ts b/src/messages/beam/MsgUpdateBeam.ts index 2b9accf..827dac4 100644 --- a/src/messages/beam/MsgUpdateBeam.ts +++ b/src/messages/beam/MsgUpdateBeam.ts @@ -5,7 +5,18 @@ import { Coin } from '../../types'; export const MsgUpdateBeamUrl = '/lum.network.beam.MsgUpdateBeam'; -export const BuildMsgUpdateBeam = (id: string, updaterAddress: string, amount: Coin, status?: BeamState, data?: BeamData, cancelReason = '', hideContent = false): Message => { +export const BuildMsgUpdateBeam = ( + id: string, + updaterAddress: string, + amount: Coin, + status?: BeamState, + data?: BeamData, + cancelReason = '', + hideContent = false, + claimAddress = '', + closesAtBlock = 0, + claimExpiresAtBlock = 0, +): Message => { return { typeUrl: MsgUpdateBeamUrl, value: { @@ -16,6 +27,9 @@ export const BuildMsgUpdateBeam = (id: string, updaterAddress: string, amount: C data, cancelReason, hideContent, + claimAddress, + closesAtBlock, + claimExpiresAtBlock, } as MsgUpdateBeam, }; };