Skip to content

Commit 006bd05

Browse files
SegfaultdSegfaultd
committed
Added missing auto close / expire features
1 parent 48b8c2f commit 006bd05

File tree

4 files changed

+171
-6
lines changed

4 files changed

+171
-6
lines changed

‎src/codec/chain/beam/beam.ts‎

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ export interface Beam {
161161
hideContent: boolean;
162162
schema: string;
163163
data?: BeamData;
164+
claimExpiresAtBlock: number;
165+
closesAtBlock: number;
164166
}
165167

166168
const baseBeamMedia: object = { mimetype: '', url: '', thumbnailUrl: '' };
@@ -1829,7 +1831,20 @@ export const BeamData = {
18291831
},
18301832
};
18311833

1832-
const baseBeam: object = { creatorAddress: '', id: '', status: 0, secret: '', claimAddress: '', fundsWithdrawn: false, claimed: false, cancelReason: '', hideContent: false, schema: '' };
1834+
const baseBeam: object = {
1835+
creatorAddress: '',
1836+
id: '',
1837+
status: 0,
1838+
secret: '',
1839+
claimAddress: '',
1840+
fundsWithdrawn: false,
1841+
claimed: false,
1842+
cancelReason: '',
1843+
hideContent: false,
1844+
schema: '',
1845+
claimExpiresAtBlock: 0,
1846+
closesAtBlock: 0,
1847+
};
18331848

18341849
export const Beam = {
18351850
encode(message: Beam, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
@@ -1869,6 +1884,12 @@ export const Beam = {
18691884
if (message.data !== undefined) {
18701885
BeamData.encode(message.data, writer.uint32(98).fork()).ldelim();
18711886
}
1887+
if (message.claimExpiresAtBlock !== 0) {
1888+
writer.uint32(104).int32(message.claimExpiresAtBlock);
1889+
}
1890+
if (message.closesAtBlock !== 0) {
1891+
writer.uint32(112).int32(message.closesAtBlock);
1892+
}
18721893
return writer;
18731894
},
18741895

@@ -1915,6 +1936,12 @@ export const Beam = {
19151936
case 12:
19161937
message.data = BeamData.decode(reader, reader.uint32());
19171938
break;
1939+
case 13:
1940+
message.claimExpiresAtBlock = reader.int32();
1941+
break;
1942+
case 14:
1943+
message.closesAtBlock = reader.int32();
1944+
break;
19181945
default:
19191946
reader.skipType(tag & 7);
19201947
break;
@@ -1985,6 +2012,16 @@ export const Beam = {
19852012
} else {
19862013
message.data = undefined;
19872014
}
2015+
if (object.claimExpiresAtBlock !== undefined && object.claimExpiresAtBlock !== null) {
2016+
message.claimExpiresAtBlock = Number(object.claimExpiresAtBlock);
2017+
} else {
2018+
message.claimExpiresAtBlock = 0;
2019+
}
2020+
if (object.closesAtBlock !== undefined && object.closesAtBlock !== null) {
2021+
message.closesAtBlock = Number(object.closesAtBlock);
2022+
} else {
2023+
message.closesAtBlock = 0;
2024+
}
19882025
return message;
19892026
},
19902027

@@ -2002,6 +2039,8 @@ export const Beam = {
20022039
message.hideContent !== undefined && (obj.hideContent = message.hideContent);
20032040
message.schema !== undefined && (obj.schema = message.schema);
20042041
message.data !== undefined && (obj.data = message.data ? BeamData.toJSON(message.data) : undefined);
2042+
message.claimExpiresAtBlock !== undefined && (obj.claimExpiresAtBlock = message.claimExpiresAtBlock);
2043+
message.closesAtBlock !== undefined && (obj.closesAtBlock = message.closesAtBlock);
20052044
return obj;
20062045
},
20072046

@@ -2067,6 +2106,16 @@ export const Beam = {
20672106
} else {
20682107
message.data = undefined;
20692108
}
2109+
if (object.claimExpiresAtBlock !== undefined && object.claimExpiresAtBlock !== null) {
2110+
message.claimExpiresAtBlock = object.claimExpiresAtBlock;
2111+
} else {
2112+
message.claimExpiresAtBlock = 0;
2113+
}
2114+
if (object.closesAtBlock !== undefined && object.closesAtBlock !== null) {
2115+
message.closesAtBlock = object.closesAtBlock;
2116+
} else {
2117+
message.closesAtBlock = 0;
2118+
}
20702119
return message;
20712120
},
20722121
};

