Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Goerli from codebase #1314

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
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
5 changes: 0 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -314,11 +314,6 @@ jobs:
command: CHAIN_ID=1 pnpm run test:contracts:chainid:coverage
environment:
NODE_OPTIONS: --max-old-space-size=6144
- run:
name: "Running chainid tests with coverage for goerli"
command: CHAIN_ID=5 pnpm run test:contracts:chainid:coverage
environment:
NODE_OPTIONS: --max-old-space-size=6144
- run:
name: "Running chainid tests with coverage for xDai"
command: CHAIN_ID=100 pnpm run test:contracts:chainid:coverage
Expand Down
2 changes: 0 additions & 2 deletions contracts/colonyNetwork/ColonyNetworkENS.sol
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,6 @@ contract ColonyNetworkENS is ColonyNetworkStorage {
function getGlobalENSDomain() internal view returns (string memory) {
if (isMainnet()) {
return "joincolony.eth";
} else if (isGoerli()) {
return "joincolony.test";
} else if (isXdai()) {
return "joincolony.colonyxdai";
}
Expand Down
5 changes: 0 additions & 5 deletions contracts/common/MultiChain.sol
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,4 @@ contract MultiChain {
uint256 chainId = block.chainid;
return (chainId == 1 || chainId == 2656691);
}

function isGoerli() internal view returns (bool) {
uint256 chainId = block.chainid;
return (chainId == 5 || chainId == 2656695);
}
}
20 changes: 10 additions & 10 deletions docs/guides/reputation-mining-client.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ sidebar_position: 3

## Running the Mining Client

The reputation mining client can be run locally to sync with a local ganache instance, the `goerli` testnet, or with glider on `mainnet`.
The reputation mining client can be run locally to sync with a local hardhat instance, the `arbitrum-sepolia` testnet, or with `arbitrum` itself.

To participate in the reputation mining process you need to have staked at least the [minimum amount of CLNY Tokens](../interfaces/ireputationminingcycle#getminstake-uint256-minstake), for at least [one full mining cycle duration](../interfaces/ireputationminingcycle#getminingwindowduration-uint256-miningwindowduration) before you can submit a new reputation root hash.

Expand All @@ -22,13 +22,13 @@ Mandatory arguments:
```
(--minerAddress <address>) | (--privateKey <key>)
(--colonyNetworkAddress <address>)
(--syncFrom <number>) // [goerli:'548534', mainnet:'7913100']
(--syncFrom <number>) // [arbitrum-sepolia: '28290396', arbitrum:'199165580']
```

Optional arguments:

```
[--network <(goerli|mainnet)>]
[--network <(arbitrum-sepolia|arbitrum)>]
[--localPort <number>]
[--dbPath <$PATH>]
[--auto <(true|false)>]
Expand All @@ -43,26 +43,26 @@ Private key of the miner account which the client will sign reputation mining co

#### `--colonyNetworkAddress`

The address of the Colony Network's `EtherRouter`. See [Upgrades to the Colony Network](../concepts/upgrades) for more information about the EtherRouter design pattern. This address is static on `goerli` and `mainnet` `goerli` `0x79073fc2117dD054FCEdaCad1E7018C9CbE3ec0B` `mainnet` `0x5346d0f80e2816fad329f2c140c870ffc3c3e2ef`
The address of the Colony Network's `EtherRouter`. See [Upgrades to the Colony Network](../concepts/upgrades) for more information about the EtherRouter design pattern. This address is static on all networks, with the `arbitrum-sepolia` address of `0x7777494e3d8cce0D3570E21FEf820F9Fee077777` and the `arbitrum` address of `0xCCcccdCC0CcF6C708D860e19353c5f9a49ACccCc`

#### `--dbPath`

Path for the sqlite database storing reputation state. Default is `./reputationStates.sqlite`.

#### `--network`

Used for connecting to a supported Infura node (instead of a local client). Valid options are `goerli` and `mainnet`.
Used for connecting to a supported Infura node (instead of a local client). Valid options are `arbitrum-sepolia` and `arbitrum`.

#### `--localPort`

Used to connect to a local client running on the specified port. Default is `8545`.

#### `--syncFrom`

Block number to start reputation state sync from. This is the block at which the reputation mining process was initialised. This number is static on `goerli` and `mainnet`
Block number to start reputation state sync from. This is the block at which the reputation mining process was initialised. This number is static on all networks

* `goerli: 548534`
* `mainnet: 7913100`
* `arbitrum-sepolia: 28290396`
* `arbitrum: 199165580`

Note that beginning the sync with a too-early block will result in an error. If you get this exception, try syncing from a more recent block. Note that the sync process can take long. Latest tests syncing a client from scratch to 28 reputation cycles took \~2 hours.

Expand Down Expand Up @@ -108,7 +108,7 @@ The reputation mining client will answer queries for reputation scores locally o
http://127.0.0.1:3000/{reputationState}/{colonyAddress}/{skillId}/{userAddress}
```

An instance of the oracle is available for reputation queries against `goerli` or `mainnet` networks:
An instance of the oracle is available for reputation queries against all networks:

```
https://xdai.colony.io/reputation/{network}/{reputationState}/{colonyAddress}/{skillId}/{userAddress}
Expand All @@ -119,7 +119,7 @@ The oracle should be able to provide responses to any valid reputation score in
For example, you can get the reputation score of the miner in a reputation state `0xc7eb2cf60aa4848ce0feed5d713c07fd26e404dd50ca3b9e4f2fabef196ca3bc`) using the address of the Meta Colony (`0x14946533cefe742399e9734a123f0c02d0405a51`), the mining skill id (`2`), and address of a miner (`0x0A1d439C7d0b9244035d4F934BBF8A418B35d064`).

```
https://xdai.colony.io/reputation/mainnet/0xc7eb2cf60aa4848ce0feed5d713c07fd26e404dd50ca3b9e4f2fabef196ca3bc/0x14946533cefe742399e9734a123f0c02d0405a51/2/0x0A1d439C7d0b9244035d4F934BBF8A418B35d064
https://xdai.colony.io/reputation/arbitrum/0xc7eb2cf60aa4848ce0feed5d713c07fd26e404dd50ca3b9e4f2fabef196ca3bc/0x14946533cefe742399e9734a123f0c02d0405a51/2/0x0A1d439C7d0b9244035d4F934BBF8A418B35d064
```

The oracle returns
Expand Down
3 changes: 2 additions & 1 deletion packages/reputation-miner/bin/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ const {RetryProvider} = require("../../package-utils");

const { ConsoleAdapter, SlackAdapter, DiscordAdapter, TruffleLoader } = require("../../package-utils");

const supportedInfuraNetworks = ["goerli", "rinkeby", "ropsten", "kovan", "mainnet"];
const supportedInfuraNetworks = ["arbitrum-sepolia", "arbitrum"];

const {
minerAddress,
privateKey,
Expand Down
6 changes: 0 additions & 6 deletions test/misc/chainid.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ const Token = artifacts.require("Token");

chai.use(bnChai(web3.utils.BN));

const GOERLI = 5;
const FORKED_GOERLI = 2656695;

contract("Contract Storage", (accounts) => {
const MINER1 = accounts[5];
const MINER2 = accounts[6];
Expand Down Expand Up @@ -74,9 +71,6 @@ contract("Contract Storage", (accounts) => {
if (await isMainnet()) {
const name = await colonyNetwork.lookupRegisteredENSDomain(metaColony.address);
expect(name).to.equal("meta.colony.joincolony.eth");
} else if (chainId === GOERLI || chainId === FORKED_GOERLI) {
const name = await colonyNetwork.lookupRegisteredENSDomain(metaColony.address);
expect(name).to.equal("meta.colony.joincolony.test");
} else if (await isXdai()) {
const name = await colonyNetwork.lookupRegisteredENSDomain(metaColony.address);
expect(name).to.equal("meta.colony.joincolony.colonyxdai");
Expand Down