Tolk 1.2 (#359)

* Tolk 1.2

* Fix pendingOwner serialization

* Fix maybeAddr serialization in typescript wrappers

* Fix go bindings

* nix: Bump sha

* Fix more cases

* chore: bump mylocalton

* tolk-1-2-mylocalton-fix (#387)

* MCMS suite polish/fixes #3 (#360)

* Allow MCMS<T>.submitErrorReport even when root is expired

* Timelock.onBouncedMessage - Mark the operation as final

* Adopt SnakedCell<T>

* Timelock - support blocking msg bodies (data) < 32 bits

* Revert - 'Timelock - support blocking msg bodies (data) < 32 bits'

* Use SnakedCell<RootDescriptor> for roots

* Add scripts/disk-cache-gc.sh run to e2e test (#366)

* Add scripts/disk-cache-gc.sh run to e2e test

* Relocate Nix store to /mnt

* chore: remove unused function (#368)

* Dont cache CI test run logs (#377)

* dont cache test logs

* chore: clean log dir before running test

* fix: flag

---------

Co-authored-by: Jade Park <jadepark.dev@gmail.com>

* Bump core version tag (#381)

* refactor: offramp wrappers to use CellCodec (#379)

* replace all encode and decode functions with builder type

* refactor message encoding as well

* Update contracts/wrappers/ccip/OffRamp.ts

Co-authored-by: Kristijan Rebernisak <kristijan.rebernisak@gmail.com>

* Update contracts/wrappers/ccip/OffRamp.ts

Co-authored-by: Kristijan Rebernisak <kristijan.rebernisak@gmail.com>

* fmt

* fix typo

---------

Co-authored-by: Kristijan Rebernisak <kristijan.rebernisak@gmail.com>

* refactor ton accessor ocr3base binding (#384)

* refactor offramp binding and chain accessor ocr3base

* update comments

* fix lint

* fix contract test

* add chainId back

* golint

* [NONEVM-3047] feat: add feeValueJuels to getValidatedFee and TVM2ANY event (#361)

* feat: add feeValueJuels to getValidatedFee

* fix: missed overwritten param

* fix: update feequoter go bindings

* fix: update onramp go bindings

* fix: golint

* fix: revert unnecesary change

* feat: don't fail on missing link token price

* cicd: power up integration test vm

* test: make feequoter errors work

* Fix errorCodes for feeQuoter

* LINK token price also needs configuring

* Update generated feeQuoter exit codes

---------

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>

* NONEVM-2403: use CLDF for ton localnet access (#373)

* chore: clean up

* chore: bump core

* chore: bump core/deployment

* chore: tidy

* chore: clean up

* chore: bump core

* chore: bump mylocalton

* chore: modgraph

* Fix compilation on 1.2

* fix import

* fix: wait for current masterchain block

---------

Co-authored-by: Kristijan Rebernisak <kristijan.rebernisak@gmail.com>
Co-authored-by: Patricio <contact@patricios.space>
Co-authored-by: Oliver Townsend <133903322+ogtownsend@users.noreply.github.com>
Co-authored-by: vicentevieytes <73846744+vicentevieytes@users.noreply.github.com>
Co-authored-by: Joe Huang <joe.huang@smartcontract.com>
Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>

* fix import yet again

* Address review

* Update sha

---------

Co-authored-by: Jade Park <jadepark.dev@gmail.com>
Co-authored-by: Kristijan Rebernisak <kristijan.rebernisak@gmail.com>
Co-authored-by: Patricio <contact@patricios.space>
Co-authored-by: Oliver Townsend <133903322+ogtownsend@users.noreply.github.com>
Co-authored-by: vicentevieytes <73846744+vicentevieytes@users.noreply.github.com>
Co-authored-by: Joe Huang <joe.huang@smartcontract.com>

Author: 7 people

contracts/contracts/ccip/common/cross_chain_address_validation.tolk

@@ -2,7 +2,7 @@
 
 import "types"
 
-tolk 1.1
+tolk 1.2
 
 const EVM_PRECOMPILE_SPACE = 1024;
 const APTOS_PRECOMPILE_SPACE = 0x0b;

contracts/contracts/ccip/fee_quoter/contract.tolk

@@ -240,9 +240,10 @@ fun calculateValidatedFee(msg: Router_CCIPSend): Fee {
     var destChainConfig = destChainConfigResult.loadValue();
 
     assert(destChainConfig.config.isEnabled, FeeQuoter_Error.DestChainNotEnabled);
-
-    val premiumMultiplier = st.premiumMultiplierWeiPerEth.mustGet(msg.feeToken, FeeQuoter_Error.FeeTokenNotSupported as int);
-    val feeTokenPrice = st.usdPerToken.mustGet(msg.feeToken, FeeQuoter_Error.FeeTokenNotSupported as int);
+    assert(msg.feeToken != null, FeeQuoter_Error.FeeTokenNotSupported);
+    val feeToken = msg.feeToken!;
+    val premiumMultiplier = st.premiumMultiplierWeiPerEth.mustGet(feeToken, FeeQuoter_Error.FeeTokenNotSupported as int);
+    val feeTokenPrice = st.usdPerToken.mustGet(feeToken, FeeQuoter_Error.FeeTokenNotSupported as int);
 
     val it = (msg.data as SnakedCell<uint8>).iter();
     val (msgDataLen, errorCode) = it.countBytesSafe();
@@ -297,17 +298,17 @@ fun calculateValidatedFee(msg: Router_CCIPSend): Fee {
     val feeTokenAmount = (feeTokenValue / feeTokenPrice.value);
 
     // Equivalent to processMessageArgs in Solidity FeeQuoter
-    val feeValueJuels = calculateFeeValueJuels(st, msg, feeTokenValue, feeTokenAmount);
+    val feeValueJuels = calculateFeeValueJuels(st, feeToken, feeTokenValue, feeTokenAmount);
 
     return Fee {
         feeTokenAmount: mustCastToCoin(feeTokenAmount, FeeQuoter_Error.FeeOverflow as int),
         feeValueJuels: feeValueJuels as uint96, // safe because already checked against maxFeeJuelsPerMsg
     };
 }
 
-fun calculateFeeValueJuels(st: Storage, msg: Router_CCIPSend, feeTokenValue: coins, feeTokenAmount: coins): coins {
+fun calculateFeeValueJuels(st: Storage, feeToken: address, feeTokenValue: coins, feeTokenAmount: coins): coins {
     var feeValueJuels = feeTokenAmount;
-    if (msg.feeToken != st.linkToken) {
+    if (feeToken != st.linkToken) {
         val linkTokenPriceResult = st.usdPerToken.get(st.linkToken);
         if (!linkTokenPriceResult.isFound) {
             return 0;

contracts/contracts/ccip/offramp/contract.tolk

@@ -774,7 +774,7 @@ configuration and emits a DYNAMIC_CONFIG_SET_TOPIC event.
 fun onSetDynamicConfig(msg: OffRamp_SetDynamicConfig) {
     var st = Storage.load();
 
-    assert(!msg.feeQuoter.isNone()) throw Error.ZeroAddressNotAllowed;
+    // NOTE: address now is guaranteed to be non-zero, address? allows zero
 
     st.feeQuoter = msg.feeQuoter;
     st.permissionlessExecutionThresholdSeconds = msg.permissionlessExecutionThresholdSeconds;

contracts/contracts/ccip/onramp/contract.tolk

@@ -1,4 +1,4 @@
-tolk 1.1
+tolk 1.2
 
 import "types"
 import "events"
@@ -297,7 +297,7 @@ fun onExecutorFinishedSuccessfully(st: OnRamp_Storage, msg: OnRamp_ExecutorFinis
             data: ccipsend.data,
             extraArgs: ccipsend.extraArgs,
             tokenAmounts: ccipsend.tokenAmounts,
-            feeToken: ccipsend.feeToken,
+            feeToken: ccipsend.feeToken!, // guaranteed to be non-null by this point
             feeTokenAmount: msg.fee.feeTokenAmount as uint256, // safe because it is 120 bits
         }.toCell(),
         feeValueJuels: msg.fee.feeValueJuels,

contracts/contracts/ccip/router/contract.tolk

@@ -425,8 +425,7 @@ fun onCCIPSend(msg: Router_CCIPSend, sender: address, value: coins) {
     val isCursed = rmn.cursedSubjects.isCursed(msg.destChainSelector as uint128);
     assert(!isCursed, Router_Error.SubjectCursed);
 
-    // TODO: the feeToken typing will need to change to `address?` and comparing with `null` in upcoming Tolk 1.2
-    if (msg.feeToken.isNone()) {
+    if (msg.feeToken == null) {
         msg.feeToken = st.wrappedNative
     }
 

contracts/contracts/ccip/router/messages.tolk

@@ -46,7 +46,7 @@ struct (0x31768d95) Router_CCIPSend {
     receiver: CrossChainAddress;
     data: cell;
     tokenAmounts: SnakedCell<TokenAmount>;
-    feeToken: address;
+    feeToken: address?;
     extraArgs: cell;
 }
 

contracts/contracts/examples/counter.tolk

@@ -1,4 +1,4 @@
-tolk 1.1
+tolk 1.2
 
 import "@stdlib/common.tolk"
 import "../lib/utils.tolk"

contracts/contracts/lib/access/access_control.tolk

@@ -1,4 +1,4 @@
-tolk 1.1
+tolk 1.2
 
 import "../utils.tolk";
 
@@ -311,17 +311,17 @@ fun AccessControl<T>.getRoleAdmin(self, role: int): int {
 ///
 /// Role bearers are not sorted in any particular way, and their ordering may change at any point.
 @inline
-fun AccessControl<T>.getRoleMember(self, role: int, index: uint32): address {
+fun AccessControl<T>.getRoleMember(self, role: int, index: uint32): address? {
     // Check if the role is valid
     val data = self.data.roles.get(role);
     if (!data.isFound) {
-        return createAddressNone(); // role does not exist
+        return null; // role does not exist
     }
 
     // Check if the account exists in the role data
     var d = lazy AccessControl_RoleData.fromCell(data.loadValue());
     if (index >= d.membersLen) {
-        return createAddressNone(); // index out of bounds
+        return null; // index out of bounds
     }
 
     // Notice: we need to iterate through the dictionary to get the account at the specified index.
@@ -353,16 +353,16 @@ fun AccessControl<T>.getRoleMemberCount(self, role: int): int {
 }
 
 @inline
-fun AccessControl<T>.getRoleMemberFirst(self, role: int): address {
+fun AccessControl<T>.getRoleMemberFirst(self, role: int): address? {
     // Check if the role is valid
     val data = self.data.roles.get(role);
     if (!data.isFound) {
-        return createAddressNone(); // role does not exist
+        return null; // role does not exist
     }
 
     val d = lazy AccessControl_RoleData.fromCell(data.loadValue());
     if (d.membersLen == 0) {
-        return createAddressNone(); // no members in the role
+        return null; // no members in the role
     }
 
     // Get the first account in the role data
@@ -371,18 +371,18 @@ fun AccessControl<T>.getRoleMemberFirst(self, role: int): address {
 }
 
 @inline
-fun AccessControl<T>.getRoleMemberNext(self, role: int, pivot: address): address {
+fun AccessControl<T>.getRoleMemberNext(self, role: int, pivot: address): address? {
     // Check if the role is valid
     val data = self.data.roles.get(role);
     if (!data.isFound) {
-        return createAddressNone(); // role does not exist
+        return null; // role does not exist
     }
 
     // Get the next account in the role data after the pivot
     val d = lazy AccessControl_RoleData.fromCell(data.loadValue());
     var acc = d.hasRole.findKeyGreater(pivot);
     if (!acc.isFound) {
-        return createAddressNone(); // no next account
+        return null; // no next account
     }
 
     return acc.getKey();

contracts/contracts/lib/crypto/merkle_proof.tolk

@@ -1,4 +1,4 @@
-tolk 1.1
+tolk 1.2
 
 import "../utils.tolk"
 

contracts/contracts/mcms/mcms.tolk

@@ -1,4 +1,4 @@
-tolk 1.1
+tolk 1.2
 
 import "../lib/utils";
 import "../lib/secp256k1";
@@ -586,7 +586,7 @@ struct OpPendingInfo {
     /// The timeout required to finalize the currently executing op
     opFinalizationTimeout: uint32;
     /// The address that the (pending) operation was sent to (and could bounce from).
-    opPendingReceiver: address;
+    opPendingReceiver: address?;
     /// The truncated body of the pending operation (256 bits from the original message),
     /// stored as the next expected potential bounce, and verified in onBounceMessage handler.
     opPendingBodyTruncated: uint256;
@@ -872,7 +872,7 @@ fun MCMS<T>.setRoot(
             opPendingInfo: OpPendingInfo{
                 validAfter: blockchain.now(), // immediate
                 opFinalizationTimeout: opPendingInfo.opFinalizationTimeout, // cp from storage
-                opPendingReceiver: createAddressNone(),
+                opPendingReceiver: null,
                 opPendingBodyTruncated: 0,
             }.toCell()
         },
@@ -1183,7 +1183,7 @@ fun MCMS<T>.setConfig(
                 opPendingInfo: OpPendingInfo{
                     validAfter: blockchain.now(), // immediate
                     opFinalizationTimeout: opPendingInfo.opFinalizationTimeout, // cp from storage
-                    opPendingReceiver: createAddressNone(),
+                    opPendingReceiver: null,
                     opPendingBodyTruncated: 0
                 }.toCell()
             },
@@ -1291,7 +1291,9 @@ fun MCMS<T>.submitErrorReport(
     // Check the reported error against the stored pending operation
     val opPendingInfo = lazy OpPendingInfo.fromCell(rootInfo.expiringRootAndOpCount.opPendingInfo);
 
-    val matchesPendingOp = opPendingInfo.opPendingReceiver == op.to
+    val matchesPendingOp =
+        opPendingInfo.opPendingReceiver != null
+        && opPendingInfo.opPendingReceiver == op.to
         && opPendingInfo.opPendingBodyTruncated == extractBouncedBody(op.data.beginParse());
 
     // Store the root in a separate cell (size limit)
@@ -1499,7 +1501,7 @@ fun onBouncedMessage(in: InMessageBounced) {
     //
     // @dev on setRoot the OpPendingInfo is cleared, so a bounce from an old root will not match
     val bouncedBody = extractBouncedBody(in.bouncedBody.skipBouncedPrefix());
-    if (opPendingInfo.opPendingReceiver != in.senderAddress
+    if (opPendingInfo.opPendingReceiver! != in.senderAddress
         || opPendingInfo.opPendingBodyTruncated != bouncedBody) {
 
         // Check the case when a new root was just set and no ops yet executed
@@ -1518,7 +1520,7 @@ fun onBouncedMessage(in: InMessageBounced) {
     // If the received bounce equals expected, revert state (allow op retry)
     rootInfo.expiringRootAndOpCount.opCount = rootInfo.expiringRootAndOpCount.opCount - 1;
     opPendingInfo.validAfter = blockchain.now(); // can be retried immediately
-    opPendingInfo.opPendingReceiver = createAddressNone();
+    opPendingInfo.opPendingReceiver = null;
     opPendingInfo.opPendingBodyTruncated = 0;
 
     rootInfo.expiringRootAndOpCount.opPendingInfo = opPendingInfo.toCell();