feat(target_chains/fuel): use saturating sub (#2031)

cctdaniel · web-flow · commit 4ab64d2539a7 · 2024-10-14T14:40:19.000+09:00
* use saturating sub

* update fuel version

* commit release binary file

* update fuel sdk version

* update pnpm lock

* precommit
diff --git a/apps/price_pusher/config.fuel.testnet.sample.json b/apps/price_pusher/config.fuel.testnet.sample.json
@@ -1,6 +1,6 @@
 {
   "endpoint": "https://testnet.fuel.network/v1/graphql",
-  "pyth-contract-address": "0xe31e04946c67fb41923f93d50ee7fc1c6c99d6e07c02860c6bea5f4a13919277",
+  "pyth-contract-address": "0x25146735b29d4216639f7f8b1d7b921ff87a1d3051de62d6cceaacabeb33b8e7",
   "price-service-endpoint": "https://hermes.pyth.network",
   "private-key-file": "./mnemonic",
   "price-config-file": "./price-config.stable.sample.yaml"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/target_chains/fuel/contracts/Forc.lock b/target_chains/fuel/contracts/Forc.lock
@@ -1,6 +1,6 @@
 [[package]]
 name = "core"
-source = "path+from-root-4BB20845430AF9CF"
+source = "path+from-root-8357A6DDC5F39D14"
 
 [[package]]
 name = "pyth-contract"
@@ -32,7 +32,7 @@ dependencies = ["std"]
 
 [[package]]
 name = "std"
-source = "git+https://github.com/fuellabs/sway?tag=v0.63.5#31a1d6f98395f571cd3674b492d9bf4773c55f65"
+source = "git+https://github.com/fuellabs/sway?tag=v0.65.2#66bb430395daf5b8f7205f7b9d8d008e2e812d54"
 dependencies = ["core"]
 
 [[package]]
diff --git a/target_chains/fuel/contracts/fuel-toolchain.toml b/target_chains/fuel/contracts/fuel-toolchain.toml
@@ -2,5 +2,5 @@
 channel = "latest-aarch64-apple-darwin"
 
 [components]
-forc = "0.63.5"
-fuel-core = "0.35.0"
+forc = "0.65.2"
+fuel-core = "0.37.1"
diff --git a/target_chains/fuel/contracts/pyth-contract/out/release/pyth-contract-abi.json b/target_chains/fuel/contracts/pyth-contract/out/release/pyth-contract-abi.json
@@ -266,10 +266,6 @@
           "name": "FeesCanOnlyBePaidInTheBaseAsset",
           "typeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d"
         },
-        {
-          "name": "FuturePriceNotAllowed",
-          "typeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d"
-        },
         {
           "name": "GuardianSetNotFound",
           "typeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d"
@@ -1535,7 +1531,7 @@
     {
       "name": "DEPLOYER",
       "concreteTypeId": "ab7cd04e05be58e3fc15d424c2c4a57f824a2a2d97d67252440a3925ebdc1335",
-      "offset": 132984
+      "offset": 133088
     }
   ]
 }
