Skip to content

Commit e56f4b1

Browse files
authored
Merge branch 'dev' into fix(web)/staking-refetch-and-improving-fetching-timing
2 parents 76b3c6a + 058069e commit e56f4b1

24 files changed

+493
-36
lines changed

.dockerignore

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
.yarn/cache
2+
.yarn/install-state.gz
3+
4+
contracts/.env
5+
contracts/test
6+
contracts/lib
7+
contracts/cache
8+
contracts/cache_hardhat
9+
contracts/config
10+
contracts/tenderly.yaml
11+
12+
*/.DS_Store
13+
*/*.log

.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

Lines changed: 28 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@ plugins:
77
spec: "@yarnpkg/plugin-stage"
88
- path: .yarn/plugins/@yarnpkg/plugin-version.cjs
99
spec: "@yarnpkg/plugin-version"
10+
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
11+
spec: "@yarnpkg/plugin-workspace-tools"
1012

1113
yarnPath: .yarn/releases/yarn-3.3.1.cjs

bot-pinner/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3@sha256:d73088ce13d5a1eec1dd05b47736041ae6921d08d2f240035d99642db98bc8d4
1+
FROM python:3@sha256:9a1b705aecedc76e8bf87dfca091d7093df3f2dd4765af6c250134ce4298a584
22

33
WORKDIR /usr/src/app
44

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"$schema": "../NewDisputeTemplate.schema.json",
3+
"title": "Let's do this",
4+
"description": "We want to do this: %s",
5+
"question": "Does it comply with the policy?",
6+
"answers": [
7+
{
8+
"title": "Yes",
9+
"description": "Select this if you agree that it must be done."
10+
},
11+
{
12+
"title": "No",
13+
"description": "Select this if you do not agree that it must be done."
14+
}
15+
],
16+
"policyURI": "/ipfs/Qmdvk...rSD6cE/policy.pdf",
17+
"frontendUrl": "https://kleros-v2.netlify.app/#/cases/%s/overview",
18+
"arbitratorChainID": "421613",
19+
"arbitratorAddress": "0xD08Ab99480d02bf9C092828043f611BcDFEA917b",
20+
"category": "Others",
21+
"specification": "KIP001",
22+
"lang": "en_US"
23+
}

contracts/deploy/00-home-chain-arbitrable.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { HardhatRuntimeEnvironment } from "hardhat/types";
22
import { DeployFunction } from "hardhat-deploy/types";
3-
import disputeTemplate from "../../kleros-sdk/config/v2-disputetemplate/simple/NewDisputeTemplate.simple.json";
3+
import disputeTemplate from "../config/DisputeTemplate.simple.json";
44

55
enum HomeChains {
66
ARBITRUM_ONE = 42161,

contracts/deploy/03-vea-mock.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
22
import { DeployFunction } from "hardhat-deploy/types";
33
import getContractAddress from "../deploy-helpers/getContractAddress";
44
import { KlerosCore__factory } from "../typechain-types";
5-
import disputeTemplate from "../../kleros-sdk/config/v2-disputetemplate/simple/NewDisputeTemplate.simple.json";
5+
import disputeTemplate from "../config/DisputeTemplate.simple.json";
66

77
const HARDHAT_NETWORK = 31337;
88

contracts/deploy/04-foreign-arbitrable.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { HardhatRuntimeEnvironment } from "hardhat/types";
22
import { DeployFunction } from "hardhat-deploy/types";
3-
import disputeTemplate from "../../kleros-sdk/config/v2-disputetemplate/simple/NewDisputeTemplate.simple.json";
3+
import disputeTemplate from "../config/DisputeTemplate.simple.json";
44

55
enum ForeignChains {
66
ETHEREUM_MAINNET = 1,

contracts/deploy/04-klerosliquid-to-v2-gnosis.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { parseUnits, parseEther } from "ethers/lib/utils";
22
import { HardhatRuntimeEnvironment } from "hardhat/types";
33
import { DeployFunction } from "hardhat-deploy/types";
4-
import disputeTemplate from "../../kleros-sdk/config/v2-disputetemplate/simple/NewDisputeTemplate.simple.json";
4+
import disputeTemplate from "../config/DisputeTemplate.simple.json";
55

66
enum ForeignChains {
77
GNOSIS_MAINNET = 100,

contracts/hardhat.config.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,16 @@ const config: HardhatUserConfig = {
4747
chainId: 31337,
4848
saveDeployments: true,
4949
tags: ["test", "local"],
50+
companionNetworks: {
51+
home: "localhost",
52+
foreign: "localhost",
53+
},
54+
},
55+
dockerhost: {
56+
url: `http://host.docker.internal:8545`,
57+
chainId: 31337,
58+
saveDeployments: true,
59+
tags: ["test", "local"],
5060
companionNetworks: {
5161
foreign: "localhost",
5262
},

0 commit comments

Comments
 (0)