‎src/codec/chain/beam/tx.ts‎

Lines changed: 93 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import Long from 'long';
33
import _m0 from 'protobufjs/minimal';
44
import { Coin } from '../../cosmos/base/v1beta1/coin';
5-
import { BeamData, BeamState, beamStateFromJSON, beamStateToJSON } from '../beam/beam';
5+
import { BeamData, BeamState, beamStateFromJSON, beamStateToJSON } from './beam';
66

77
export const protobufPackage = 'lum.network.beam';
88

@@ -14,6 +14,8 @@ export interface MsgOpenBeam {
1414
schema: string;
1515
data?: BeamData;
1616
claimAddress: string;
17+
claimExpiresAtBlock: number;
18+
closesAtBlock: number;
1719
}
1820

1921
export interface MsgUpdateBeam {
@@ -24,6 +26,9 @@ export interface MsgUpdateBeam {
2426
cancelReason: string;
2527
hideContent: boolean;
2628
data?: BeamData;
29+
claimAddress: string;
30+
claimExpiresAtBlock: number;
31+
closesAtBlock: number;
2732
}
2833

2934
export interface MsgClaimBeam {
@@ -32,7 +37,7 @@ export interface MsgClaimBeam {
3237
secret: string;
3338
}
3439

35-
const baseMsgOpenBeam: object = { id: '', creatorAddress: '', secret: '', schema: '', claimAddress: '' };
40+
const baseMsgOpenBeam: object = { id: '', creatorAddress: '', secret: '', schema: '', claimAddress: '', claimExpiresAtBlock: 0, closesAtBlock: 0 };
3641

3742
export const MsgOpenBeam = {
3843
encode(message: MsgOpenBeam, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
@@ -57,6 +62,12 @@ export const MsgOpenBeam = {
5762
if (message.claimAddress !== '') {
5863
writer.uint32(58).string(message.claimAddress);
5964
}
65+
if (message.claimExpiresAtBlock !== 0) {
66+
writer.uint32(64).int32(message.claimExpiresAtBlock);
67+
}
68+
if (message.closesAtBlock !== 0) {
69+
writer.uint32(72).int32(message.closesAtBlock);
70+
}
6071
return writer;
6172
},
6273

@@ -88,6 +99,12 @@ export const MsgOpenBeam = {
8899
case 7:
89100
message.claimAddress = reader.string();
90101
break;
102+
case 8:
103+
message.claimExpiresAtBlock = reader.int32();
104+
break;
105+
case 9:
106+
message.closesAtBlock = reader.int32();
107+
break;
91108
default:
92109
reader.skipType(tag & 7);
93110
break;
@@ -133,6 +150,16 @@ export const MsgOpenBeam = {
133150
} else {
134151
message.claimAddress = '';
135152
}
153+
if (object.claimExpiresAtBlock !== undefined && object.claimExpiresAtBlock !== null) {
154+
message.claimExpiresAtBlock = Number(object.claimExpiresAtBlock);
155+
} else {
156+
message.claimExpiresAtBlock = 0;
157+
}
158+
if (object.closesAtBlock !== undefined && object.closesAtBlock !== null) {
159+
message.closesAtBlock = Number(object.closesAtBlock);
160+
} else {
161+
message.closesAtBlock = 0;
162+
}
136163
return message;
137164
},
138165

@@ -145,6 +172,8 @@ export const MsgOpenBeam = {
145172
message.schema !== undefined && (obj.schema = message.schema);
146173
message.data !== undefined && (obj.data = message.data ? BeamData.toJSON(message.data) : undefined);
147174
message.claimAddress !== undefined && (obj.claimAddress = message.claimAddress);
175+
message.claimExpiresAtBlock !== undefined && (obj.claimExpiresAtBlock = message.claimExpiresAtBlock);
176+
message.closesAtBlock !== undefined && (obj.closesAtBlock = message.closesAtBlock);
148177
return obj;
149178
},
150179

@@ -185,11 +214,21 @@ export const MsgOpenBeam = {
185214
} else {
186215
message.claimAddress = '';
187216
}
217+
if (object.claimExpiresAtBlock !== undefined && object.claimExpiresAtBlock !== null) {
218+
message.claimExpiresAtBlock = object.claimExpiresAtBlock;
219+
} else {
220+
message.claimExpiresAtBlock = 0;
221+
}
222+
if (object.closesAtBlock !== undefined && object.closesAtBlock !== null) {
223+
message.closesAtBlock = object.closesAtBlock;
224+
} else {
225+
message.closesAtBlock = 0;
226+
}
188227
return message;
189228
},
190229
};
191230

192-
const baseMsgUpdateBeam: object = { id: '', updaterAddress: '', status: 0, cancelReason: '', hideContent: false };
231+
const baseMsgUpdateBeam: object = { id: '', updaterAddress: '', status: 0, cancelReason: '', hideContent: false, claimAddress: '', claimExpiresAtBlock: 0, closesAtBlock: 0 };
193232

194233
export const MsgUpdateBeam = {
195234
encode(message: MsgUpdateBeam, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
@@ -214,6 +253,15 @@ export const MsgUpdateBeam = {
214253
if (message.data !== undefined) {
215254
BeamData.encode(message.data, writer.uint32(58).fork()).ldelim();
216255
}
256+
if (message.claimAddress !== '') {
257+
writer.uint32(66).string(message.claimAddress);
258+
}
259+
if (message.claimExpiresAtBlock !== 0) {
260+
writer.uint32(72).int32(message.claimExpiresAtBlock);
261+
}
262+
if (message.closesAtBlock !== 0) {
263+
writer.uint32(80).int32(message.closesAtBlock);
264+
}
217265
return writer;
218266
},
219267

@@ -245,6 +293,15 @@ export const MsgUpdateBeam = {
245293
case 7:
246294
message.data = BeamData.decode(reader, reader.uint32());
247295
break;
296+
case 8:
297+
message.claimAddress = reader.string();
298+
break;
299+
case 9:
300+
message.claimExpiresAtBlock = reader.int32();
301+
break;
302+
case 10:
303+
message.closesAtBlock = reader.int32();
304+
break;
248305
default:
249306
reader.skipType(tag & 7);
250307
break;
@@ -290,6 +347,21 @@ export const MsgUpdateBeam = {
290347
} else {
291348
message.data = undefined;
292349
}
350+
if (object.claimAddress !== undefined && object.claimAddress !== null) {
351+
message.claimAddress = String(object.claimAddress);
352+
} else {
353+
message.claimAddress = '';
354+
}
355+
if (object.claimExpiresAtBlock !== undefined && object.claimExpiresAtBlock !== null) {
356+
message.claimExpiresAtBlock = Number(object.claimExpiresAtBlock);
357+
} else {
358+
message.claimExpiresAtBlock = 0;
359+
}
360+
if (object.closesAtBlock !== undefined && object.closesAtBlock !== null) {
361+
message.closesAtBlock = Number(object.closesAtBlock);
362+
} else {
363+
message.closesAtBlock = 0;
364+
}
293365
return message;
294366
},
295367

@@ -302,6 +374,9 @@ export const MsgUpdateBeam = {
302374
message.cancelReason !== undefined && (obj.cancelReason = message.cancelReason);
303375
message.hideContent !== undefined && (obj.hideContent = message.hideContent);
304376
message.data !== undefined && (obj.data = message.data ? BeamData.toJSON(message.data) : undefined);
377+
message.claimAddress !== undefined && (obj.claimAddress = message.claimAddress);
378+
message.claimExpiresAtBlock !== undefined && (obj.claimExpiresAtBlock = message.claimExpiresAtBlock);
379+
message.closesAtBlock !== undefined && (obj.closesAtBlock = message.closesAtBlock);
305380
return obj;
306381
},
307382

@@ -342,6 +417,21 @@ export const MsgUpdateBeam = {
342417
} else {
343418
message.data = undefined;
344419
}
420+
if (object.claimAddress !== undefined && object.claimAddress !== null) {
421+
message.claimAddress = object.claimAddress;
422+
} else {
423+
message.claimAddress = '';
424+
}
425+
if (object.claimExpiresAtBlock !== undefined && object.claimExpiresAtBlock !== null) {
426+
message.claimExpiresAtBlock = object.claimExpiresAtBlock;
427+
} else {
428+
message.claimExpiresAtBlock = 0;
429+
}
430+
if (object.closesAtBlock !== undefined && object.closesAtBlock !== null) {
431+
message.closesAtBlock = object.closesAtBlock;
432+
} else {
433+
message.closesAtBlock = 0;
434+
}
345435
return message;
346436
},
347437
};

‎src/messages/beam/MsgOpenBeam.ts‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,17 @@ import { Coin } from '../../types';
55

66
export const MsgOpenBeamUrl = '/lum.network.beam.MsgOpenBeam';
77

8-
export const BuildMsgOpenBeam = (id: string, creatorAddress: string, claimAddress: string, amount: Coin, secret: string, schema: string, data?: BeamData): Message => {
8+
export const BuildMsgOpenBeam = (
9+
id: string,
10+
creatorAddress: string,
11+
claimAddress: string,
12+
amount: Coin,
13+
secret: string,
14+
schema: string,
15+
data?: BeamData,
16+
closesAtBlock = 0,
17+
claimExpiresAtBlock = 0,
18+
): Message => {
919
return {
1020
typeUrl: MsgOpenBeamUrl,
1121
value: {
@@ -16,6 +26,8 @@ export const BuildMsgOpenBeam = (id: string, creatorAddress: string, claimAddres
1626
secret,
1727
schema,
1828
data,
29+
claimExpiresAtBlock,
30+
closesAtBlock,
1931
} as MsgOpenBeam,
2032
};
2133
};

‎src/messages/beam/MsgUpdateBeam.ts‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,18 @@ import { Coin } from '../../types';
55

66
export const MsgUpdateBeamUrl = '/lum.network.beam.MsgUpdateBeam';
77

8-
export const BuildMsgUpdateBeam = (id: string, updaterAddress: string, amount: Coin, status?: BeamState, data?: BeamData, cancelReason = '', hideContent = false): Message => {
8+
export const BuildMsgUpdateBeam = (
9+
id: string,
10+
updaterAddress: string,
11+
amount: Coin,
12+
status?: BeamState,
13+
data?: BeamData,
14+
cancelReason = '',
15+
hideContent = false,
16+
claimAddress = '',
17+
closesAtBlock = 0,
18+
claimExpiresAtBlock = 0,
19+
): Message => {
920
return {
1021
typeUrl: MsgUpdateBeamUrl,
1122
value: {
@@ -16,6 +27,9 @@ export const BuildMsgUpdateBeam = (id: string, updaterAddress: string, amount: C
1627
data,
1728
cancelReason,
1829
hideContent,
30+
claimAddress,
31+
closesAtBlock,
32+
claimExpiresAtBlock,
1933
} as MsgUpdateBeam,
2034
};
2135
};

0 commit comments

Comments
 (0)