Skip to content

Commit

Permalink
Tact release 1.5.3 (#40)
Browse files Browse the repository at this point in the history
* Update @tact-lang/compiler to 1.5.3

* Remove `masterchain` option from `tact.config.json` to
  let Tact's CI not fail because this feature will be
  removed in Tact 1.6

* Disable Souffle installation in CI because of an unmet dependency:
  > souffle : Depends: libffi7 (>= 3.3~20180313) but it is not installable
  • Loading branch information
anton-trunov authored Dec 18, 2024
1 parent 242db98 commit 43bc4e4
Show file tree
Hide file tree
Showing 8 changed files with 57 additions and 47 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2

- name: Install Soufflé on Ubuntu
if: matrix.os == 'ubuntu-latest'
run: |
sudo wget https://souffle-lang.github.io/ppa/souffle-key.public -O /usr/share/keyrings/souffle-archive-keyring.gpg
echo "deb [signed-by=/usr/share/keyrings/souffle-archive-keyring.gpg] https://souffle-lang.github.io/ppa/ubuntu/ stable main" | sudo tee /etc/apt/sources.list.d/souffle.list
sudo apt update
sudo apt install souffle
# - name: Install Soufflé on Ubuntu
# if: matrix.os == 'ubuntu-latest'
# run: |
# sudo wget https://souffle-lang.github.io/ppa/souffle-key.public -O /usr/share/keyrings/souffle-archive-keyring.gpg
# echo "deb [signed-by=/usr/share/keyrings/souffle-archive-keyring.gpg] https://souffle-lang.github.io/ppa/ubuntu/ stable main" | sudo tee /etc/apt/sources.list.d/souffle.list
# sudo apt update
# sudo apt install souffle

- name: Setup Node.js
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"@nowarp/misti": "~0.5.0",
"@tact-lang/compiler": "~1.5.0",
"@tact-lang/compiler": "~1.5.3",
"@tact-lang/deployer": "^0.2.0",
"@tact-lang/ton-abi": "^0.0.3",
"@tact-lang/ton-jest": "^0.0.4",
Expand Down
24 changes: 12 additions & 12 deletions sources/output/sample_SampleTactContract.code.fif
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ PROGRAM{
DUP
ISNULL
128 THROWIF
2 UNTUPLE
2 UNTUPLE
}>
$SampleTactContract$init$_load PROCINLINE:<{
__tact_load_address INLINECALLDICT
Expand Down Expand Up @@ -170,7 +170,7 @@ PROGRAM{
c4 POP
}>
$global_send PROCREF:<{
NEWC
NEWC
1 PUSHINT
SWAP
2 STI
Expand All @@ -182,7 +182,7 @@ PROGRAM{
s0 s5 XCHG2
__tact_store_address INLINECALLDICT
s0 s3 XCHG2
STVARUINT16
STVARUINT16
0 PUSHINT
SWAP
105 STI
Expand All @@ -199,7 +199,7 @@ PROGRAM{
IF:<{
TRUE
__tact_store_bool INLINECALLDICT
NEWC
NEWC
FALSE
__tact_store_bool INLINECALLDICT
FALSE
Expand All @@ -213,7 +213,7 @@ PROGRAM{
s0 s4 XCHG
__tact_not_null INLINECALLDICT
s0 s4 XCHG2
STREF
STREF
}>ELSE<{
s4 POP
s0 s3 XCHG
Expand All @@ -229,7 +229,7 @@ PROGRAM{
s0 s4 XCHG
__tact_not_null INLINECALLDICT
s0 s4 XCHG2
STREF
STREF
}>ELSE<{
s4 POP
s0 s3 XCHG
Expand All @@ -242,9 +242,9 @@ PROGRAM{
TRUE
__tact_store_bool INLINECALLDICT
s0 s2 XCHG
ENDC
ENDC
ROT
STREF
STREF
}>ELSE<{
s3 POP
s3 POP
Expand All @@ -261,15 +261,15 @@ PROGRAM{
SWAP
__tact_not_null INLINECALLDICT
SWAP
STREF
STREF
}>ELSE<{
NIP
FALSE
__tact_store_bool INLINECALLDICT
}>
ENDC
ENDC
SWAP
SENDMSG
SENDMSG
}>
$SampleTactContract$_fun_add PROCREF:<{
__tact_context_get INLINECALLDICT
Expand Down Expand Up @@ -332,7 +332,7 @@ PROGRAM{
$SampleTactContract$_internal_text_c4f8d72312edfdef5b7bec7833bdbb162d1511bd78a912aed0f2637af65572ae PROCINLINE:<{
1 PUSHINT
$SampleTactContract$_fun_add INLINECALLDICT
B{b5ee9c7241010101001100001e00000000696e6372656d656e7465648430bf20} B>boc PUSHREF
B{b5ee9c7241010101001100001e00000000696e6372656d656e7465648430bf20} B>boc PUSHREF
$SampleTactContract$_fun_reply INLINECALLDICT
}>
$SampleTactContract$_internal_binary_Deploy PROCINLINE:<{
Expand Down
4 changes: 3 additions & 1 deletion sources/output/sample_SampleTactContract.constants.fc
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
;; Comment "incremented"
cell __gen_cell_comment_3e96a74bf6f672d7e00d5d9c31c1437327e624b173365dc10e024c6410eff184() asm """B{b5ee9c7241010101001100001e00000000696e6372656d656e7465648430bf20} B>boc PUSHREF""";
cell __gen_cell_comment_3e96a74bf6f672d7e00d5d9c31c1437327e624b173365dc10e024c6410eff184() asm """
B{b5ee9c7241010101001100001e00000000696e6372656d656e7465648430bf20} B>boc PUSHREF
""";
2 changes: 1 addition & 1 deletion sources/output/sample_SampleTactContract.pkg

Large diffs are not rendered by default.

32 changes: 24 additions & 8 deletions sources/output/sample_SampleTactContract.stdlib.fc
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,37 @@ int __tact_slice_eq_bits(slice a, slice b) inline {
return equal_slices_bits(a, b);
}

forall X0, X1 -> (X0, X1) __tact_tuple_destroy_2(tuple v) asm """2 UNTUPLE""";
forall X0, X1 -> (X0, X1) __tact_tuple_destroy_2(tuple v) asm """
2 UNTUPLE
""";

builder $global_beginCell() impure asm """NEWC""";
builder $global_beginCell() impure asm """
NEWC
""";

int $global_myBalance() impure asm """BALANCE FIRST""";
int $global_myBalance() impure asm """
BALANCE FIRST
""";

() $global_nativeReserve(int $amount, int $mode) impure asm """RAWRESERVE""";
() $global_nativeReserve(int $amount, int $mode) impure asm """
RAWRESERVE
""";

int $global_nativeSendMessageReturnForwardFee(cell $msg, int $mode) impure asm """SENDMSG""";
int $global_nativeSendMessageReturnForwardFee(cell $msg, int $mode) impure asm """
SENDMSG
""";

builder $Builder$_fun_storeCoins(builder $self, int $value) impure asm """STVARUINT16""";
builder $Builder$_fun_storeCoins(builder $self, int $value) impure asm """
STVARUINT16
""";

builder $Builder$_fun_storeRef(builder $self, cell $cell) impure asm($cell $self) """STREF""";
builder $Builder$_fun_storeRef(builder $self, cell $cell) impure asm($cell $self) """
STREF
""";

cell $Builder$_fun_endCell(builder $self) impure asm """ENDC""";
cell $Builder$_fun_endCell(builder $self) impure asm """
ENDC
""";

int $global_send((int, slice, int, int, cell, cell, cell) $params) impure inline_ref {
var (($params'bounce, $params'to, $params'value, $params'mode, $params'body, $params'code, $params'data)) = $params;
Expand Down
1 change: 0 additions & 1 deletion tact.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"options": {
"external": false,
"debug": false,
"masterchain": false,
"ipfsAbiGetter": false,
"interfacesGetter": false,
"experimental": {
Expand Down
25 changes: 9 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -668,13 +668,13 @@
dependencies:
"@sinonjs/commons" "^3.0.0"

"@tact-lang/compiler@~1.5.0":
version "1.5.0"
resolved "https://registry.yarnpkg.com/@tact-lang/compiler/-/compiler-1.5.0.tgz#1a3c3c9faf32c41fbab269db9fe2af24b7f9c360"
integrity sha512-VN/E81VDwwyoE6H8NrX2Sfp63Y3N0Jdk349tg48YjdoTmyDEpiEbpHajfRoy04ZoxLKwbOD6213qflyv9g52Mw==
"@tact-lang/compiler@~1.5.1":
version "1.5.2"
resolved "https://registry.yarnpkg.com/@tact-lang/compiler/-/compiler-1.5.2.tgz#eece10634091eb31fa2f1b5453ede867cf68af9e"
integrity sha512-i6FONPYpM4hYujmrhtyXtcNA7UkDOcgWbHUCFvHT4+RFwPFHlwbq7gdDWDP4dgW6uMLoNt+JUL/o62Ho+rJn0Q==
dependencies:
"@tact-lang/opcode" "^0.0.16"
"@ton/core" "0.57.0"
"@ton/core" "0.58.1"
"@ton/crypto" "^3.2.0"
blockstore-core "1.0.5"
change-case "^4.1.2"
Expand All @@ -688,10 +688,10 @@
prando "^6.0.1"
zod "^3.22.4"

"@tact-lang/compiler@~1.5.1":
version "1.5.2"
resolved "https://registry.yarnpkg.com/@tact-lang/compiler/-/compiler-1.5.2.tgz#eece10634091eb31fa2f1b5453ede867cf68af9e"
integrity sha512-i6FONPYpM4hYujmrhtyXtcNA7UkDOcgWbHUCFvHT4+RFwPFHlwbq7gdDWDP4dgW6uMLoNt+JUL/o62Ho+rJn0Q==
"@tact-lang/compiler@~1.5.3":
version "1.5.3"
resolved "https://registry.yarnpkg.com/@tact-lang/compiler/-/compiler-1.5.3.tgz#cbf1bb35e6b9303f541dfbab444303b91775e1b2"
integrity sha512-BxSCWfIQJUa0RC2ZltYfgTeN+3dRjMs4Hdxq61REfghpRiSU0IKdkLPGqJH/5zimzFFhjD4mhR0aFS71zUH9hA==
dependencies:
"@tact-lang/opcode" "^0.0.16"
"@ton/core" "0.58.1"
Expand Down Expand Up @@ -732,13 +732,6 @@
resolved "https://registry.yarnpkg.com/@tact-lang/ton-jest/-/ton-jest-0.0.4.tgz#c87604669ed0c6b4ba1a2e6f06616e267f7fc8ca"
integrity sha512-FWjfiNvhMlE44ZLLL7tgmHbrszMTPMttmYiaTekf1vwFXV3uAOawM8xM9NldYaCVs9eh8840PjgISdMMUTCSCw==

"@ton/[email protected]":
version "0.57.0"
resolved "https://registry.yarnpkg.com/@ton/core/-/core-0.57.0.tgz#fdf2d32848a3d1135b890e9a5bd8295e958a4a81"
integrity sha512-UOehEXEV5yqi+17qmmWdD01YfVgQlYtitSm5OfN/WMg6PAMkt+Uf91JRC4mdPNtkKDhyKuujJuhYs6QiOsHPfw==
dependencies:
symbol.inspect "1.0.1"

"@ton/[email protected]":
version "0.58.1"
resolved "https://registry.yarnpkg.com/@ton/core/-/core-0.58.1.tgz#f6f2ecef6a7149bcd23825bfbb454f116d54363f"
Expand Down

0 comments on commit 43bc4e4

Please sign in to comment.