revert UpdatePrices value bump (#733)

* revert updatePrices value bamp

* bump contractversions

* accept multiple previous versions on migrate function and upgradeable tests

* address pr comments

* remove unused version constants

Author: vicentevieytes

contracts/contracts/ccip/fee_quoter/contract.tolk

@@ -16,8 +16,7 @@ import "../../lib/math";
 import "../router/messages"
 import "../ccipsend_executor/messages"
 
-const CONTRACT_VERSION_PREV = "1.6.0";
-const CONTRACT_VERSION = "1.6.1";
+const CONTRACT_VERSION = "1.6.2";
 const RESERVE = ton("1");
 
 fun onInternalMessage(in: InMessage) {
@@ -662,13 +661,19 @@ get fun reserve(): coins {
 @method_id(1000)
 fun migrate(storage: cell, version: slice): cell {
     val NEW_THRESHOLD = 24 * 60 * 60; //  86400 seconds = 24 hours
-
-    assert (version.bitsEqual(CONTRACT_VERSION_PREV)) throw Upgradeable_Error.VersionMismatch;
+    requireSupportedVersion(version);
     var st = Storage.fromCell(storage);
-    st.tokenPriceStalenessThreshold = NEW_THRESHOLD; 
-    
+    st.tokenPriceStalenessThreshold = NEW_THRESHOLD;
     return st.toCell();
 }
 
+fun requireSupportedVersion(version: slice) {
+    assert (
+        version.bitsEqual("1.6.0")
+        || version.bitsEqual("1.6.1")
+    ) 
+    throw Upgradeable_Error.VersionMismatch;
+}
+
 @method_id(1001)
 fun version(): slice { return CONTRACT_VERSION; }

contracts/contracts/ccip/fee_quoter/messages.tolk

@@ -80,5 +80,5 @@ fun FeeQuoter_Costs.GetValidatedFee(): int {
 
 fun FeeQuoter_Costs.updatePrices(): int {
     // when we support token transfers the message value amount should depend on the quantity of supported tokens
-    return ton("0.03");
+    return ton("0.01");
 }

contracts/contracts/ccip/offramp/contract.tolk

@@ -25,8 +25,7 @@ import "types"
 import "storage"
 import "events"
 
-const CONTRACT_VERSION_PREV = "1.6.0";
-const CONTRACT_VERSION = "1.6.1";
+const CONTRACT_VERSION = "1.6.2";
 const RESERVE = ton("5");
 const MIN_GASLIMIT = ton("0.025");
 
@@ -238,10 +237,18 @@ fun onUpgrade(msg: Upgradeable_Upgrade) {
 
 @method_id(1000)
 fun migrate(storage: cell, version: slice): cell {
-    assert (version.bitsEqual(CONTRACT_VERSION_PREV)) throw Upgradeable_Error.VersionMismatch;
+    requireSupportedVersion(version);
     return storage;
 }
 
+fun requireSupportedVersion(version: slice) {
+    assert (
+        version.bitsEqual("1.6.0")
+        || version.bitsEqual("1.6.1")
+    ) 
+    throw Upgradeable_Error.VersionMismatch;
+}
+
 @method_id(1001)
 fun version(): slice { return CONTRACT_VERSION; }
 

contracts/default.nix

@@ -88,6 +88,32 @@
         cp -r * $out/
       '';
 
+      meta = with pkgs.lib; {
+        description = "Chainlink TON smart contracts";
+
+        # TODO: update to MIT after March 12, 2029 as per LICENSE file
+        license = licenses.bsl11;
+
+        # TODO: update to contracts project-specific tag
+        changelog = "https://github.com/smartcontractkit/chainlink-ton/releases/tag/v${finalAttrs.version}";
+      };
+    });
+    contracts_1_6_1 = pkgs.stdenv.mkDerivation (finalAttrs: rec {
+      pname = "chainlink-contracts-ton";
+
+      src = builtins.fetchurl {
+        url = "https://github.com/smartcontractkit/chainlink-ton/releases/download/contracts/${finalAttrs.version}/contracts-${finalAttrs.version}.tar.gz";
+        sha256 = "sha256:0j9f7pxqamqj1p3zrfa9kggx15j80p5whv514w2wi1dp5zhmpfs1";
+      };
+      version = "1.6.1";
+      sourceRoot = "."; # pin source root to avoid issues with unpacker (produced multiple directories)
+
+      skipBuild = true;
+      installPhase = ''
+        mkdir -p $out
+        cp -r * $out/
+      '';
+
       meta = with pkgs.lib; {
         description = "Chainlink TON smart contracts";
 
@@ -105,6 +131,7 @@ in {
     contracts = pkgs.callPackage ./shell.nix {
       inherit pkgs;
       contracts_1_6 = packages.contracts_1_6;
+      contracts_1_6_1 = packages.contracts_1_6_1;
       jetton-contracts = packages.contracts-jetton-func;
       inherit oplint;
     };

contracts/shell.nix

@@ -3,6 +3,7 @@
   pkgs,
   lib,
   contracts_1_6,
+  contracts_1_6_1,
   jetton-contracts,
   oplint,
 }:
@@ -27,10 +28,12 @@ pkgs.mkShell {
 
   PATH_CONTRACTS_JETTON = "${jetton-contracts}/lib/node_modules/jetton/build/";
   PATH_CONTRACTS_1_6 = "${contracts_1_6}"; # Notice: loaded from GH release, artifacts in root of the package
+  PATH_CONTRACTS_1_6_1 = "${contracts_1_6_1}"; # Notice: loaded from GH release, artifacts in root of the package
 
   shellHook = ''
     echo "Loaded TVM contracts at following paths:"
     echo "  - CCIP 1.6.0: (env:PATH_CONTRACTS_1_6)    $PATH_CONTRACTS_1_6"
+    echo "  - CCIP 1.6.1: (env:PATH_CONTRACTS_1_6_1)    $PATH_CONTRACTS_1_6_1"
     echo "  - Jetton:     (env:PATH_CONTRACTS_JETTON) $PATH_CONTRACTS_JETTON"
   '';
 }

contracts/tests/ccip/OffRamp.spec.ts

@@ -172,22 +172,24 @@ describe('OffRamp - Withdrawable Tests', () => {
 
 describe('OffRamp - Upgrade Tests', () => {
   class OffRamp extends of.OffRamp {}
-  class OffRampPrev extends of.OffRamp {
-    static code(): Promise<Cell> {
-      return contractCode.ccip.release_1_6_0('OffRamp')
-    }
-  }
+
+  const codeLoaders = {
+    '1.6.0': () => contractCode.ccip.release_1_6_0('OffRamp'),
+    '1.6.1': () => contractCode.ccip.release_1_6_1('OffRamp'),
+  } as Record<string, () => Promise<Cell>>
 
   const upgradeSpec = UpgradeableSpec.newUpgradeSpec({
-    contractType: OffRampPrev.type(),
-    prevVersion: of.OFFRAMP_CONTRACT_VERSION_PREV,
+    contractType: of.OffRamp.type(),
+    prevVersionConfigs: of.OFFRAMP_SUPPORTED_PREV_VERSIONS.map((version) => ({
+      version,
+      getCode: codeLoaders[version],
+      deploy: async (blockchain: Blockchain, owner: SandboxContract<TreasuryContract>) =>
+        deployOffRampContract(blockchain, owner, await codeLoaders[version]()),
+    })),
     currentVersion: OffRamp.version(),
-    getPrevCode: () => OffRampPrev.code(),
     getCurrentCode: () => OffRamp.code(),
     CurrentVersionConstructor: OffRamp,
     upgradeValue: toNano('0.05'),
-    deployPrevContract: async (blockchain, owner) =>
-      deployOffRampContract(blockchain, owner, await OffRampPrev.code()),
   })
   upgradeSpec.run([
     {

contracts/tests/ccip/feequoter/FeeQuoter.spec.ts

@@ -15,7 +15,7 @@ import * as ownable2step from '../../../wrappers/libraries/access/Ownable2Step'
 import * as fq from '../../../wrappers/ccip/FeeQuoter'
 import { Cell, toNano } from '@ton/core'
 import { contractCode } from '../../../wrappers/codeLoader'
-import { FEE_QUOTER_CONTRACT_VERSION_PREV } from '../../../wrappers/ccip/FeeQuoter'
+import { FEE_QUOTER_SUPPORTED_PREV_VERSIONS } from '../../../wrappers/ccip/FeeQuoter'
 
 describe('FeeQuoter - Withdrawable Tests', () => {
   const withdrawableSpec = newWithdrawableSpec({
@@ -50,74 +50,31 @@ describe('FeeQuoter - TypeAndVersion Tests', () => {
 
 describe('FeeQuoter - Upgrade Tests', () => {
   class FeeQuoter extends fq.FeeQuoter {}
-  class FeeQuoterPrev extends fq.FeeQuoter {
-    static code(): Promise<Cell> {
-      return contractCode.ccip.release_1_6_0('FeeQuoter')
-    }
-  }
+
+  const codeLoaders = {
+    '1.6.0': () => contractCode.ccip.release_1_6_0('FeeQuoter'),
+    '1.6.1': () => contractCode.ccip.release_1_6_1('FeeQuoter'),
+  } as Record<string, () => Promise<Cell>>
 
   const upgradeSpec = UpgradeableSpec.newUpgradeSpec({
-    contractType: FeeQuoterPrev.type(),
-    prevVersion: FEE_QUOTER_CONTRACT_VERSION_PREV,
+    contractType: fq.FeeQuoter.type(),
+    prevVersionConfigs: FEE_QUOTER_SUPPORTED_PREV_VERSIONS.map((version) => ({
+      version,
+      getCode: codeLoaders[version],
+      deploy: async (blockchain, owner) =>
+        setupTestFeeQuoter(owner, blockchain, await codeLoaders[version]()),
+    })),
     currentVersion: FeeQuoter.version(),
-    getPrevCode: () => FeeQuoterPrev.code(),
     getCurrentCode: () => FeeQuoter.code(),
     CurrentVersionConstructor: FeeQuoter,
     upgradeValue: toNano('0.05'),
-    deployPrevContract: async (blockchain, owner) =>
-      setupTestFeeQuoter(owner, blockchain, await FeeQuoterPrev.code()),
   })
   upgradeSpec.run([
     {
       code: 'FeeQuoter',
       name: 'feequoter',
     },
   ])
-
-  it('should change tokenPriceStalenessThreshold on upgrade', async () => {
-    const blockchain = await Blockchain.create()
-    const deployer = await blockchain.treasury('deployer')
-
-    // deploy prev version
-    const feeQuoterPrev = await setupTestFeeQuoter(deployer, blockchain, await FeeQuoterPrev.code())
-    const loadStorage = async () => {
-      const contract = await blockchain.getContract(feeQuoterPrev.address)
-      if (!contract.account.account) {
-        throw new Error('Contract account not found')
-      }
-      const storage = contract.account.account.storage
-      if (storage.state.type != 'active') {
-        throw new Error('Contract is not active')
-      }
-      if (!storage.state.state.data) {
-        throw new Error('Contract has no data')
-      }
-      return fq.builder.data.contractData.load(storage.state.state.data.asSlice())
-    }
-    const originalStorage = await loadStorage()
-    const originalThreshold = originalStorage.tokenPriceStalenessThreshold
-    const expectedNewThreshold = 86400 // 24 hours in seconds
-    expect(originalThreshold).not.toBe(expectedNewThreshold) // sanity check
-    const expectedNewStorage = {
-      ...originalStorage,
-      tokenPriceStalenessThreshold: expectedNewThreshold,
-    }
-
-    // perform upgrade
-    const result = await feeQuoterPrev.sendUpgrade(deployer.getSender(), toNano('0.05'), {
-      queryId: 0n,
-      code: await FeeQuoter.code(),
-    })
-    expect(result.transactions).toHaveTransaction({
-      from: deployer.address,
-      to: feeQuoterPrev.address,
-      success: true,
-    })
-
-    // verify storage was updated
-    const newStorage = await loadStorage()
-    expect(newStorage).toEqual(expectedNewStorage)
-  })
 })
 
 describe('FeeQuoter - Ownable Tests', () => {

contracts/tests/examples/versioning/UpgradeableCounter.spec.ts

@@ -64,27 +64,31 @@ async function setUpTest(i: number): Promise<{
 describe('UpgradeableCounter - Upgrade Tests', () => {
   const upgradeSpec = newUpgradeSpec({
     contractType: upCounterV1.ContractClient.type(),
-    prevVersion: upCounterV1.ContractClient.version(),
+    prevVersionConfigs: [
+      {
+        version: upCounterV1.ContractClient.version(),
+        getCode: () => upCounterV1.ContractClient.code(),
+        deploy: async (blockchain, owner) => {
+          const codeV1 = await upCounterV1.ContractClient.code()
+          const contract = blockchain.openContract(
+            upCounterV1.ContractClient.createFromConfig(
+              {
+                id: 0,
+                value: 0,
+                ownable: { owner: owner.address, pendingOwner: null },
+              },
+              codeV1,
+            ),
+          )
+          const deployer = await blockchain.treasury('deployer')
+          await contract.sendDeploy(deployer.getSender(), toNano('0.05'))
+          return contract
+        },
+      },
+    ],
     currentVersion: upCounterV2.ContractClient.version(),
-    getPrevCode: () => upCounterV1.ContractClient.code(),
     getCurrentCode: () => upCounterV2.ContractClient.code(),
     CurrentVersionConstructor: upCounterV2.ContractClient,
-    deployPrevContract: async (blockchain, owner) => {
-      const codeV1 = await upCounterV1.ContractClient.code()
-      const contract = blockchain.openContract(
-        upCounterV1.ContractClient.createFromConfig(
-          {
-            id: 0,
-            value: 0,
-            ownable: { owner: owner.address, pendingOwner: null },
-          },
-          codeV1,
-        ),
-      )
-      const deployer = await blockchain.treasury('deployer')
-      await contract.sendDeploy(deployer.getSender(), toNano('0.05'))
-      return contract
-    },
   })
   upgradeSpec.run()
 })