diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 052c360a8..008e772e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,11 @@ jobs: strategy: matrix: node: [18] - + env: + INFURA_KEY: ${{ secrets.INFURA_KEY }} + DEPLOYER_MNEMONIC: ${{ secrets.DEPLOYER_MNEMONIC }} + ETHERSCAN_KEY: ${{ secrets.ETHERSCAN_KEY }} + MOCHA_JOBS: 0 steps: - name: Checkout Repository uses: actions/checkout@v3 diff --git a/README.md b/README.md index 3644ab90d..e11cad86a 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![CI](https://github.com/para-space/paraspace-core/workflows/CI/badge.svg)](https://github.com/para-space/paraspace-core/actions) [![License](https://img.shields.io/github/license/para-space/paraspace-core?color=green)](https://github.com/para-space/paraspace-core/blob/main/LICENSE) -[![Twitter URL](https://img.shields.io/twitter/follow/ParallelFi?style=social)](https://twitter.com/ParallelFi) +[![Twitter URL](https://img.shields.io/twitter/follow/Paraspace_Official?style=social)](https://twitter.com/paraspace_CM) [![Telegram](https://img.shields.io/badge/Telegram-gray?logo=telegram)](https://t.me/parallelfi_community) [![Medium](https://img.shields.io/badge/Medium-gray?logo=medium)](https://medium.com/@paraspace) [![Discourse](https://img.shields.io/badge/Forum-gray?logo=discourse)](https://discourse.para.space) diff --git a/contracts/interfaces/ISafe.sol b/contracts/interfaces/ISafe.sol new file mode 100644 index 000000000..8fe0ebab7 --- /dev/null +++ b/contracts/interfaces/ISafe.sol @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: AGPL-3.0 +pragma solidity 0.8.10; + +interface ISafe { + function addOwnerWithThreshold(address owner, uint256 _threshold) external; + + function removeOwner( + address prevOwner, + address owner, + uint256 _threshold + ) external; + + function swapOwner( + address prevOwner, + address oldOwner, + address newOwner + ) external; +} diff --git a/contracts/interfaces/IXTokenType.sol b/contracts/interfaces/IXTokenType.sol index 99addb96b..accf781fe 100644 --- a/contracts/interfaces/IXTokenType.sol +++ b/contracts/interfaces/IXTokenType.sol @@ -24,7 +24,17 @@ enum XTokenType { PTokenCAPE, NTokenOtherdeed, NTokenStakefish, - NTokenChromieSquiggle + NTokenChromieSquiggle, + PhantomData1, + PhantomData2, + PhantomData3, + PhantomData4, + PhantomData5, + PhantomData6, + PhantomData7, + PhantomData8, + PhantomData9, + PhantomData10 } interface IXTokenType { diff --git a/helpers/contracts-helpers.ts b/helpers/contracts-helpers.ts index fba7d4646..489408dca 100644 --- a/helpers/contracts-helpers.ts +++ b/helpers/contracts-helpers.ts @@ -79,6 +79,7 @@ import { NTokenOtherdeed__factory, TimeLock__factory, P2PPairStaking__factory, + ISafe__factory, } from "../types"; import {HardhatRuntimeEnvironment, HttpNetworkConfig} from "hardhat/types"; import {getFirstSigner, getTimeLockExecutor} from "./contracts-getters"; @@ -906,6 +907,7 @@ export const decodeInputData = (data: string) => { ...NTokenOtherdeed__factory.abi, ...TimeLock__factory.abi, ...P2PPairStaking__factory.abi, + ...ISafe__factory.abi, ]; const decoder = new InputDataDecoder(ABI); diff --git a/package.json b/package.json index f5de68122..d1ac692b9 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,9 @@ "artifacts", "types" ], + "resolutions": { + "ethereumjs-abi": "https://registry.npmjs.org/ethereumjs-abi/-/ethereumjs-abi-0.6.8.tgz" + }, "scripts": { "postinstall": "husky install", "prepack": "pinst --disable", diff --git a/yarn.lock b/yarn.lock index 1ef7c4d8d..f74227879 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3899,7 +3899,7 @@ __metadata: languageName: node linkType: hard -"bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.10.0, bn.js@npm:^4.11.0, bn.js@npm:^4.11.6, bn.js@npm:^4.11.8, bn.js@npm:^4.11.9, bn.js@npm:^4.8.0": +"bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.11.0, bn.js@npm:^4.11.6, bn.js@npm:^4.11.8, bn.js@npm:^4.11.9": version: 4.12.0 resolution: "bn.js@npm:4.12.0" checksum: 39afb4f15f4ea537b55eaf1446c896af28ac948fdcf47171961475724d1bb65118cca49fa6e3d67706e4790955ec0e74de584e45c8f1ef89f46c812bee5b5a12 @@ -6554,29 +6554,9 @@ __metadata: languageName: node linkType: hard -"ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git": +"ethereumjs-abi@https://registry.npmjs.org/ethereumjs-abi/-/ethereumjs-abi-0.6.8.tgz": version: 0.6.8 - resolution: "ethereumjs-abi@https://github.com/ethereumjs/ethereumjs-abi.git#commit=ee3994657fa7a427238e6ba92a84d0b529bbcde0" - dependencies: - bn.js: ^4.11.8 - ethereumjs-util: ^6.0.0 - checksum: ae074be0bb012857ab5d3ae644d1163b908a48dd724b7d2567cfde309dc72222d460438f2411936a70dc949dc604ce1ef7118f7273bd525815579143c907e336 - languageName: node - linkType: hard - -"ethereumjs-abi@npm:0.6.5": - version: 0.6.5 - resolution: "ethereumjs-abi@npm:0.6.5" - dependencies: - bn.js: ^4.10.0 - ethereumjs-util: ^4.3.0 - checksum: 3abdc79dc60614d30b1cefb5e6bfbdab3ca8252b4e742330544103f86d6e49a55921d9b8822a0a47fee3efd9dd2493ec93448b1869d82479a4c71a44001e8337 - languageName: node - linkType: hard - -"ethereumjs-abi@npm:0.6.8, ethereumjs-abi@npm:^0.6.8": - version: 0.6.8 - resolution: "ethereumjs-abi@npm:0.6.8" + resolution: "ethereumjs-abi@https://registry.npmjs.org/ethereumjs-abi/-/ethereumjs-abi-0.6.8.tgz" dependencies: bn.js: ^4.11.8 ethereumjs-util: ^6.0.0 @@ -6714,19 +6694,6 @@ __metadata: languageName: node linkType: hard -"ethereumjs-util@npm:^4.3.0": - version: 4.5.1 - resolution: "ethereumjs-util@npm:4.5.1" - dependencies: - bn.js: ^4.8.0 - create-hash: ^1.1.2 - elliptic: ^6.5.2 - ethereum-cryptography: ^0.1.3 - rlp: ^2.0.0 - checksum: ee91fbd29634d40cad9adf90f202158324c089bbc10b405d2ef139f4542090e6f76a616d16c601b52d6b5c5d59ddb6c8387cf60cc732884e732dad9a62b8a539 - languageName: node - linkType: hard - "ethereumjs-util@npm:^5.0.0, ethereumjs-util@npm:^5.0.1, ethereumjs-util@npm:^5.1.1, ethereumjs-util@npm:^5.1.2, ethereumjs-util@npm:^5.1.3, ethereumjs-util@npm:^5.1.5, ethereumjs-util@npm:^5.2.0": version: 5.2.1 resolution: "ethereumjs-util@npm:5.2.1"