diff --git a/simulations/vip-153/vip-153-testnet/abi/PSR.json b/simulations/vip-153/vip-153-testnet/abi/PSR.json index 397cb46f7..59cb25b42 100644 --- a/simulations/vip-153/vip-153-testnet/abi/PSR.json +++ b/simulations/vip-153/vip-153-testnet/abi/PSR.json @@ -152,9 +152,9 @@ }, { "indexed": false, - "internalType": "uint256", + "internalType": "uint8", "name": "percentage", - "type": "uint256" + "type": "uint8" }, { "indexed": false, @@ -177,15 +177,40 @@ }, { "indexed": false, - "internalType": "uint256", + "internalType": "uint8", + "name": "percentage", + "type": "uint8" + }, + { + "indexed": false, + "internalType": "enum ProtocolShareReserve.Schema", + "name": "schema", + "type": "uint8" + } + ], + "name": "DistributionConfigRemoved", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "destination", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint8", "name": "oldPercentage", - "type": "uint256" + "type": "uint8" }, { "indexed": false, - "internalType": "uint256", + "internalType": "uint8", "name": "newPercentage", - "type": "uint256" + "type": "uint8" }, { "indexed": false, @@ -305,6 +330,25 @@ "name": "PoolRegistryUpdated", "type": "event" }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "asset", + "type": "address" + }, + { + "indexed": false, + "internalType": "bool", + "name": "isPrimeAsset", + "type": "bool" + } + ], + "name": "PrimeAssetUpdated", + "type": "event" + }, { "anonymous": false, "inputs": [ @@ -407,6 +451,24 @@ "stateMutability": "view", "type": "function" }, + { + "inputs": [ + { + "internalType": "address", + "name": "asset", + "type": "address" + }, + { + "internalType": "bool", + "name": "isPrimeAsset", + "type": "bool" + } + ], + "name": "addOrRemoveAssetFromPrime", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [ { @@ -417,9 +479,9 @@ "type": "uint8" }, { - "internalType": "uint256", + "internalType": "uint8", "name": "percentage", - "type": "uint256" + "type": "uint8" }, { "internalType": "address", @@ -482,9 +544,9 @@ "type": "uint8" }, { - "internalType": "uint256", + "internalType": "uint8", "name": "percentage", - "type": "uint256" + "type": "uint8" }, { "internalType": "address", @@ -495,6 +557,30 @@ "stateMutability": "view", "type": "function" }, + { + "inputs": [ + { + "internalType": "address", + "name": "destination", + "type": "address" + }, + { + "internalType": "enum ProtocolShareReserve.Schema", + "name": "schema", + "type": "uint8" + } + ], + "name": "getPercentageDistribution", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [ { @@ -547,6 +633,25 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "name": "isInPrime", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [], "name": "maxLoopsLimit", @@ -630,6 +735,24 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [ + { + "internalType": "enum ProtocolShareReserve.Schema", + "name": "schema", + "type": "uint8" + }, + { + "internalType": "address", + "name": "destination", + "type": "address" + } + ], + "name": "removeDistributionConfig", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [], "name": "renounceOwnership", diff --git a/simulations/vip-153/vip-153-testnet/simulation.ts b/simulations/vip-153/vip-153-testnet/simulation.ts index 6001d6a64..f2d2e0cfb 100644 --- a/simulations/vip-153/vip-153-testnet/simulation.ts +++ b/simulations/vip-153/vip-153-testnet/simulation.ts @@ -3,15 +3,14 @@ import { Contract } from "ethers"; import { ethers } from "hardhat"; import { forking, testVip } from "../../../src/vip-framework"; -import { vip152Testnet } from "../../../vips/vip-152-testnet"; import PSR_ABI from "./abi/PSR.json" import { vip153Testnet } from "../../../vips/vip-153-testnet"; const NORMAL_TIMELOCK = "0xce10739590001705F7FF231611ba4A48B2820327"; -const PSR = "0xf5606e1112fb9b7EC270B45C11a6975FdFDa5D68"; +const PSR = "0x24b63EA72aFC326deFA526Ed031aedb6a5E0fA4A"; -forking(33686556, () => { +forking(33711562, () => { const provider = ethers.provider; describe("Pre-VIP behavior", async () => { diff --git a/vips/vip-153-testnet.ts b/vips/vip-153-testnet.ts index 6abd58edc..6f7ceb484 100644 --- a/vips/vip-153-testnet.ts +++ b/vips/vip-153-testnet.ts @@ -1,7 +1,7 @@ import { ProposalType } from "../src/types"; import { makeProposal } from "../src/utils"; -const PSR = "0xf5606e1112fb9b7EC270B45C11a6975FdFDa5D68"; +const PSR = "0x24b63EA72aFC326deFA526Ed031aedb6a5E0fA4A"; const ACM = "0x45f8a08f534f34a97187626e05d4b6648eeaa9aa"; const FAST_TRACK_TIMELOCK = "0x3CFf21b7AF8390fE68799D58727d3b4C25a83cb6"; const CRITICAL_TIMELOCK = "0x23B893a7C45a5Eb8c8C062b9F32d0D2e43eD286D";