Changesets + contract bindings (#76)

* add sequnce and operation for onramp

* need testing

* mod tidy

* add test

* fix build

* fix ci

* refactor

* fix nix and add test

* refactor

* goimport

* test CI

* reorder CI

* fix file name

* add router

* DynamicConfig is not snakedata

* These fields are not embedded

* Start working on methods

* Router should be cross chain address

* ops: Restructure based on Aptos

* wip: Further restructuring

* router update

* update test

* update

* Define deploy for all three contracts

* Restructure packages, ops should be it's own package

* Update vendorHash

* Fix type sizing mistakey

* Further work on AddLane

* wip

* wip

* add sendRequest helper function and update ccipsend binding, missing tests

* rm wrong imports

* change extraargs back to cell

* fix: Use destChainConfig.router rather than onramp.router

* Relayer and TONService implementation (#60)

* feat: implement relayer and ton service

* update hash

* add client cache with TTL expiration and TODOs for LogPoller-related functions

* some refactor

* Merge pull request #84 from smartcontractkit/jh/adding-mock-and-bump-chainlink-common

Add go mocks and bump chainlink-common version

* Use existing network in integration tests (#86)

* feat: use existing ton

* fix: lint

* fix: repo link

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Tests almost pass

* Manually call fund

* goimports

* Fix lints

* Update vendor hash

* fix more lints

* more lints

* More binding fixes, 2/3 commands now succeed

* sync replaces with core

* Update with changes upstream

* add state

* Fix compilation

* Start implementing ChainAccessor

* Get method to execute

* Fix duplication

* address PR comments for refactor, addLane testhelper

* Partially implement feeQuoter.UpdatePrices, first Accessor test now passes

* Implement GetExpectedNextSequenceNumber

* Need to return the *next* sequence number

* TEMP: Switch to smartcontractkit/chainlink-common#1450 for public types

* implement missing parts for addLane changeset

* update CCIP tokenAmounts

* Switch back to latest stable chainlink-common

* WIP: GetConfig

* Validate correct sender

* Apply suggestion from @patricios-space

Co-authored-by: Patricio <contact@patricios.space>

* update SendTonRequest, need to test once go work fixed

* fix test from core branch, remove comments

* fix address codec to be chain specific addrCodec

* Undo shell.nix changes

* XImplement FeeQuoterDestChainConfig, other methods

* fix relay bugs

* rm debugger print

* Bump chainlink-common, implement more of config fetching

* Add get sourceChainConfig(selector)

* Update provider to actually initialize CCIP Provider

* Fix method name

* Use a mutex around bindings, add GetContractAddress

* add comment

* refactor

* Get the code to build with latest core

* Fix lintsy

* Update hash...

* Add type assertions, fix typing of TokenData codec

* Bump again?

* Fix testy

* Fix compilation

* Use RUnlock where appropriate

* tidy

* Fix bool parsing

* Resolve a couple TODOs

* fix deployment submodule

* use zero version for stale version fast fail

* update binding to use RampMsg instead of CCIPSent

* lint

* lint

* Add offramp bindings and wrappers

* Implement GetContractAddress via getBinding

* Fix typing

* Directly embed ramp message into MessageSent event

* Implement feeQuoter.UpdateFeeTokens, fix tests

* format

* Update vendorHash

* fix build

---------

Co-authored-by: Joe Huang <joe.huang@smartcontract.com>
Co-authored-by: Brian Sztamfater <brian.sztamfater@smartcontract.com>
Co-authored-by: Jonghyeon Park <jadepark.dev@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Patricio <contact@patricios.space>

Author: 6 people

.gitignore

@@ -42,3 +42,5 @@ golangci-lint-*-report.xml
 
 # Golangci-lint config(We use a upstream config from core, see getting-started.md)
 .golangci.yml
+
+_vendor/

cmd/chainlink-ton/default.nix

@@ -18,7 +18,7 @@ in
     ];
 
     # pin the vendor hash (update using 'pkgs.lib.fakeHash')
-    vendorHash = "sha256-AXT9mLLjfKGdH4euryMcOEEmkZz7XXsQTfe7mNE5dw4=";
+    vendorHash = "sha256-3ADpTHOZxiQpRi38kgOrEsB4hfz7ap8ss4gZATAtYJU=";
 
     # postInstall script to write version and rev to share folder
     postInstall = ''

contracts/contracts/ccip/fee_quoter.tolk

@@ -191,8 +191,6 @@ fun updatePrices(mutate st: Storage, priceUpdates: PriceUpdates) {
           //TODO: emit UsdPerUnitGasUpdated(update.destChainSelector, update.usdPerUnitGas, block.timestamp);
         }
     }
-
-    st.store();
 }
 
 // apply_premium_multiplier_wei_per_eth_updates??
