Skip to content

Commit 61ebed4

Browse files
boblatboblat
committed
chore: update versions of puya-ts and algotsdependencies
1 parent 37bdf71 commit 61ebed4

File tree

6 files changed

+46
-36
lines changed

6 files changed

+46
-36
lines changed

‎package-lock.json‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
"tslib": "^2.6.2"
7272
},
7373
"dependencies": {
74-
"@algorandfoundation/algorand-typescript": "^1.0.0-beta.19",
75-
"@algorandfoundation/puya-ts": "^1.0.0-beta.26",
74+
"@algorandfoundation/algorand-typescript": "^1.0.0-beta.20",
75+
"@algorandfoundation/puya-ts": "^1.0.0-beta.28",
7676
"elliptic": "^6.5.7",
7777
"js-sha256": "^0.11.0",
7878
"js-sha3": "^0.9.3",

‎src/impl/encoded-types.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ export class StaticArrayImpl<TItem extends ARC4Encoded, TLength extends number>
346346
constructor(typeInfo: TypeInfo | string, ...items: TItem[] & { length: TLength })
347347
constructor(typeInfo: TypeInfo | string, ...items: TItem[])
348348
constructor(typeInfo: TypeInfo | string, ...items: TItem[] & { length: TLength }) {
349-
super(...items)
349+
super(...(items as DeliberateAny))
350350
this.typeInfo = typeof typeInfo === 'string' ? JSON.parse(typeInfo) : typeInfo
351351
this.genericArgs = this.typeInfo.genericArgs as StaticArrayGenericArgs
352352

@@ -536,7 +536,7 @@ export class DynamicArrayImpl<TItem extends ARC4Encoded> extends DynamicArray<TI
536536
genericArgs: DynamicArrayGenericArgs
537537

538538
constructor(typeInfo: TypeInfo | string, ...items: TItem[]) {
539-
super(...items)
539+
super(...(items as TItem[]))
540540
this.typeInfo = typeof typeInfo === 'string' ? JSON.parse(typeInfo) : typeInfo
541541
this.genericArgs = this.typeInfo.genericArgs as DynamicArrayGenericArgs
542542

‎tests/arc4/dynamic-array.spec.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,12 +233,14 @@ const uint256DynamicArrayOfStaticArray = {
233233
return [uint256DynamicArray.nativeValues(), uint256DynamicArray.nativeValues().reverse()]
234234
},
235235
abiValues() {
236-
return this.nativeValues().map((a) => new StaticArray<UintN<256>, 10>(...a.map((v) => new UintN<256>(v))))
236+
return this.nativeValues().map((a) => new StaticArray<UintN<256>, 10>(...(a.map((v) => new UintN<256>(v)) as [])))
237237
},
238238
array(isEmpty = false) {
239239
return isEmpty
240240
? new DynamicArray<StaticArray<UintN<256>, 10>>()
241-
: new DynamicArray<StaticArray<UintN<256>, 10>>(...this.abiValues().map((a) => new StaticArray<UintN<256>, 10>(...a)))
241+
: new DynamicArray<StaticArray<UintN<256>, 10>>(
242+
...this.abiValues().map((a) => new StaticArray<UintN<256>, 10>(...(a as DeliberateAny))),
243+
)
242244
},
243245
create(value: StubBytesCompat) {
244246
return interpretAsArc4<DynamicArray<StaticArray<UintN<256>, 10>>>(asBytes(value))
@@ -328,7 +330,7 @@ const tupleDynamicArray = {
328330
addressDynamicArray.abiValues()[5],
329331
),
330332
boolDynamicArray.abiValues()[3],
331-
new StaticArray<UintN<256>, 3>(...uint256DynamicArray.abiValues().slice(4, 7)),
333+
new StaticArray<UintN<256>, 3>(...(uint256DynamicArray.abiValues().slice(4, 7) as [])),
332334
],
333335
),
334336
)

‎tests/arc4/static-array.spec.ts‎

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const addressStaticArray = {
4040
return this.nativeValues().map((v) => new Address(Bytes(v)))
4141
},
4242
array() {
43-
return new StaticArray<Address, 10>(...this.abiValues())
43+
return new StaticArray<Address, 10>(...(this.abiValues() as []))
4444
},
4545
create(value: StubBytesCompat) {
4646
return interpretAsArc4<StaticArray<Address, 10>>(asBytes(value))
@@ -61,7 +61,7 @@ const boolStaticArray = {
6161
return this.nativeValues().map((v) => new Bool(v))
6262
},
6363
array() {
64-
return new StaticArray<Bool, 10>(...this.abiValues())
64+
return new StaticArray<Bool, 10>(...(this.abiValues() as []))
6565
},
6666
create(value: StubBytesCompat) {
6767
return interpretAsArc4<StaticArray<Bool, 10>>(asBytes(value))
@@ -82,7 +82,7 @@ const uint256StaticArray = {
8282
return this.nativeValues().map((v) => new UintN<256>(v))
8383
},
8484
array() {
85-
return new StaticArray<UintN<256>, 10>(...this.abiValues())
85+
return new StaticArray<UintN<256>, 10>(...(this.abiValues() as []))
8686
},
8787
create(value: StubBytesCompat) {
8888
return interpretAsArc4<StaticArray<UintN<256>, 10>>(asBytes(value))
@@ -114,7 +114,7 @@ const ufixednxmStaticArray = {
114114
]
115115
},
116116
array() {
117-
return new StaticArray<UFixedNxM<256, 16>, 10>(...this.abiValues())
117+
return new StaticArray<UFixedNxM<256, 16>, 10>(...(this.abiValues() as []))
118118
},
119119
create(value: StubBytesCompat) {
120120
return interpretAsArc4<StaticArray<UFixedNxM<256, 16>, 10>>(asBytes(value))
@@ -146,7 +146,7 @@ const stringStaticArray = {
146146
return this.nativeValues().map((v) => new Str(v))
147147
},
148148
array() {
149-
return new StaticArray<Str, 10>(...this.abiValues())
149+
return new StaticArray<Str, 10>(...(this.abiValues() as []))
150150
},
151151
create(value: StubBytesCompat) {
152152
return interpretAsArc4<StaticArray<Str, 10>>(asBytes(value))
@@ -164,10 +164,12 @@ const addressStaticArrayOfArray = {
164164
return [addressStaticArray.nativeValues(), addressStaticArray.nativeValues().reverse()]
165165
},
166166
abiValues() {
167-
return this.nativeValues().map((a) => new StaticArray<Address, 10>(...a.map((v) => new Address(Bytes(v)))))
167+
return this.nativeValues().map((a) => new StaticArray<Address, 10>(...(a.map((v) => new Address(Bytes(v))) as [])))
168168
},
169169
array() {
170-
return new StaticArray<StaticArray<Address, 10>, 2>(...this.abiValues().map((a) => new StaticArray<Address, 10>(...a)))
170+
return new StaticArray<StaticArray<Address, 10>, 2>(
171+
...(this.abiValues().map((a) => new StaticArray<Address, 10>(...(a as DeliberateAny))) as []),
172+
)
171173
},
172174
create(value: StubBytesCompat) {
173175
return interpretAsArc4<StaticArray<StaticArray<Address, 10>, 2>>(asBytes(value))
@@ -185,10 +187,12 @@ const boolStaticArrayOfArray = {
185187
return [boolStaticArray.nativeValues(), boolStaticArray.nativeValues().reverse()]
186188
},
187189
abiValues() {
188-
return this.nativeValues().map((a) => new StaticArray<Bool, 10>(...a.map((v) => new Bool(v))))
190+
return this.nativeValues().map((a) => new StaticArray<Bool, 10>(...(a.map((v) => new Bool(v)) as [])))
189191
},
190192
array() {
191-
return new StaticArray<StaticArray<Bool, 10>, 2>(...this.abiValues().map((a) => new StaticArray<Bool, 10>(...a)))
193+
return new StaticArray<StaticArray<Bool, 10>, 2>(
194+
...(this.abiValues().map((a) => new StaticArray<Bool, 10>(...(a as DeliberateAny))) as []),
195+
)
192196
},
193197
create(value: StubBytesCompat) {
194198
return interpretAsArc4<StaticArray<StaticArray<Bool, 10>, 2>>(asBytes(value))
@@ -206,10 +210,12 @@ const uint256StaticArrayOfArray = {
206210
return [uint256StaticArray.nativeValues(), uint256StaticArray.nativeValues().reverse()]
207211
},
208212
abiValues() {
209-
return this.nativeValues().map((a) => new StaticArray<UintN<256>, 10>(...a.map((v) => new UintN<256>(v))))
213+
return this.nativeValues().map((a) => new StaticArray<UintN<256>, 10>(...(a.map((v) => new UintN<256>(v)) as [])))
210214
},
211215
array() {
212-
return new StaticArray<StaticArray<UintN<256>, 10>, 2>(...this.abiValues().map((a) => new StaticArray<UintN<256>, 10>(...a)))
216+
return new StaticArray<StaticArray<UintN<256>, 10>, 2>(
217+
...(this.abiValues().map((a) => new StaticArray<UintN<256>, 10>(...(a as DeliberateAny))) as []),
218+
)
213219
},
214220
create(value: StubBytesCompat) {
215221
return interpretAsArc4<StaticArray<StaticArray<UintN<256>, 10>, 2>>(asBytes(value))
@@ -230,7 +236,7 @@ const uint256StaticArrayOfDynamicArray = {
230236
return this.nativeValues().map((a) => new DynamicArray<UintN<256>>(...a.map((v) => new UintN<256>(v))))
231237
},
232238
array() {
233-
return new StaticArray<DynamicArray<UintN<256>>, 2>(...this.abiValues().map((a) => new DynamicArray<UintN<256>>(...a)))
239+
return new StaticArray<DynamicArray<UintN<256>>, 2>(...(this.abiValues().map((a) => new DynamicArray<UintN<256>>(...a)) as []))
234240
},
235241
create(value: StubBytesCompat) {
236242
return interpretAsArc4<StaticArray<DynamicArray<UintN<256>>, 2>>(asBytes(value))
@@ -248,10 +254,12 @@ const stringStaticArrayOfArray = {
248254
return [stringStaticArray.nativeValues(), stringStaticArray.nativeValues().reverse()]
249255
},
250256
abiValues() {
251-
return this.nativeValues().map((a) => new StaticArray<Str, 10>(...a.map((v) => new Str(v))))
257+
return this.nativeValues().map((a) => new StaticArray<Str, 10>(...(a.map((v) => new Str(v)) as [])))
252258
},
253259
array() {
254-
return new StaticArray<StaticArray<Str, 10>, 2>(...this.abiValues().map((a) => new StaticArray<Str, 10>(...a)))
260+
return new StaticArray<StaticArray<Str, 10>, 2>(
261+
...(this.abiValues().map((a) => new StaticArray<Str, 10>(...(a as DeliberateAny))) as []),
262+
)
255263
},
256264
create(value: StubBytesCompat) {
257265
return interpretAsArc4<StaticArray<StaticArray<Str, 10>, 2>>(asBytes(value))
@@ -273,12 +281,13 @@ const stringStaticArrayOfArrayOfArray = {
273281
},
274282
abiValues() {
275283
return this.nativeValues().map(
276-
(x) => new StaticArray<StaticArray<Str, 10>, 3>(...x.map((y) => new StaticArray<Str, 10>(...y.map((v) => new Str(v))))),
284+
(x) =>
285+
new StaticArray<StaticArray<Str, 10>, 3>(...(x.map((y) => new StaticArray<Str, 10>(...(y.map((v) => new Str(v)) as []))) as [])),
277286
)
278287
},
279288
array() {
280289
return new StaticArray<StaticArray<StaticArray<Str, 10>, 3>, 2>(
281-
...this.abiValues().map((x) => new StaticArray<StaticArray<Str, 10>, 3>(...x)),
290+
...(this.abiValues().map((x) => new StaticArray<StaticArray<Str, 10>, 3>(...(x as DeliberateAny))) as []),
282291
)
283292
},
284293
create(value: StubBytesCompat) {
@@ -318,7 +327,7 @@ const tupleStaticArray = {
318327
addressStaticArray.abiValues()[5],
319328
),
320329
boolStaticArray.abiValues()[3],
321-
new StaticArray<UintN<256>, 3>(...uint256StaticArray.abiValues().slice(4, 7)),
330+
new StaticArray<UintN<256>, 3>(...(uint256StaticArray.abiValues().slice(4, 7) as [])),
322331
],
323332
),
324333
)
@@ -327,7 +336,7 @@ const tupleStaticArray = {
327336
return new StaticArray<
328337
Tuple<[DynamicArray<Str>, Tuple<[DynamicArray<Str>, Str, UintN<256>, Address]>, Bool, StaticArray<UintN<256>, 3>]>,
329338
2
330-
>(...this.abiValues())
339+
>(...(this.abiValues() as []))
331340
},
332341
create(value: StubBytesCompat) {
333342
return interpretAsArc4<
@@ -390,7 +399,7 @@ const structStaticArray = {
390399
)
391400
},
392401
array() {
393-
return new StaticArray<Swapped, 2>(...this.abiValues())
402+
return new StaticArray<Swapped, 2>(...(this.abiValues() as []))
394403
},
395404
create(value: StubBytesCompat) {
396405
return interpretAsArc4<StaticArray<Swapped, 2>>(asBytes(value))

‎tests/test-fixture.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,10 +248,9 @@ async function compilePath(
248248
outputDestructuredIr: false,
249249
outputMemoryIr: false,
250250

251-
matchAlgodBytecode: false,
252251
debugLevel: 1,
253252
targetAvmVersion: 10,
254-
cliTemplateDefinitions: [],
253+
cliTemplateDefinitions: {},
255254
templateVarsPrefix: 'TMPL_',
256255
localsCoalescingStrategy: 'root_operand' as Parameters<typeof compile>[0]['localsCoalescingStrategy'],
257256

0 commit comments

Comments
 (0)