[NONEVM-3031/3032]Migrate SenderExecutor to Deployable and update (#343)

* feat: Update send executor for onramp

* feat: bindings

* feat: code getter

* feat: migrate SendExecutor deployable

* ref: deployable cleanup

* ref: rename executor.messageID for id

* doc: new deployable message

* fix: go bindings

* fix: go type

* fix: operations

* fix: deploy CCIP

* ref: rename IDs

* fix: naming suggestions

Author: patricios-space

contracts/contracts/ccip/ccipsend_executor/contract.tolk

@@ -18,7 +18,7 @@ fun onInternalMessage(in: InMessage) {
     match (msg) {
         CCIPSendExecutor_Execute => {
             var this = init(msg.onrampSend, msg.config.load());
-            assert (in.senderAddress == this.addresses.load().onramp) throw CCIPSendExecutor_Error.Unauthorized;
+            assert (in.senderAddress == contract.getAddress()) throw CCIPSendExecutor_Error.Unauthorized;
             assert (in.valueCoins >= SendExecutor_Costs.Execute()) throw CCIPSendExecutor_Error.InsufficientFee;
             this.onExecute();
         }
@@ -49,7 +49,7 @@ fun onBouncedMessage(in: InMessageBounced) {
 fun init(onrampSend: OnRamp_Send, config: CCIPSendExecutor_Config): CCIPSendExecutor<CCIPSendExecutor_State_Initialized> {
     val st = lazy CCIPSendExecutor_InitialData.fromCell(contract.getData());
     return CCIPSendExecutor<CCIPSendExecutor_State_Initialized> {
-        messageID: st.messageID,
+        id: st.id,
         onrampSend: onrampSend,
         addresses: CCIPSendExecutor_Addresses {
             onramp: st.onramp,
@@ -63,7 +63,7 @@ fun init(onrampSend: OnRamp_Send, config: CCIPSendExecutor_Config): CCIPSendExec
 fun CCIPSendExecutor<CCIPSendExecutor_State_Initialized>.onExecute(mutate self) {
     getValidatedFee(self.addresses.load().feeQuoter, self.onrampSend);
     val newState = CCIPSendExecutor<CCIPSendExecutor_State_OnGoingFeeValidation> {
-        messageID: self.messageID,
+        id: self.id,
         onrampSend: self.onrampSend,
         addresses: self.addresses,
         state: CCIPSendExecutor_State_OnGoingFeeValidation {
@@ -105,7 +105,7 @@ fun CCIPSendExecutor<T>.exitSuccessfully(self, fee: coins) {
         dest: self.addresses.load().onramp,
         body: OnRamp_ExecutorFinishedSuccessfully {
             fee,
-            msgID: self.messageID,
+            executorID: self.id,
             msg: self.onrampSend.msg,
             metadata: self.onrampSend.metadata,
         }
@@ -126,7 +126,7 @@ fun CCIPSendExecutor<T>.exitWithError(self, error: uint256, sender: address) {
         value: 0,
         dest: self.addresses.load().onramp,
         body: OnRamp_ExecutorFinishedWithError {
-            msgID: self.messageID,
+            executorID: self.id,
             error: error,
             msg: self.onrampSend.msg,
             metadata: self.onrampSend.metadata,

contracts/contracts/ccip/ccipsend_executor/storage.tolk

@@ -3,7 +3,7 @@ import "types"
 import "../onramp/messages"
 
 struct CCIPSendExecutor<T> {
-    messageID: uint224,
+    id: CCIPSendExecutor_ID,
     onrampSend: OnRamp_Send,
     addresses: Cell<CCIPSendExecutor_Addresses>,
     state: Cell<T>,
@@ -13,7 +13,7 @@ fun CCIPSendExecutor<T>.load(): CCIPSendExecutor<T> {
     val st = lazy CCIPSendExecutor_Data.fromCell(contract.getData());
     assert (st.state is Cell<T>) throw CCIPSendExecutor_Error.StateNotExpected; // invalid state
     return CCIPSendExecutor<T> {
-        messageID: st.messageId,
+        id: st.id,
         onrampSend: st.onrampSend,
         addresses: st.addresses,
         state: st.state,
@@ -22,7 +22,7 @@ fun CCIPSendExecutor<T>.load(): CCIPSendExecutor<T> {
 
 fun CCIPSendExecutor<T>.store(self) {
     contract.setData(CCIPSendExecutor_Data {
-        messageId: 0,
+        id: self.id,
         onrampSend: self.onrampSend,
         addresses: self.addresses,
         state: self.state,

contracts/contracts/ccip/ccipsend_executor/types.tolk

@@ -1,12 +1,30 @@
 import "../onramp/messages.tolk";
+import "../../deployable/types"
+
+type CCIPSendExecutor_ID = uint224
+
+fun CCIPSendExecutor_DeployableData(owner: address, id: CCIPSendExecutor_ID): cell {
+    return Deployable<_CCIPSendExecutor_DeployableData> {
+        owner,
+        id: _CCIPSendExecutor_DeployableData {
+            id: id,
+            contractType: stringCrc32("CCIPSendExecutor"),
+        },
+    }.toCell(); 
+}
+
+struct _CCIPSendExecutor_DeployableData {
+    id: CCIPSendExecutor_ID;
+    contractType: uint256;
+}
 
 struct CCIPSendExecutor_InitialData {
     onramp: address,
-    messageID: uint224,
+    id: CCIPSendExecutor_ID,
 }
 
 struct CCIPSendExecutor_Data {
-    messageId: uint224,
+    id: CCIPSendExecutor_ID,
     onrampSend: OnRamp_Send,
     addresses: Cell<CCIPSendExecutor_Addresses>,
     state: CCIPSendExecutor_State,

contracts/contracts/ccip/onramp/contract.tolk

@@ -17,6 +17,7 @@ import "../router/messages"
 import "../../lib/funding/withdrawable"
 import "../../lib/versioning/upgradeable"
 import "events"
+import "../../deployable/types"
 import "../fee_quoter/messages"
 
 const CONTRACT_VERSION = "0.0.9";
@@ -66,6 +67,12 @@ fun onInternalMessage(in: InMessage) {
             applyAllowlistUpdates(mutate st, msg.updates);
             st.store();
         }
+        OnRamp_UpdateSendExecutor => {
+            var st = lazy OnRamp_Storage.load();
+            st.ownable.requireOwner(in.senderAddress);
+            st.executor.executorCode = msg.code;
+            st.store();
+        }
         Withdrawable_Withdraw => {
             var st = lazy OnRamp_Storage.load();
             st.ownable.requireOwner(in.senderAddress);
@@ -177,37 +184,36 @@ fun send(payload: OnRamp_Send, sender: address) {
     val executeMsg = createMessage({
         bounce: true,
         value: 0,
-        dest: executorAddress(st.executorCode, st.currentMessageId),
-        body: CCIPSendExecutor_Execute {
-            onrampSend: payload,
-            config: CCIPSendExecutor_Config {
-                feeQuoter: config.feeQuoter,
-            }.toCell(),
+        dest: st.executor.autoDeployAddress(st.executor.currentID),
+        body: Deployable_InitializeAndSend {
+            stateInit: {
+                code: st.executor.executorCode,
+                data:  CCIPSendExecutor_InitialData {
+                    onramp: contract.getAddress(),
+                    id: st.executor.currentID,
+                }.toCell(),
+            },
+            selfMessage: {
+                value: SendExecutor_Costs.Execute(),
+                body: CCIPSendExecutor_Execute {
+                    onrampSend: payload,
+                    config: CCIPSendExecutor_Config {
+                        feeQuoter: config.feeQuoter,
+                    }.toCell(),
+                }.toCell(),
+            },
         }
     });
 
     executeMsg.send(SEND_MODE_CARRY_ALL_REMAINING_MESSAGE_VALUE);
-    st.currentMessageId += 1;
+    st.executor.currentID += 1;
 
     st.store();
 }
 
-@inline
-fun executorAddress(executorCode: cell, messageID: int): AutoDeployAddress {
-    return AutoDeployAddress {
-        stateInit: ContractState {
-            code: executorCode,
-            data: CCIPSendExecutor_InitialData {
-                onramp: contract.getAddress(),
-                messageID: messageID
-            }.toCell(),
-        }
-    }
-}
-
 fun commit(payload: OnRamp_ExecutorFinishedSuccessfully, sender: address) {
     var st = lazy OnRamp_Storage.load();
-    assert(executorAddress(st.executorCode, payload.msgID).addressMatches(sender)) throw Error.Unauthorized;
+    assert(st.executor.autoDeployAddress(payload.executorID).addressMatches(sender)) throw Error.Unauthorized;
 
     val ccipsend: Router_CCIPSend = payload.msg.load();
     val metadata = payload.metadata;
@@ -274,7 +280,7 @@ fun commit(payload: OnRamp_ExecutorFinishedSuccessfully, sender: address) {
 
 fun replyWithError(payload: OnRamp_ExecutorFinishedWithError, sender: address) {
     var st = lazy OnRamp_Storage.load();
-    assert(executorAddress(st.executorCode, payload.msgID).addressMatches(sender)) throw Error.Unauthorized;
+    assert(st.executor.autoDeployAddress(payload.executorID).addressMatches(sender)) throw Error.Unauthorized;
 
     val ccipsend: Router_CCIPSend = payload.msg.load();
     val metadata = payload.metadata;
@@ -399,6 +405,11 @@ get fun destChainSelectors(): tuple? {
     return keysLispList(d)!;
 }
 
+get fun sendExecutorCode(): cell {
+    val st = lazy OnRamp_Storage.load();
+    return st.executor.executorCode;
+}
+
 get fun typeAndVersion(): (slice, slice) {
     return ("com.chainlink.ton.ccip.OnRamp", CONTRACT_VERSION);
 }

contracts/contracts/ccip/onramp/messages.tolk

@@ -7,6 +7,7 @@ import "../../lib/funding/withdrawable"
 import "../../lib/versioning/upgradeable"
 import "../ccipsend_executor/messages"
 import "../fee_quoter/messages"
+import "../ccipsend_executor/types"
 
 type OnRamp_InMessage =
     | OnRamp_Send
@@ -17,11 +18,11 @@ type OnRamp_InMessage =
     | OnRamp_ExecutorFinishedWithError
     | OnRamp_SetDynamicConfig
     | OnRamp_UpdateDestChainConfigs
+    | OnRamp_UpdateSendExecutor
     | OnRamp_UpdateAllowlists
     | Withdrawable_Withdraw
     | Upgradeable_Upgrade
     ;
-    // TODO | UpdateExecutorCode
 
 type OnRamp_NotificationInMessage =
     | OnRamp_Send
@@ -48,14 +49,14 @@ struct (0x10000003) OnRamp_SetDynamicConfig {
 }
 
 struct (0xCFA6B336) OnRamp_ExecutorFinishedSuccessfully {
-    msgID: uint224,
+    executorID: CCIPSendExecutor_ID,
     fee: coins
     msg: Cell<Router_CCIPSend>
     metadata: Metadata
 }
 
 struct (0xC4068E21) OnRamp_ExecutorFinishedWithError {
-    msgID: uint224,
+    executorID: CCIPSendExecutor_ID,
     error: uint256,
     msg: Cell<Router_CCIPSend>,
     metadata: Metadata,
@@ -66,6 +67,10 @@ struct (0x10000004) OnRamp_UpdateDestChainConfigs {
     updates: cell; // vec<OffRampUpdateDestChainConfig>
 }
 
+struct (0x82901c45) OnRamp_UpdateSendExecutor {
+    code: cell;
+}
+
 // TODO: make this direct snakedata by using RemainingBitsAndRefs? this way it's not cell->cell
 struct (0x10000005) OnRamp_UpdateAllowlists {
     updates: cell; // vec<UpdateAllowlist>

contracts/contracts/ccip/onramp/storage.tolk

@@ -12,8 +12,7 @@ struct OnRamp_Storage {
     config: Cell<OnRamp_DynamicConfig>;
 
     destChainConfigs: map<uint64, OnRamp_DestChainConfig>; // chainSelector -> DestChainConfig
-    executorCode: cell; // code for CCIPSendExecutor
-    currentMessageId: uint224;
+    executor: ExecutorDeployment;
 }
 
 fun OnRamp_Storage.load(): OnRamp_Storage {

contracts/contracts/ccip/onramp/types.tolk

@@ -1,5 +1,7 @@
 import "../common/types"
 import "../../lib/utils"
+import "../ccipsend_executor/types"
+import "../../deployable/types"
 
 struct OnRamp_DestChainConfig {
     router: address; // Local router address that is allowed to send messages to the destination chain.
@@ -21,6 +23,22 @@ struct OnRampUpdateDestChainConfig {
     allowlistEnabled: bool;
 }
 
+struct ExecutorDeployment {
+    deployableCode: cell;
+    executorCode: cell; // code for SendExecutor
+    currentID: uint224;
+}
+
+@inline
+fun ExecutorDeployment.autoDeployAddress(self, executorID: int): AutoDeployAddress {
+    return AutoDeployAddress {
+        stateInit: ContractState {
+            code: self.deployableCode,
+            data: CCIPSendExecutor_DeployableData(contract.getAddress(), executorID),
+        }
+    }
+}
+
 struct UpdateAllowlist {
     destChainSelector: uint64;
     add: SnakedCell<address>;

contracts/contracts/deployable/contract.tolk

@@ -1,16 +1,24 @@
 import "types"
 
-// initialize the contract as a stub with stateInit = {
-//   owner: myAddr, type: "OnRamp", id: "some identifier, could also be a complex tuple"
-// }
-
 fun onInternalMessage(in: InMessage) {
     val st = Deployable<RemainingBitsAndRefs>.load();
     assert(in.senderAddress == st.owner) throw ERROR_NOT_OWNER;
-
-    val payload = Deployable_Initialize.fromSlice(in.body);
-
-    contract.setCodePostponed(payload.stateInit.code);
-    contract.setData(payload.stateInit.data);
-    //TODO: emit event
+    val inMsg = lazy Deployable_InMessage.fromSlice(in.body);
+    match (inMsg) {
+        Deployable_Initialize => {
+            contract.setCodePostponed(inMsg.stateInit.code);
+            contract.setData(inMsg.stateInit.data);
+        }
+        Deployable_InitializeAndSend => {
+            contract.setCodePostponed(inMsg.stateInit.code);
+            contract.setData(inMsg.stateInit.data);
+            val selfMsg = createMessage({
+                bounce: false,
+                value: inMsg.selfMessage.value,
+                dest: contract.getAddress(),
+                body: inMsg.selfMessage.body,
+            });
+            selfMsg.send( SEND_MODE_PAY_FEES_SEPARATELY);
+        }
+    }
 }

contracts/contracts/deployable/types.tolk

@@ -11,11 +11,27 @@ fun Deployable<T>.store(self) {
     return contract.setData(self.toCell());
 }
 
+type Deployable_InMessage =
+    | Deployable_Initialize
+    | Deployable_InitializeAndSend
+    ;
 
+// Message for Initializing the Deployable contract. It sets the code and data of the contract.
 struct (0xba466447) Deployable_Initialize {
     stateInit: ContractState;
 }
 
+// This message initializes the Deployable contract and immediately sends a message to itself to execute some logic. It allows to carry the message value.
+struct (0xe95e1156) Deployable_InitializeAndSend {
+    stateInit: ContractState;
+    selfMessage: Deployable_Message;
+}
+
+struct Deployable_Message {
+    value: coins;
+    body: cell;
+}
+
 //TODO: crc32('Deployable_ErrorNotOwner')
 const ERROR_NOT_OWNER: int = 0x1;
 

contracts/tests/Logs.ts

@@ -11,7 +11,7 @@ import {
 } from '../wrappers/ccip/OffRamp'
 import { prettifyAddressesMap } from './utils/prettyPrint'
 import { crc32 } from 'zlib'
-import * as OR from '../wrappers/ccip/OnRamp'
+import * as onramp from '../wrappers/ccip/OnRamp'
 
 // https://github.com/ton-blockchain/liquid-staking-contract/blob/1f4e9badbed52a4cf80cc58e4bb36ed375c6c8e7/utils.ts#L269-L294
 export const getExternals = (transactions: BlockchainTransaction[]) => {
@@ -467,7 +467,7 @@ export const testLogDestChainConfigUpdated = (
     const cs = x.beginParse()
     const msg = {
       destChainSelector: cs.loadUintBig(64),
-      config: OR.builder.data.destChainConfig().load(cs),
+      config: onramp.builder.data.destChainConfig.load(cs),
     }
     matchesObject(msg, match)
     return true