Skip to content

Commit 4d83a80

Browse files
authored
Merge branch 'main' into fix/3138
2 parents 2a175df + 07763fe commit 4d83a80

File tree

24 files changed

+1071
-258
lines changed

24 files changed

+1071
-258
lines changed

dev-docs/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1212
- [fix] Disallow self-inheritance for contracts and traits: PR [#3094](https://github.com/tact-lang/tact/pull/3094)
1313
- [fix] Added fixed-bytes support to bounced message size calculations: PR [#3129](https://github.com/tact-lang/tact/pull/3129)
1414
- [fix] Fixed compiler crashes when a contract name exceeds filesystem limits: PR [#3219](https://github.com/tact-lang/tact/pull/3219)
15+
- Compiler now generates more efficient code for serialization: PR [#3213](https://github.com/tact-lang/tact/pull/3213)
16+
- [fix] Compiler now doesn't generate `__tact_nop()` for `dump()` and `dumpStack()` in default mode: PR [#3218](https://github.com/tact-lang/tact/pull/3218)
1517

1618
### Docs
1719

src/abi/global.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ export const GlobalFunctions: Map<string, AbiFunction> = new Map([
250250
},
251251
generate: (ctx, args, resolved, ref) => {
252252
if (!enabledDebug(ctx.ctx)) {
253-
return `${ctx.used("__tact_nop")}()`;
253+
return ``;
254254
}
255255
const arg0 = args[0]!;
256256

@@ -319,7 +319,7 @@ export const GlobalFunctions: Map<string, AbiFunction> = new Map([
319319
},
320320
generate: (ctx, _args, _resolved, ref) => {
321321
if (!enabledDebug(ctx.ctx)) {
322-
return `${ctx.used("__tact_nop")}()`;
322+
return ``;
323323
}
324324
const filePath = ref.file
325325
? posixNormalize(path.relative(cwd(), ref.file!))

src/benchmarks/escrow/results_code_size.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,14 @@
7979
"cells": "20",
8080
"bits": "11575"
8181
}
82+
},
83+
{
84+
"label": "1.6.10 with store_slice optimization",
85+
"pr": "https://github.com/tact-lang/tact/pull/3213",
86+
"size": {
87+
"cells": "20",
88+
"bits": "11327"
89+
}
8290
}
8391
]
8492
}

src/benchmarks/escrow/results_gas.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,16 @@
229229
"approveTon": "6738",
230230
"cancelTon": "4639"
231231
}
232+
},
233+
{
234+
"label": "1.6.10 with store_slice optimization",
235+
"pr": "https://github.com/tact-lang/tact/pull/3213",
236+
"gas": {
237+
"fundingTon": "4303",
238+
"changeCode": "4394",
239+
"approveTon": "6738",
240+
"cancelTon": "4639"
241+
}
232242
}
233243
]
234244
}

src/benchmarks/func.build.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ const main = async () => {
55
// Disable version number in packages
66
__DANGER__disableVersionNumber();
77

8-
await allInFolderFunc(__dirname, ["./**/func/**/*.fc"]);
8+
await allInFolderFunc(__dirname, `${__dirname}/../func/stdlib`, [
9+
"./**/func/**/*.fc",
10+
]);
911
};
1012

1113
void main();

src/benchmarks/jetton/results_code_size.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,16 @@
139139
"wallet cells": "16",
140140
"wallet bits": "8195"
141141
}
142+
},
143+
{
144+
"label": "1.6.10 with store_slice optimization",
145+
"pr": "https://github.com/tact-lang/tact/pull/3213",
146+
"size": {
147+
"minter cells": "27",
148+
"minter bits": "14225",
149+
"wallet cells": "14",
150+
"wallet bits": "7884"
151+
}
142152
}
143153
]
144154
}

src/benchmarks/jetton/results_gas.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,15 @@
359359
"burn": "11812",
360360
"discovery": "6161"
361361
}
362+
},
363+
{
364+
"label": "1.6.10 with store_slice optimization",
365+
"pr": "https://github.com/tact-lang/tact/pull/3213",
366+
"gas": {
367+
"transfer": "14859",
368+
"burn": "11728",
369+
"discovery": "6135"
370+
}
362371
}
363372
]
364373
}

src/benchmarks/nft/results_code_size.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,16 @@
139139
"item cells": "10",
140140
"item bits": "5625"
141141
}
142+
},
143+
{
144+
"label": "1.6.10 with store_slice optimization",
145+
"pr": "https://github.com/tact-lang/tact/pull/3213",
146+
"size": {
147+
"collection cells": "38",
148+
"collection bits": "20444",
149+
"item cells": "10",
150+
"item bits": "5609"
151+
}
142152
}
143153
]
144154
}

src/benchmarks/nft/results_gas.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,16 @@
129129
"deploy nft": "10683",
130130
"batch deploy nft": "663906"
131131
}
132+
},
133+
{
134+
"label": "1.6.10 with store_slice optimization",
135+
"pr": "https://github.com/tact-lang/tact/pull/3213",
136+
"gas": {
137+
"transfer": "7307",
138+
"get static data": "4697",
139+
"deploy nft": "10661",
140+
"batch deploy nft": "664054"
141+
}
132142
}
133143
]
134144
}

src/benchmarks/notcoin/results_code_size.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,16 @@
7979
"wallet cells": "14",
8080
"wallet bits": "8068"
8181
}
82+
},
83+
{
84+
"label": "1.6.10 with store_slice optimization",
85+
"pr": "https://github.com/tact-lang/tact/pull/3213",
86+
"size": {
87+
"minter cells": "28",
88+
"minter bits": "15764",
89+
"wallet cells": "13",
90+
"wallet bits": "7844"
91+
}
8292
}
8393
]
8494
}

0 commit comments

Comments
 (0)