diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 358ebc0..5831f14 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,6 +22,11 @@ jobs: with: submodules: recursive + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.10' + - name: Install Vyper run: pip install vyper==0.3.7 diff --git a/script/BaseScript.s.sol b/script/BaseScript.s.sol index fb5ad0d..6b6235f 100644 --- a/script/BaseScript.s.sol +++ b/script/BaseScript.s.sol @@ -22,7 +22,5 @@ abstract contract BaseScript is Script { Deployer public deployer = Deployer(0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed); - address public v3Safe = 0x33333333D5eFb92f19a5F94a43456b3cec2797AE; - address public initGov = 0x6f3cBE2ab3483EC4BA7B672fbdCa0E9B33F88db8; } diff --git a/script/DeployAprOracle.s.sol b/script/DeployAprOracle.s.sol index b6bd530..2fbd3c6 100644 --- a/script/DeployAprOracle.s.sol +++ b/script/DeployAprOracle.s.sol @@ -10,13 +10,12 @@ contract DeployAprOracle is BaseScript { vm.startBroadcast(); // Encode constructor arguments - bytes memory construct = abi.encode(v3Safe); + bytes memory construct = abi.encode(initGov); // Get the bytecode bytes memory bytecode = abi.encodePacked(vm.getCode("AprOracle.sol:AprOracle"), construct); - // Pick an unique salt - bytes32 salt = keccak256("APR Oracle"); + bytes32 salt; address contractAddress = deployer.deployCreate2(salt, bytecode);