diff --git a/target_chains/fuel/contracts/pyth-contract/out/release/pyth-contract.bin b/target_chains/fuel/contracts/pyth-contract/out/release/pyth-contract.bin
diff --git a/target_chains/fuel/contracts/pyth-contract/src/main.sw b/target_chains/fuel/contracts/pyth-contract/src/main.sw
@@ -331,10 +331,13 @@ fn ema_price_unsafe(price_feed_id: PriceFeedId) -> Price {
 fn price_no_older_than(time_period: u64, price_feed_id: PriceFeedId) -> Price {
     let price = price_unsafe(price_feed_id);
     let current_time = timestamp();
-    require(
-        current_time - price.publish_time <= time_period,
-        PythError::OutdatedPrice,
-    );
+    // Mimicking saturating subtraction to avoid underflow
+    let time_difference = if current_time > price.publish_time {
+        current_time - price.publish_time
+    } else {
+        0
+    };
+    require(time_difference <= time_period, PythError::OutdatedPrice);
 
     price
 }
diff --git a/target_chains/fuel/contracts/pyth-interface/src/data_structures/price.sw b/target_chains/fuel/contracts/pyth-interface/src/data_structures/price.sw
@@ -175,11 +175,6 @@ impl PriceFeed {
         //convert publish_time from UNIX to TAI64
         publish_time += TAI64_DIFFERENCE;
 
-        require(
-            publish_time <= timestamp(),
-            PythError::FuturePriceNotAllowed,
-        );
-
         PriceFeed::new(
             Price::new(ema_confidence, exponent, ema_price, publish_time),
             price_feed_id,
diff --git a/target_chains/fuel/contracts/pyth-interface/src/errors.sw b/target_chains/fuel/contracts/pyth-interface/src/errors.sw
@@ -2,7 +2,6 @@ library;
 
 pub enum PythError {
     FeesCanOnlyBePaidInTheBaseAsset: (),
-    FuturePriceNotAllowed: (),
     GuardianSetNotFound: (),
     IncorrectMessageType: (),
     InsufficientFee: (),
diff --git a/target_chains/fuel/sdk/js/package.json b/target_chains/fuel/sdk/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pythnetwork/pyth-fuel-js",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Pyth Network Fuel Utils in JS",
   "homepage": "https://pyth.network",
   "author": {
@@ -45,6 +45,6 @@
     "typescript": "^5.4.5"
   },
   "dependencies": {
-    "fuels": "^0.94.5"
+    "fuels": "^0.96.1"
   }
 }
diff --git a/target_chains/fuel/sdk/js/src/abi/pyth-contract-abi.json b/target_chains/fuel/sdk/js/src/abi/pyth-contract-abi.json
@@ -266,10 +266,6 @@
           "name": "FeesCanOnlyBePaidInTheBaseAsset",
           "typeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d"
         },
-        {
-          "name": "FuturePriceNotAllowed",
-          "typeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d"
-        },
         {
           "name": "GuardianSetNotFound",
           "typeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d"
@@ -1535,7 +1531,7 @@
     {
       "name": "DEPLOYER",
       "concreteTypeId": "ab7cd04e05be58e3fc15d424c2c4a57f824a2a2d97d67252440a3925ebdc1335",
-      "offset": 132984
+      "offset": 133088
     }
   ]
 }
diff --git a/target_chains/fuel/sdk/js/src/index.ts b/target_chains/fuel/sdk/js/src/index.ts
@@ -2,7 +2,11 @@ import PYTH_CONTRACT_ABI from "./abi/pyth-contract-abi.json";
 
 /** Address of the Pyth contract on Fuel Sepolia (testnet). */
 export const PYTH_CONTRACT_ADDRESS_SEPOLIA =
-  "0xe31e04946c67fb41923f93d50ee7fc1c6c99d6e07c02860c6bea5f4a13919277";
+  "0x25146735b29d4216639f7f8b1d7b921ff87a1d3051de62d6cceaacabeb33b8e7";
+
+/** Address of the Pyth contract on Fuel Mainnet. */
+export const PYTH_CONTRACT_ADDRESS_MAINNET =
+  "0x1c86fdd9e0e7bc0d2ae1bf6817ef4834ffa7247655701ee1b031b52a24c523da";
 
 /** Asset ID of ETH on Fuel. */
 export const FUEL_ETH_ASSET_ID =
diff --git a/target_chains/fuel/sdk/js/src/types/PythContract.ts b/target_chains/fuel/sdk/js/src/types/PythContract.ts
@@ -5,7 +5,7 @@
 /* eslint-disable @typescript-eslint/consistent-type-imports */
 
 /*
-  Fuels version: 0.94.5
+  Fuels version: 0.96.1
 */
 
 import { Contract, Interface } from "fuels";
@@ -78,7 +78,6 @@ export enum InitializationErrorOutput {
 }
 export enum PythErrorInput {
   FeesCanOnlyBePaidInTheBaseAsset = "FeesCanOnlyBePaidInTheBaseAsset",
-  FuturePriceNotAllowed = "FuturePriceNotAllowed",
   GuardianSetNotFound = "GuardianSetNotFound",
   IncorrectMessageType = "IncorrectMessageType",
   InsufficientFee = "InsufficientFee",
@@ -115,7 +114,6 @@ export enum PythErrorInput {
 }
 export enum PythErrorOutput {
   FeesCanOnlyBePaidInTheBaseAsset = "FeesCanOnlyBePaidInTheBaseAsset",
-  FuturePriceNotAllowed = "FuturePriceNotAllowed",
   GuardianSetNotFound = "GuardianSetNotFound",
   IncorrectMessageType = "IncorrectMessageType",
   InsufficientFee = "InsufficientFee",
@@ -673,11 +671,6 @@ const abi = {
           typeId:
             "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d",
         },
-        {
-          name: "FuturePriceNotAllowed",
-          typeId:
-            "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d",
-        },
         {
           name: "GuardianSetNotFound",
           typeId:
@@ -2123,7 +2116,7 @@ const abi = {
       name: "DEPLOYER",
       concreteTypeId:
         "ab7cd04e05be58e3fc15d424c2c4a57f824a2a2d97d67252440a3925ebdc1335",
-      offset: 132984,
+      offset: 133088,
     },
   ],
 };
@@ -2178,6 +2171,7 @@ const storageSlots: StorageSlot[] = [
     value: "0000000000000000000000000000000000000000000000000000000000000000",
   },
 ];
+
 export class PythContractInterface extends Interface {
   constructor() {
     super(abi);
diff --git a/target_chains/fuel/sdk/js/src/types/PythContractFactory.ts b/target_chains/fuel/sdk/js/src/types/PythContractFactory.ts
diff --git a/target_chains/fuel/sdk/js/src/types/common.d.ts b/target_chains/fuel/sdk/js/src/types/common.d.ts
@@ -5,7 +5,7 @@
 /* eslint-disable @typescript-eslint/consistent-type-imports */
 
 /*
-  Fuels version: 0.94.5
+  Fuels version: 0.96.1
 */
 
 /**
diff --git a/target_chains/fuel/sdk/js/src/types/index.ts b/target_chains/fuel/sdk/js/src/types/index.ts
@@ -5,7 +5,7 @@
 /* eslint-disable @typescript-eslint/consistent-type-imports */
 
 /*
-  Fuels version: 0.94.5
+  Fuels version: 0.96.1
 */
 
 export { PythContract } from "./PythContract";

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"endpoint": "https://testnet.fuel.network/v1/graphql",`
`3`		`- "pyth-contract-address": "0xe31e04946c67fb41923f93d50ee7fc1c6c99d6e07c02860c6bea5f4a13919277",`
	`3`	`+ "pyth-contract-address": "0x25146735b29d4216639f7f8b1d7b921ff87a1d3051de62d6cceaacabeb33b8e7",`
`4`	`4`	`"price-service-endpoint": "https://hermes.pyth.network",`
`5`	`5`	`"private-key-file": "./mnemonic",`
`6`	`6`	`"price-config-file": "./price-config.stable.sample.yaml"`
Original file line number	Diff line number	Diff line change
`@@ -266,10 +266,6 @@`
`266`	`266`	`"name": "FeesCanOnlyBePaidInTheBaseAsset",`
`267`	`267`	`"typeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d"`
`268`	`268`	`},`
`269`		`- {`
`270`		`- "name": "FuturePriceNotAllowed",`
`271`		`- "typeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d"`
`272`		`- },`
`273`	`269`	`{`
`274`	`270`	`"name": "GuardianSetNotFound",`
`275`	`271`	`"typeId": "2e38e77b22c314a449e91fafed92a43826ac6aa403ae6a8acb6cf58239fbaf5d"`
`@@ -1535,7 +1531,7 @@`
`1535`	`1531`	`{`
`1536`	`1532`	`"name": "DEPLOYER",`
`1537`	`1533`	`"concreteTypeId": "ab7cd04e05be58e3fc15d424c2c4a57f824a2a2d97d67252440a3925ebdc1335",`
`1538`		`- "offset": 132984`
	`1534`	`+ "offset": 133088`
`1539`	`1535`	`}`
`1540`	`1536`	`]`
`1541`	`1537`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@pythnetwork/pyth-fuel-js",`
`3`		`- "version": "1.0.6",`
	`3`	`+ "version": "1.0.7",`
`4`	`4`	`"description": "Pyth Network Fuel Utils in JS",`
`5`	`5`	`"homepage": "https://pyth.network",`
`6`	`6`	`"author": {`
`@@ -45,6 +45,6 @@`
`45`	`45`	`"typescript": "^5.4.5"`
`46`	`46`	`},`
`47`	`47`	`"dependencies": {`
`48`		`- "fuels": "^0.94.5"`
	`48`	`+ "fuels": "^0.96.1"`
`49`	`49`	`}`
`50`	`50`	`}`