Hebaov2 proxy call (#2571)

* [hebaov2] add some test for proxy call

* revert mainnet contract addresses

Author: kongliangzhong

packages/hebao_v2/.gitignore

@@ -6,3 +6,4 @@ artifacts/
 cache/
 build/
 ABI/
+libraries.js

packages/hebao_v2/contracts/price/UniswapV2PriceOracle.sol

@@ -14,7 +14,7 @@ contract UniswapV2PriceOracle is PriceOracle
 {
     using MathUint   for uint;
 
-    IUniswapV2Factory public immutable factory;
+    IUniswapV2Factory public factory;
     address public immutable wethAddress;
 
     constructor(

packages/hebao_v2/contracts/test/PriceOracleDelegate.sol

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2017 Loopring Technology Limited.
+pragma solidity ^0.7.0;
+
+import "../iface/PriceOracle.sol";
+
+/// @title PriceOracle
+contract PriceOracleDelegate is PriceOracle
+{
+    PriceOracle public immutable priceOracle;
+
+    constructor(
+        PriceOracle _priceOracle
+        )
+    {
+        priceOracle = _priceOracle;
+    }
+
+    function tokenValue(address token, uint amount)
+        public
+        view
+        override
+        returns (uint value)
+    {
+        return priceOracle.tokenValue(token, amount);
+    }
+}

packages/hebao_v2/contracts/test/TestUniswapV2Factory.sol

@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2017 Loopring Technology Limited.
+pragma solidity ^0.7.0;
+
+/// @title PriceOracle
+contract TestUniswapV2Factory
+{
+    mapping(address => mapping(address => address)) public getPair;
+}

packages/hebao_v2/deployment-mainnet.md

@@ -3,10 +3,10 @@
 ## Ethereum mainnet
 
 - deployer: 0x4374D3d032B3c96785094ec9f384f07077792768
-- priceOracle: 0x8fD3D838ffCEeB4FF4Dd5B0221A99C3B1dDB9aC9
+- priceOracle: 0xb124190942976431d8181fbe183e44584253da68
 - blankOwner: 0xb7390a217cee03545b5e2b33c6f6ce6012d9b9bd
-- smartWallet(masterCopy): 0x4cEEd96D7F3e327AaBC0d282231A406a19c52098
-- walletFactory: 0x73d969CeDfdf97767427Bd58809757235c532fD5
+- smartWallet(masterCopy): 0x5fC8A17DdED0a4dA0f9a1E44E6C26F80Aa514145
+- walletFactory: 0x57E037F4d2c8BEa011Ad8a9A5AF4AaEEd508650f
 - officialGuardian: 0xa4803058963e1314a938dbB4D9027D156e034f6f
 
 ## Arbitrum

packages/hebao_v2/script/parse-data.ts

@@ -67,14 +67,23 @@ async function decodeResult() {
   console.log("decoded:", decoded);
 }
 
+function decodeWithABI(abi: string, input: string) {
+  const abiJson = JSON.parse(abi);
+  const iface = new ethers.utils.Interface(abiJson);
+
+  const res = iface.parseTransaction({ data: input, value: "0" });
+  console.log("res:", res);
+  return res;
+}
+
 async function decodeWalletInput(input: string) {
   // const iface = new ethers.utils.Interface([
   //   "function executeMetaTx(address to, uint256 nonce, address gasToken, uint256 gasPrice, uint256 gasLimit, uint256 gasOverhead, bool requiresSuccess, bytes data, bytes signature)"
   // ]);
 
   const iface = await getWalletIface();
   const res = iface.parseTransaction({ data: input, value: "0" });
-  // console.log("res:", res);
+  console.log("res:", res);
   return res;
 }
 
@@ -91,7 +100,7 @@ export async function decodeMetaTx(input: string) {
 
   const innerTx = await decodeWalletInput(metaTx.args.data);
 
-  // console.log("innerTx:", innerTx.args.approval);
+  console.log("innerTx:", innerTx.args.approval);
   return innerTx;
 }
 
@@ -174,14 +183,19 @@ async function main() {
   // await signMetaTxTest();
   // await decodeResult();
 
-  await decodeWalletFactoryInput(
-    "0xd92d1f5600000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e20cf871f1646d8651ee9dc95aab1d93160b34670000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000017b5dc97cfc000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000042e58444e3f0638209443306de7cc6cf89ba107939b191cbd407e7422eef1830eb6c118a3592c5dc53966573b52f24b32d476e36e948bf19aa209a9873e3bc9d4b1c02000000000000000000000000000000000000000000000000000000000000"
-  );
+  // await decodeWalletFactoryInput(
+  //   "0xd92d1f5600000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e20cf871f1646d8651ee9dc95aab1d93160b34670000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000017b5dc97cfc000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000042e58444e3f0638209443306de7cc6cf89ba107939b191cbd407e7422eef1830eb6c118a3592c5dc53966573b52f24b32d476e36e948bf19aa209a9873e3bc9d4b1c02000000000000000000000000000000000000000000000000000000000000"
+  // );
 
   // await decodeMetaTx(
-  //   "0x09779927000000000000000000000000acba35c89046f6083bbd6bf6d6e88b438c9b1a1b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f424000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000dfa9b2ab43b881430b6f52122618cc6b8f3a2c90000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000000000000003a000000000000000000000000000000000000000000000000000000000000002249a792d4600000000000000000000000000000000000000000000000000000000000000600000000000000000000000002efc7efa9b179b4a176e2418e63b53c66a8a8c9c00000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000006130c75e000000000000000000000000acba35c89046f6083bbd6bf6d6e88b438c9b1a1b0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000d5535729714618e57c42a072b8d56e72517f380000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004245d2d657baa5c0549a4256e3d59a0518b849713cf302d03169cd40f33190043a2d9ff034f18417cb23fb6158877e0ff125e360422d6ffe1870543feb35bd848c1c020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000d5535729714618e57c42a072b8d56e72517f38000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000426109caa55149334d33c052b2ea2802ba7be56b9b59f2f990970d3d57f954edb778aafae94d433816ae1eee14dee6146fc254dfeacb01f62e067ce71d36d318681c02000000000000000000000000000000000000000000000000000000000000"
+  //   "0x09779927000000000000000000000000f9bd8230650e9a956a7003f211c1fd6e0884ee160000000000000000000000000000000000000000000000000000017be7bec2010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f42400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000edee915ae45cc4b2fdd1ce12a2f70dca0b2ad9e500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000001042e9feb790000000000000000000000000baba1ad5be3a5c0a66e7ac838a129bf948f1ea40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000044d59acd25000000000000000000000000f9bd8230650e9a956a7003f211c1fd6e0884ee1631062154e712224164f51d1eb7d4b173ce9cf017aab0db00ba5068f10f523770000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000428a7872f8cd82f511fae63e754c6554c970a3b9de5ea82f13fb62e6a213b53a0815e818fd5c0347867a8e6f021a94f0494a3aafb55f76f184ce3e0044fafc8caa1b02000000000000000000000000000000000000000000000000000000000000"
   // );
 
+  decodeWithABI(
+    '[{"inputs":[{"internalType":"contract IUniswapV2Factory","name":"_factory","type":"address"},{"internalType":"address","name":"_wethAddress","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"tokenValue","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}]',
+    "0xf18217830000000000000000000000000baba1ad5be3a5c0a66e7ac838a129bf948f1ea40000000000000000000000000000000000000000000000000de0b6b3a7640000"
+  );
+
   // signTest();
   // recoverSignature(
   //   "0xE20cF871f1646d8651ee9dC95AAB1d93160b3467",

packages/hebao_v2/test/proxy.spec.ts

@@ -0,0 +1,53 @@
+import { expect } from "./setup";
+const { ethers } = require("hardhat");
+
+import { Contract, Signer } from "ethers";
+import BN = require("bn.js");
+
+describe("proxy", () => {
+  before(async () => {});
+
+  describe("fallback call", () => {
+    it.only("proxy revert when proxy call returns 0", async () => {
+      const factory = await (await ethers.getContractFactory(
+        "TestUniswapV2Factory"
+      )).deploy();
+      const wethAddr = "0x" + "01".repeat(20);
+      const uniswapV2PriceOracle = await (await ethers.getContractFactory(
+        "UniswapV2PriceOracle"
+      )).deploy(factory.address, wethAddr);
+      const priceOracleDelegate = await (await ethers.getContractFactory(
+        "PriceOracleDelegate"
+      )).deploy(uniswapV2PriceOracle.address);
+
+      const proxy = await (await ethers.getContractFactory(
+        "OwnedUpgradeabilityProxy"
+      )).deploy();
+      const proxyPriceOracle = await (await ethers.getContractFactory(
+        "UniswapV2PriceOracle"
+      )).attach(proxy.address);
+
+      await proxy.upgradeTo(uniswapV2PriceOracle.address);
+      try {
+        const tokenValue2 = await proxyPriceOracle.tokenValue(
+          "0x" + "11".repeat(20),
+          1000
+        );
+        console.log("tokenValue2:", tokenValue2.toString());
+      } catch (err) {
+        console.log("err:", err);
+        expect(err.message.includes("revert"));
+      }
+
+      await proxy.upgradeTo(priceOracleDelegate.address);
+      const proxyDelegateOracle = await (await ethers.getContractFactory(
+        "PriceOracleDelegate"
+      )).attach(proxy.address);
+      const tokenValue3 = await proxyDelegateOracle.tokenValue(
+        "0x" + "11".repeat(20),
+        1000
+      );
+      console.log("tokenValue3:", tokenValue3.toString());
+    });
+  });
+});