Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions config/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
"name": "Ethereum Mainnet",
"deployer": "TODO",
"owner": "TODO",
"asset": "Token",
"token": "0x607F4C5BB672230e8672085532f7e901544a7375",
"uniswap": true,
"v3": {
Expand All @@ -57,7 +56,6 @@
"deployer": "0x111167a21d2bdb8e10b84aee3501059d50756b67",
"owner": "0x3768f9b005E8Ef8b45568F1f1f5Ca7650096b2B9",
"_ownerComment": "iExec multisig wallet",
"asset": "Token",
"token": "0xe649e6a1F2afc63ca268C2363691ceCAF75CF47C",
"v3": {},
"v5": {
Expand All @@ -72,7 +70,6 @@
"name": "Arbitrum Sepolia Testnet",
"deployer": "0x87bdca5F82cD5B138cD12a724d6c0eC7e3114dA6",
"owner": "0x87bdca5F82cD5B138cD12a724d6c0eC7e3114dA6",
"asset": "Token",
"token": "0x9923eD3cbd90CD78b910c475f9A731A6e0b8C963",
"richman": "0x87bdca5F82cD5B138cD12a724d6c0eC7e3114dA6",
"v3": {},
Expand All @@ -88,7 +85,6 @@
"name": "Hardhat network (also PoCo chain)",
"deployer": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
"owner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
"asset": "Token",
"v3": {},
"v5": {
"salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
Expand All @@ -100,8 +96,6 @@
"_deployerComment": "Hardhat account #0",
"owner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
"_ownerComment": "Hardhat account #0",
"asset": "Token",
"_assetComment": "asset should be `Token` or `Native`",
"token": null,
"_tokenComment": "Address of the RLC token contract",
"richman": null,
Expand Down
1 change: 0 additions & 1 deletion scripts/tools/update-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ async function update() {
name: `Chain ${networkName}`,
deployer: deployer.address,
owner: owner.address,
asset: 'Token', // Default value, update as needed
v3: {},
v5: {},
};
Expand Down
8 changes: 4 additions & 4 deletions test/000_fullchain-boost.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import { TypedDataDomain } from 'ethers';
import hre from 'hardhat';
import {
IWorkerpool__factory,
IexecInterfaceNative,
IexecInterfaceNative__factory,
IexecInterfaceToken,
IexecInterfaceToken__factory,
IexecOrderManagement__factory,
IexecPocoBoostAccessorsFacet__factory,
IexecPocoBoostFacet,
Expand Down Expand Up @@ -50,7 +50,7 @@ const workerpoolPrice = 1_000_000_000n;
describe('IexecPocoBoostFacet (IT)', function () {
let domain: TypedDataDomain;
let proxyAddress: string;
let iexecInstance: IexecInterfaceNative;
let iexecInstance: IexecInterfaceToken;
let iexecPocoBoostInstance: IexecPocoBoostFacet;
let iexecWrapper: IexecWrapper;
let appAddress = '';
Expand Down Expand Up @@ -88,7 +88,7 @@ describe('IexecPocoBoostFacet (IT)', function () {
requester: requester,
};
iexecPocoBoostInstance = IexecPocoBoostFacet__factory.connect(proxyAddress, owner);
iexecInstance = IexecInterfaceNative__factory.connect(proxyAddress, anyone);
iexecInstance = IexecInterfaceToken__factory.connect(proxyAddress, anyone);
domain = {
name: 'iExecODB',
version: '5.0.0',
Expand Down
6 changes: 3 additions & 3 deletions test/000_fullchain.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import { SignerWithAddress } from '@nomicfoundation/hardhat-ethers/signers';
import { loadFixture } from '@nomicfoundation/hardhat-network-helpers';
import { expect } from 'chai';
import { IexecInterfaceNative, IexecInterfaceNative__factory } from '../typechain';
import { IexecInterfaceToken, IexecInterfaceToken__factory } from '../typechain';
import { TAG_STANDARD, TAG_TEE } from '../utils/constants';
import { OrdersActors, OrdersAssets, OrdersPrices, buildOrders } from '../utils/createOrders';
import {
Expand Down Expand Up @@ -38,7 +38,7 @@ const { results, resultDigest } = buildUtf8ResultAndDigest('result');
const { resultsCallback, callbackResultDigest } = buildResultCallbackAndDigest(123);

let proxyAddress: string;
let iexecPoco: IexecInterfaceNative;
let iexecPoco: IexecInterfaceToken;
let iexecWrapper: IexecWrapper;
let [appAddress, workerpoolAddress, datasetAddress]: string[] = [];
let [
Expand Down Expand Up @@ -85,7 +85,7 @@ describe('Integration tests', function () {
} = accounts);
iexecWrapper = new IexecWrapper(proxyAddress, accounts);
({ appAddress, datasetAddress, workerpoolAddress } = await iexecWrapper.createAssets());
iexecPoco = IexecInterfaceNative__factory.connect(proxyAddress, anyone);
iexecPoco = IexecInterfaceToken__factory.connect(proxyAddress, anyone);
ordersActors = {
appOwner: appProvider,
datasetOwner: datasetProvider,
Expand Down
6 changes: 3 additions & 3 deletions test/200_fullchain-bot.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import { SignerWithAddress } from '@nomicfoundation/hardhat-ethers/signers';
import { loadFixture } from '@nomicfoundation/hardhat-network-helpers';
import { expect } from 'chai';
import { IexecInterfaceNative, IexecInterfaceNative__factory } from '../typechain';
import { IexecInterfaceToken, IexecInterfaceToken__factory } from '../typechain';
import { TAG_STANDARD } from '../utils/constants';
import { OrdersActors, OrdersAssets, OrdersPrices, buildOrders } from '../utils/createOrders';
import { TaskStatusEnum, buildUtf8ResultAndDigest, getIexecAccounts } from '../utils/poco-tools';
Expand All @@ -16,7 +16,7 @@ const datasetPrice = 1_000_000n;
const workerpoolPrice = 1_000_000_000n;

let proxyAddress: string;
let iexecPoco: IexecInterfaceNative;
let iexecPoco: IexecInterfaceToken;
let iexecWrapper: IexecWrapper;
let [appAddress, workerpoolAddress, datasetAddress]: string[] = [];
let [
Expand Down Expand Up @@ -59,7 +59,7 @@ describe('Integration tests', function () {
} = accounts);
iexecWrapper = new IexecWrapper(proxyAddress, accounts);
({ appAddress, datasetAddress, workerpoolAddress } = await iexecWrapper.createAssets());
iexecPoco = IexecInterfaceNative__factory.connect(proxyAddress, anyone);
iexecPoco = IexecInterfaceToken__factory.connect(proxyAddress, anyone);
ordersActors = {
appOwner: appProvider,
datasetOwner: datasetProvider,
Expand Down
6 changes: 3 additions & 3 deletions test/201_fullchain-multi-orders.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { SignerWithAddress } from '@nomicfoundation/hardhat-ethers/signers';
import { loadFixture } from '@nomicfoundation/hardhat-network-helpers';
import { expect } from 'chai';
import { ethers } from 'hardhat';
import { IexecInterfaceNative, IexecInterfaceNative__factory } from '../typechain';
import { IexecInterfaceToken, IexecInterfaceToken__factory } from '../typechain';
import { TAG_STANDARD } from '../utils/constants';
import {
IexecOrders,
Expand All @@ -31,7 +31,7 @@ const workerpoolPrice2 = 1_000_000_025n;
const { results, resultDigest } = buildUtf8ResultAndDigest('result');

let proxyAddress: string;
let iexecPoco: IexecInterfaceNative;
let iexecPoco: IexecInterfaceToken;
let iexecWrapper: IexecWrapper;
let [appAddress, workerpoolAddress, datasetAddress]: string[] = [];
let [requester, appProvider, datasetProvider, scheduler, anyone, worker1]: SignerWithAddress[] = [];
Expand All @@ -52,7 +52,7 @@ describe('Integration tests', function () {
({ requester, appProvider, datasetProvider, scheduler, anyone, worker1 } = accounts);
iexecWrapper = new IexecWrapper(proxyAddress, accounts);
({ appAddress, datasetAddress, workerpoolAddress } = await iexecWrapper.createAssets());
iexecPoco = IexecInterfaceNative__factory.connect(proxyAddress, ethers.provider);
iexecPoco = IexecInterfaceToken__factory.connect(proxyAddress, ethers.provider);
ordersActors = {
appOwner: appProvider,
datasetOwner: datasetProvider,
Expand Down
6 changes: 3 additions & 3 deletions test/300_fullchain-reopen.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { loadFixture, mine } from '@nomicfoundation/hardhat-network-helpers';
import { setNextBlockTimestamp } from '@nomicfoundation/hardhat-network-helpers/dist/src/helpers/time';
import { expect } from 'chai';
import { ZeroAddress } from 'ethers';
import { IexecInterfaceNative, IexecInterfaceNative__factory } from '../typechain';
import { IexecInterfaceToken, IexecInterfaceToken__factory } from '../typechain';
import { OrdersActors, OrdersAssets, OrdersPrices, buildOrders } from '../utils/createOrders';
import { loadHardhatFixtureDeployment } from './utils/hardhat-fixture-deployer';

Expand All @@ -26,7 +26,7 @@ const workerpoolPrice = 1_000_000_000n;
const { results, resultDigest } = buildUtf8ResultAndDigest('result');

let proxyAddress: string;
let [iexecPoco, iexecPocoAsScheduler]: IexecInterfaceNative[] = [];
let [iexecPoco, iexecPocoAsScheduler]: IexecInterfaceToken[] = [];
let iexecWrapper: IexecWrapper;
let [appAddress, workerpoolAddress, datasetAddress]: string[] = [];
let [
Expand Down Expand Up @@ -67,7 +67,7 @@ describe('Integration tests', function () {
} = accounts);
iexecWrapper = new IexecWrapper(proxyAddress, accounts);
({ appAddress, datasetAddress, workerpoolAddress } = await iexecWrapper.createAssets());
iexecPoco = IexecInterfaceNative__factory.connect(proxyAddress, anyone);
iexecPoco = IexecInterfaceToken__factory.connect(proxyAddress, anyone);
iexecPocoAsScheduler = iexecPoco.connect(scheduler);
ordersActors = {
appOwner: appProvider,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { SignerWithAddress } from '@nomicfoundation/hardhat-ethers/signers';
import { loadFixture } from '@nomicfoundation/hardhat-network-helpers';
import { expect } from 'chai';
import { Wallet, ZeroAddress } from 'ethers';
import { IexecInterfaceNative, IexecInterfaceNative__factory } from '../../../typechain';
import { IexecInterfaceToken, IexecInterfaceToken__factory } from '../../../typechain';
import { TAG_STANDARD } from '../../../utils/constants';
import { OrdersAssets, OrdersPrices, buildOrders } from '../../../utils/createOrders';
import {
Expand All @@ -30,7 +30,7 @@ const { resultDigest } = buildUtf8ResultAndDigest('result');
const taskIndex = 0n;

let proxyAddress: string;
let iexecPocoABILegacy: IexecInterfaceNative;
let iexecPocoABILegacy: IexecInterfaceToken;
let iexecWrapper: IexecWrapper;
let [appAddress, workerpoolAddress, datasetAddress]: string[] = [];
let [
Expand Down Expand Up @@ -60,7 +60,7 @@ describe('IexecAccessorsABILegacy', function () {
accounts);
iexecWrapper = new IexecWrapper(proxyAddress, accounts);
({ appAddress, datasetAddress, workerpoolAddress } = await iexecWrapper.createAssets());
iexecPocoABILegacy = IexecInterfaceNative__factory.connect(proxyAddress, anyone);
iexecPocoABILegacy = IexecInterfaceToken__factory.connect(proxyAddress, anyone);
ordersAssets = {
app: appAddress,
dataset: datasetAddress,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import { SignerWithAddress } from '@nomicfoundation/hardhat-ethers/signers';
import { loadFixture } from '@nomicfoundation/hardhat-network-helpers';
import { expect } from 'chai';
import { IexecInterfaceNative, IexecInterfaceNative__factory } from '../../../typechain';
import { IexecInterfaceToken, IexecInterfaceToken__factory } from '../../../typechain';
import config from '../../../utils/config';
import { getIexecAccounts } from '../../../utils/poco-tools';
import { loadHardhatFixtureDeployment } from '../../utils/hardhat-fixture-deployer';
Expand All @@ -16,7 +16,7 @@ const args = [name, description, timeRef] as [string, string, number];

describe('CategoryManager', async () => {
let proxyAddress: string;
let [iexecPoco, iexecPocoAsAnyone]: IexecInterfaceNative[] = [];
let [iexecPoco, iexecPocoAsAnyone]: IexecInterfaceToken[] = [];
let [iexecAdmin, anyone]: SignerWithAddress[] = [];

beforeEach('Deploy', async () => {
Expand All @@ -29,7 +29,7 @@ describe('CategoryManager', async () => {
async function initFixture() {
const accounts = await getIexecAccounts();
({ iexecAdmin, anyone } = accounts);
iexecPoco = IexecInterfaceNative__factory.connect(proxyAddress, iexecAdmin);
iexecPoco = IexecInterfaceToken__factory.connect(proxyAddress, iexecAdmin);
iexecPocoAsAnyone = iexecPoco.connect(anyone);
}

Expand Down
8 changes: 4 additions & 4 deletions test/byContract/IexecConfiguration/IexecConfiguration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import { ethers } from 'hardhat';
import {
IexecConfigurationExtra,
IexecConfigurationExtra__factory,
IexecInterfaceNative,
IexecInterfaceNative__factory,
IexecInterfaceToken,
IexecInterfaceToken__factory,
} from '../../../typechain';
import { getIexecAccounts } from '../../../utils/poco-tools';
import { getPocoStorageSlotLocation } from '../../../utils/proxy-tools';
Expand Down Expand Up @@ -41,7 +41,7 @@ const someDomainSeparator = '0x0000000000000000000000000000000000000000000000000

describe('IexecConfiguration', async () => {
let proxyAddress: string;
let [iexecPoco, iexecPocoAsAdmin]: IexecInterfaceNative[] = [];
let [iexecPoco, iexecPocoAsAdmin]: IexecInterfaceToken[] = [];
let iexecConfigurationExtra: IexecConfigurationExtra;
let [iexecAdmin, worker, anyone]: SignerWithAddress[] = [];

Expand All @@ -53,7 +53,7 @@ describe('IexecConfiguration', async () => {
async function initFixture() {
const accounts = await getIexecAccounts();
({ iexecAdmin, worker, anyone } = accounts);
iexecPoco = IexecInterfaceNative__factory.connect(proxyAddress, anyone);
iexecPoco = IexecInterfaceToken__factory.connect(proxyAddress, anyone);
iexecPocoAsAdmin = iexecPoco.connect(iexecAdmin);
iexecConfigurationExtra = IexecConfigurationExtra__factory.connect(proxyAddress, anyone);
}
Expand Down
8 changes: 4 additions & 4 deletions test/byContract/IexecERC20/IexecERC20.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { expect } from 'chai';
import { AddressLike, ZeroAddress } from 'ethers';
import { ethers } from 'hardhat';
import {
IexecInterfaceNative,
IexecInterfaceNative__factory,
IexecInterfaceToken,
IexecInterfaceToken__factory,
TestReceiver,
TestReceiver__factory,
} from '../../../typechain';
Expand All @@ -22,7 +22,7 @@ const value = 100n;
describe('ERC20', async () => {
let proxyAddress: string;
let iexecWrapper: IexecWrapper;
let [iexecPoco, iexecPocoAsHolder, iexecPocoAsSpender]: IexecInterfaceNative[] = [];
let [iexecPoco, iexecPocoAsHolder, iexecPocoAsSpender]: IexecInterfaceToken[] = [];
let [holder, recipient, spender, anyone, zeroAddressSigner]: SignerWithAddress[] = [];
let totalSupplyBeforeFirstDeposit: bigint;

Expand All @@ -41,7 +41,7 @@ describe('ERC20', async () => {
zeroAddressSigner = await ethers.getImpersonatedSigner(ZeroAddress);
await setZeroAddressBalance();
iexecWrapper = new IexecWrapper(proxyAddress, accounts);
iexecPoco = IexecInterfaceNative__factory.connect(proxyAddress, anyone);
iexecPoco = IexecInterfaceToken__factory.connect(proxyAddress, anyone);
iexecPocoAsHolder = iexecPoco.connect(holder);
iexecPocoAsSpender = iexecPoco.connect(spender);
totalSupplyBeforeFirstDeposit = await iexecPoco.totalSupply();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { loadFixture } from '@nomicfoundation/hardhat-network-helpers';
import { expect } from 'chai';
import { ethers } from 'hardhat';
import {
IexecInterfaceNative,
IexecInterfaceNative__factory,
IexecInterfaceToken,
IexecInterfaceToken__factory,
IexecLibOrders_v5,
} from '../../../typechain';
import { NULL } from '../../../utils/constants';
Expand All @@ -27,7 +27,7 @@ describe('OrderManagement', async () => {
iexecPocoAsDatasetProvider,
iexecPocoAsScheduler,
iexecPocoAsRequester,
]: IexecInterfaceNative[] = [];
]: IexecInterfaceToken[] = [];
let iexecWrapper: IexecWrapper;
let [anyone, appProvider, datasetProvider, scheduler, requester]: SignerWithAddress[] = [];
let appOrder: IexecLibOrders_v5.AppOrderStruct;
Expand All @@ -46,7 +46,7 @@ describe('OrderManagement', async () => {
({ appProvider, datasetProvider, scheduler, requester, anyone } = accounts);
iexecWrapper = new IexecWrapper(proxyAddress, accounts);
const { appAddress, datasetAddress, workerpoolAddress } = await iexecWrapper.createAssets();
iexecPoco = IexecInterfaceNative__factory.connect(proxyAddress, anyone);
iexecPoco = IexecInterfaceToken__factory.connect(proxyAddress, anyone);
iexecPocoAsAppProvider = iexecPoco.connect(appProvider);
iexecPocoAsDatasetProvider = iexecPoco.connect(datasetProvider);
iexecPocoAsScheduler = iexecPoco.connect(scheduler);
Expand Down
10 changes: 5 additions & 5 deletions test/byContract/IexecPoco/IexecPoco1.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import { ethers } from 'hardhat';
import {
ERC1271Mock__factory,
IERC721__factory,
IexecInterfaceNative,
IexecInterfaceNative__factory,
IexecInterfaceToken,
IexecInterfaceToken__factory,
IexecLibOrders_v5,
IexecPocoAccessors,
IexecPocoAccessors__factory,
Expand Down Expand Up @@ -66,8 +66,8 @@ const someWallet = Wallet.createRandom();

describe('IexecPoco1', () => {
let proxyAddress: string;
let [iexecPoco, iexecPocoAsRequester]: IexecInterfaceNative[] = [];
let iexecPocoAsSponsor: IexecInterfaceNative;
let [iexecPoco, iexecPocoAsRequester]: IexecInterfaceToken[] = [];
let iexecPocoAsSponsor: IexecInterfaceToken;
let iexecPocoAccessors: IexecPocoAccessors;
let iexecPocoContract: Contract;
let iexecWrapper: IexecWrapper;
Expand Down Expand Up @@ -113,7 +113,7 @@ describe('IexecPoco1', () => {
accounts);
iexecWrapper = new IexecWrapper(proxyAddress, accounts);
({ appAddress, datasetAddress, workerpoolAddress } = await iexecWrapper.createAssets());
iexecPoco = IexecInterfaceNative__factory.connect(proxyAddress, anyone);
iexecPoco = IexecInterfaceToken__factory.connect(proxyAddress, anyone);
iexecPocoAsRequester = iexecPoco.connect(requester);
iexecPocoAsSponsor = iexecPoco.connect(sponsor);
iexecPocoAccessors = IexecPocoAccessors__factory.connect(proxyAddress, ethers.provider);
Expand Down
8 changes: 4 additions & 4 deletions test/byContract/IexecPoco/IexecPoco2-claim.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { SignerWithAddress } from '@nomicfoundation/hardhat-ethers/signers';
import { loadFixture, mine, time } from '@nomicfoundation/hardhat-network-helpers';
import { expect } from 'chai';
import { ZeroAddress, ethers } from 'ethers';
import { IexecInterfaceNative, IexecInterfaceNative__factory } from '../../../typechain';
import { IexecInterfaceToken, IexecInterfaceToken__factory } from '../../../typechain';
import { OrdersAssets, OrdersPrices, buildOrders } from '../../../utils/createOrders';
import {
TaskStatusEnum,
Expand All @@ -30,8 +30,8 @@ const enclaveAddress = ZeroAddress;

describe('IexecPoco2#claim', async () => {
let proxyAddress: string;
let iexecPoco: IexecInterfaceNative;
let iexecPocoAsAnyone: IexecInterfaceNative;
let iexecPoco: IexecInterfaceToken;
let iexecPocoAsAnyone: IexecInterfaceToken;
let iexecWrapper: IexecWrapper;
let [appAddress, datasetAddress, workerpoolAddress]: string[] = [];
let [iexecAdmin, requester, sponsor, scheduler, worker1, worker2, anyone]: SignerWithAddress[] =
Expand All @@ -52,7 +52,7 @@ describe('IexecPoco2#claim', async () => {
iexecWrapper = new IexecWrapper(proxyAddress, accounts);
({ appAddress, datasetAddress, workerpoolAddress } = await iexecWrapper.createAssets());
await iexecWrapper.setTeeBroker('0x0000000000000000000000000000000000000000');
iexecPoco = IexecInterfaceNative__factory.connect(proxyAddress, iexecAdmin);
iexecPoco = IexecInterfaceToken__factory.connect(proxyAddress, iexecAdmin);
iexecPocoAsAnyone = iexecPoco.connect(anyone);
ordersAssets = {
app: appAddress,
Expand Down
Loading
Loading