@@ -401,10 +399,14 @@ get fun tokenTransferFeeConfig() {}
 
 // TODO: processMessageArgs(), processPoolReturnData()?
 
-get fun destChainConfig() {}
+get fun destChainConfig(destChainSelector: uint64): DestChainConfig {
+    val st = lazy Storage.load();
+    return st.destChainConfigs.mustGet(destChainSelector, ERROR_DEST_CHAIN_NOT_ENABLED);
+}
 
-get fun staticConfig() {
-    // maxFeeJuelsPerMsg, linkToken, tokenPriceStalenessThreshold
+get fun staticConfig(): (uint96, address, uint64) {
+    val st = lazy Storage.load();
+    return (st.maxFeeJuelsPerMsg, st.linkToken, st.tokenPriceStalenessThreshold);
 }
 
 get fun typeAndVersion(): (slice, slice) {

contracts/contracts/ccip/offramp.tolk

@@ -349,13 +349,17 @@ fun setDynamicConfig() {
 }
 
 get fun dynamicConfig() {
-    
+    // TODO: combine get staticConfig and dynamicConfig into get config
 }
 
-get fun sourceChainConfig() {}
+get fun sourceChainConfig(sourceChainSelector: uint64): SourceChainConfig {
+    val st = lazy Storage.load();
+    return st.sourceChainConfigs.mustGet(sourceChainSelector,ERROR_SOURCE_CHAIN_NOT_ENABLED);
+}
 
-get fun allSourceChainConfigs(): tuple {
-    return createEmptyTuple()
+get fun allSourceChainConfigs(): dict {
+    val st = lazy Storage.load();
+    return st.sourceChainConfigs.value;
 }
 
 fun applySourceChainConfigUpdates() {}

contracts/contracts/ccip/onramp.tolk

@@ -8,16 +8,13 @@ import "@stdlib/tvm-dicts";
 const CCIP_MESSAGE_SENT_TOPIC: int = stringCrc32("CCIPMessageSent"); 
 
 struct CCIPMessageSent {
-    destChainSelector: uint64; // NOTE: both these values are already part of message, is it even important to have?
-    sequenceNumber: uint64;
-    message: Cell<TVM2AnyRampMessage>;
+    message: TVM2AnyRampMessage;
 }
 
 struct Storage {
     ownable: Ownable2Step;
 
     // static config
-    router: address;
     chainSelector: uint64; // source chain selector
     // TODO: rmnRemote (only used to validate curse on getFee), nonceManager, tokenAdminRegistry
     // hmm, need to consider the design here.
@@ -34,7 +31,7 @@ struct Storage {
 }
 
 struct DestChainConfig {
-    router: CrossChainAddress;
+    router: address; // Local router address that is allowed to send messages to the destination chain.
     sequenceNumber: uint64;
     allowlistEnabled: bool;
     allowedSenders: Map<bool>; // address -> bool
@@ -88,16 +85,17 @@ fun onInternalMessage(in: InMessage) {
 
 fun send(payload: OnRampSend, sender: address) {
     val st = lazy Storage.load();
-    // ccipSend must be forwarded from the router
-    assert(st.router == sender, ERROR_UNAUTHORIZED);
 
     val msg = payload.msg.load();
 
     // validate allowlist
     val destChainConfig = st.destChainConfigs.mustGet(msg.destChainSelector, ERROR_UNKNOWN_DEST_CHAIN_SELECTOR);
+
+    // ccipSend must be forwarded from the router
+    assert(destChainConfig.router == sender, ERROR_UNAUTHORIZED);
+
     if (destChainConfig.allowlistEnabled) {
-        // TODO:
-        val (allowed, exists) = destChainConfig.allowedSenders.get(sender);
+        val (allowed, exists) = destChainConfig.allowedSenders.get(payload.metadata.sender);
         assert(exists && allowed!, ERROR_SENDER_NOT_ALLOWED);
     }
 
@@ -143,7 +141,9 @@ fun onMessageValidated(payload: MessageValidated<Metadata>, sender: address) {
             sourceChainSelector: st.chainSelector,
             destChainSelector: msg.destChainSelector,
             sequenceNumber: seqNr,
-            nonce: 0, // TODO:
+            // Only bump nonce for messages that specify allowOutOfOrderExecution == false. Otherwise, we may block ordered
+            // message nonces, which is not what we want.
+            nonce: 0,
         },
         sender: metadata.sender,
         body: TVM2AnyRampMessageBody {
@@ -157,6 +157,11 @@ fun onMessageValidated(payload: MessageValidated<Metadata>, sender: address) {
         feeValueJuels: 0, // TODO:
     };
 
+    // TODO: support for ordered execution
+    // rampMessage.header.nonce = isOutOfOrderExecution
+    //   ? 0
+    //   : nonceManager.getIncrementedOutboundNonce(destChainSelector, metadata.sender);
+
     // Metadata hash preimage to ensure global uniqueness, ensuring 2 identical messages sent to 2 different lanes
     // will have a distinct hash.
     val metadataHash = beginCell()
@@ -169,11 +174,7 @@ fun onMessageValidated(payload: MessageValidated<Metadata>, sender: address) {
 
     rampMessage.header.messageId = rampMessage.generateMessageId(metadataHash);
 
-    emit(CCIP_MESSAGE_SENT_TOPIC, CCIPMessageSent {
-        destChainSelector: msg.destChainSelector,
-        sequenceNumber: seqNr,
-        message: rampMessage.toCell(),
-    });
+    emit(CCIP_MESSAGE_SENT_TOPIC, CCIPMessageSent { message: rampMessage });
 
     // TODO: notify user
 }
@@ -187,7 +188,7 @@ get fun isChainSupported(destChainSelector: uint64): bool {
 get fun expectedNextSequenceNumber(destChainSelector: uint64): uint64 {
     val st = lazy Storage.load();
     val config = st.destChainConfigs.mustGet(destChainSelector,ERROR_UNKNOWN_DEST_CHAIN_SELECTOR);
-    return config.sequenceNumber;
+    return config.sequenceNumber + 1;
 }
 
 // TODO: getFee forwarding? users should just call the fee quoter

contracts/contracts/ccip/types.tolk

@@ -162,10 +162,11 @@ struct (0x10000003) SetDynamicConfig {
 
 struct OnRampUpdateDestChainConfig {
     destChainSelector: uint64;
-    router: CrossChainAddress;
+    router: address;
     allowlistEnabled: bool;
 }
 
+// TODO: make this direct snakedata by using RemainingBitsAndRefs? this way it's not cell->cell
 struct (0x10000004) OnRampUpdateDestChainConfigs {
     updates: cell; // vec<OrRampUpdateDestChainConfig>
 }
@@ -176,6 +177,7 @@ struct UpdateAllowlist {
     remove: cell; // vec<address>
 }
 
+// TODO: make this direct snakedata by using RemainingBitsAndRefs? this way it's not cell->cell
 struct (0x10000005) UpdateAllowlists {
     updates: cell; // vec<UpdateAllowlist>
 }
@@ -216,7 +218,7 @@ struct FeeQuoterDestChainConfig {
     destGasPerPayloadByteThreshold: uint16;
     destDataAvailabilityOverheadGas: uint32;
     destGasPerDataAvailabilityByte: uint16;
-    destDataAvailabilityMultiplierBps: uint32;
+    destDataAvailabilityMultiplierBps: uint16;
 
     chainFamilySelector: uint32; // 4 bytes
     enforceOutOfOrder: bool;

contracts/tests/Logs.ts

@@ -135,11 +135,6 @@ export const testLogCCIPMessageSent = (
   return testLog(message, from, CombinedLogTypes.CCIPMessageSent, (x) => {
     let bs = x.beginParse()
 
-    const destChainSelector = bs.loadUintBig(64)
-    const sequenceNumber = bs.loadUintBig(64)
-
-    bs = bs.loadRef().beginParse()
-
     const header = {
       messageId: bs.loadUintBig(256),
       sourceChainSelector: bs.loadUintBig(64),
@@ -152,8 +147,6 @@ export const testLogCCIPMessageSent = (
     const body = bs.loadRef().beginParse()
 
     const msg: CCIPLogs.CCIPMessageSent = {
-      destChainSelector,
-      sequenceNumber,
       message: {
         header,
         sender,

contracts/tests/ccip/CCIPRouter.spec.ts

@@ -68,11 +68,6 @@ describe('Router', () => {
         ),
         destChainConfigs: Dictionary.empty(Dictionary.Keys.BigUint(64)),
       }
-      // HACK: pre-insert token data
-      data.usdPerToken.set(ZERO_ADDRESS, {
-        value: 123n,
-        timestamp: BigInt(Date.now()),
-      } as TimestampedPrice)
       feeQuoter = blockchain.openContract(FeeQuoter.createFromConfig(data, code))
 
       let result = await feeQuoter.sendDeploy(deployer.getSender(), toNano('1'))
@@ -83,6 +78,16 @@ describe('Router', () => {
         success: true,
       })
 
+      result = await feeQuoter.sendUpdatePrices(deployer.getSender(), {
+        value: toNano('1'),
+        gasPrices: [],
+        tokenPrices: [{ token: ZERO_ADDRESS, price: 123n }],
+      })
+      expect(result.transactions).toHaveTransaction({
+        to: feeQuoter.address,
+        success: true,
+      })
+
       // add config for EVM destination
       result = await feeQuoter.sendUpdateDestChainConfig(deployer.getSender(), {
         value: toNano('1'),
@@ -134,7 +139,6 @@ describe('Router', () => {
           owner: deployer.address,
           pendingOwner: null,
         },
-        router: router.address,
         chainSelector: CHAINSEL_TON,
         config: {
           feeQuoter: feeQuoter.address,
@@ -160,7 +164,7 @@ describe('Router', () => {
         destChainConfigs: [
           {
             destChainSelector: CHAINSEL_EVM_TEST_90000001,
-            router: Buffer.alloc(64),
+            router: router.address,
             allowlistEnabled: false,
           },
         ],

contracts/wrappers/ccip/FeeQuoter.ts

@@ -82,7 +82,7 @@ export function destChainConfigToBuilder(config: DestChainConfig): TonBuilder {
     .storeUint(config.destGasPerPayloadByteThreshold, 16)
     .storeUint(config.destDataAvailabilityOverheadGas, 32)
     .storeUint(config.destGasPerDataAvailabilityByte, 16)
-    .storeUint(config.destDataAvailabilityMultiplierBps, 32)
+    .storeUint(config.destDataAvailabilityMultiplierBps, 16)
     .storeUint(config.chainFamilySelector, 32)
     .storeBit(config.enforceOutOfOrder)
     .storeUint(config.defaultTokenFeeUsdCents, 16)
@@ -118,6 +118,7 @@ export const Builder = {
 export abstract class Params {}
 
 export abstract class Opcodes {
+  static updatePrices = 0x20000001
   static updateFeeTokens = 0x20000002
   static updateTransferFeeConfigs = 0x20000003
   static updateDestChainConfig = 0x20000004
@@ -177,6 +178,40 @@ export class FeeQuoter implements Contract {
     })
   }
 
+  async sendUpdatePrices(
+    provider: ContractProvider,
+    via: Sender,
+    opts: {
+      value: bigint
+      gasPrices: {
+        chainSelector: bigint
+        executionGasPrice: bigint
+        dataAvailabilityGasPrice: bigint
+      }[]
+      tokenPrices: { token: Address; price: bigint }[]
+    },
+  ) {
+    const tokenPrices = asSnakeData(opts.tokenPrices, (config) =>
+      new TonBuilder().storeAddress(config.token).storeInt(config.price, 224),
+    )
+    const gasPrices = asSnakeData(opts.gasPrices, (config) =>
+      new TonBuilder()
+        .storeInt(config.chainSelector, 64)
+        .storeInt(config.executionGasPrice, 112)
+        .storeInt(config.dataAvailabilityGasPrice, 112),
+    )
+
+    return await provider.internal(via, {
+      value: opts.value,
+      sendMode: SendMode.PAY_GAS_SEPARATELY,
+      body: beginCell()
+        .storeUint(Opcodes.updatePrices, 32)
+        .storeRef(tokenPrices)
+        .storeRef(gasPrices)
+        .endCell(),
+    })
+  }
+
   async sendUpdateFeeTokens(
     provider: ContractProvider,
     via: Sender,

contracts/wrappers/ccip/Logs.ts

@@ -11,8 +11,6 @@ export enum LogTypes {
 }
 
 export type CCIPMessageSent = {
-  destChainSelector: bigint
-  sequenceNumber: bigint
   message: {
     header: {
       messageId: bigint