Merge pull request #16 from killroy192/fix/trade

fix trading for scripts
killroy192 · Dec 6, 2023 · 21f7cf3 · 21f7cf3
2 parents e66fb1d + 65d092c
commit 21f7cf3
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 41 deletions.
diff --git a/demo/.github/workflows/contracts.yml b/demo/.github/workflows/contracts.yml
diff --git a/demo/.gitignore b/demo/.gitignore
diff --git a/demo/README.md → demo/app/README.md b/demo/README.md → demo/app/README.md
diff --git a/demo/img/arch-overview-trade.png b/demo/img/arch-overview-trade.png
diff --git a/demo/img/arch-overview.png b/demo/img/arch-overview.png
diff --git a/demo/img/architecture-overview.png b/demo/img/architecture-overview.png
diff --git a/deployment-lock.json b/deployment-lock.json
diff --git a/scripts/e2e/example/trade.js b/scripts/e2e/example/trade.js
@@ -1,6 +1,5 @@
 const hre = require("hardhat");
 const { getDeploymentLockData } = require("../../common");
-const hre = require("hardhat");
 
 const { ethers, network } = hre;
 const coder = new ethers.AbiCoder();
@@ -55,18 +54,18 @@ async function main() {
     "FakedOracleProxy",
     lock.FakedOracleProxy.addr,
   );
+  const usdc = await ethers.getContractAt("FUSDC", lock.FUSDC.addr);
 
-  const initBalance = await usdc.balanceOf(signerAddr);
+  console.log("USD balance before trade: ", await usdc.balanceOf(signerAddr));
 
   await consumer.trade(tradeArgs, nonce, {
-    value: hre.ethers.parseEther("0.01"),
+    value: hre.ethers.parseEther("0.005"),
   });
 
-  const usdc = await ethers.getContractAt("FUSDC", lock.FUSDC.addr);
-
-  const balance = initBalance - await usdc.balanceOf(signerAddr);
+  // wait ~block for automation to perform a swap
+  await new Promise((res) => setTimeout(res, 4500));
 
-  console.log("Successfully traded fWETH tokens for fUSDC", balance);
+  console.log("USD balance after trade: ", await usdc.balanceOf(signerAddr));
 
   console.log("run fallback check logic..");
 

diff --git a/src/Oracle.sol b/src/Oracle.sol
@@ -143,7 +143,7 @@ contract Oracle is IOracle, DataStreamConsumer, ReentrancyGuard {
 
         bool success = IOracleConsumerContract(callbackContract).consume(
             ForwardData({
-                price: int256(0),
+                price: int256(report.price),
                 feedType: FeedType.DataStream,
                 forwardArguments: callbackArgs
             })
@@ -186,7 +186,9 @@ contract Oracle is IOracle, DataStreamConsumer, ReentrancyGuard {
 
         bool success = IOracleConsumerContract(callbackContract).consume(
             ForwardData({
-                price: price,
+                // price convertion to 18 decimals is hardcoded for ETH\USD
+                // TODO: implement flexible conversion
+                price: price * 10 ** 10,
                 feedType: FeedType.PriceFeed,
                 forwardArguments: callbackArgs
             })