Skip to content

Commit

Permalink
Merge branch 'master' into milliblock-ticks
Browse files Browse the repository at this point in the history
  • Loading branch information
@edfelten
edfelten committed Feb 5, 2020
2 parents 1c5f3c1 + 825f88f commit 3f17cbb
Show file tree
Hide file tree
Showing 13 changed files with 1,952 additions and 1,883 deletions.
24 changes: 12 additions & 12 deletions demos/election/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
"watch": "webpack --watch"
},
"devDependencies": {
"css-loader": "^3.2.0",
"file-loader": "^4.2.0",
"style-loader": "^1.0.0",
"css-loader": "^3.4.2",
"file-loader": "^5.0.2",
"style-loader": "^1.1.3",
"svg-inline-loader": "^0.8.0",
"truffle": "^5.0.31",
"webpack": "~4.35.2",
"webpack-cli": "~3.3.5",
"webpack-dev-server": "~3.7.2"
"truffle": "^5.1.11",
"webpack": "^4.41.5",
"webpack-cli": "~3.3.10",
"webpack-dev-server": "~3.10.2"
},
"dependencies": {
"arb-provider-truffle": "^0.2.0",
"arb-provider-ethers": "^0.2.0",
"bootstrap": "3.4.1",
"jquery": "^3.4.1",
"ethers": "4.0.33"
"arb-provider-ethers": "^0.3.0",
"arb-provider-truffle": "^0.3.3",
"bootstrap": "4.4.1",
"ethers": "4.0.44",
"jquery": "^3.4.1"
},
"workspaces": {
"nohoist": []
Expand Down
8 changes: 6 additions & 2 deletions demos/election/src/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,14 @@ let App = {

castVote: async function() {
var candidateId = $("#candidatesSelect").val();
await App.contracts.Election.vote(candidateId);
// Wait for votes to update
let tx = await App.contracts.Election.vote(candidateId);

$("#content").hide();
$("#loader").show();

await tx.wait();
// Wait for votes to update
App.render();
}
};

Expand Down
22 changes: 11 additions & 11 deletions demos/interop/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
"watch": "webpack --watch"
},
"devDependencies": {
"css-loader": "^3.2.0",
"file-loader": "^4.2.0",
"style-loader": "^1.0.0",
"css-loader": "^3.4.2",
"file-loader": "^5.0.2",
"style-loader": "^1.1.3",
"svg-inline-loader": "^0.8.0",
"truffle": "^5.0.31",
"webpack": "~4.35.2",
"webpack-cli": "~3.3.5",
"webpack-dev-server": "~3.7.2"
"truffle": "^5.1.11",
"webpack": "^4.41.5",
"webpack-cli": "~3.3.10",
"webpack-dev-server": "~3.10.2"
},
"dependencies": {
"@openzeppelin/contracts": "^2.4.0",
"arb-provider-truffle": "^0.2.0",
"arb-provider-ethers": "^0.2.0",
"@openzeppelin/contracts": "^2.5.0",
"arb-provider-ethers": "^0.3.0",
"arb-provider-truffle": "^0.3.0",
"bootstrap": "^4.4.1",
"ethers": "4.0.33",
"ethers": "4.0.44",
"jquery": "^3.4.1"
},
"workspaces": {
Expand Down
2 changes: 1 addition & 1 deletion demos/pet-shop/dist/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h3 class="panel-title">Scrappy</h3>
<strong>Location</strong>:
<span class="pet-location">Warren, MI</span><br /><br />
<button
class="btn btn-default btn-adopt"
class="btn btn-secondary btn-adopt"
type="button"
data-id="0"
>
Expand Down
22 changes: 11 additions & 11 deletions demos/pet-shop/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
"watch": "webpack --watch"
},
"devDependencies": {
"css-loader": "^3.2.0",
"file-loader": "^4.2.0",
"style-loader": "^1.0.0",
"css-loader": "^3.4.2",
"file-loader": "^5.0.2",
"style-loader": "^1.1.3",
"svg-inline-loader": "^0.8.0",
"truffle": "^5.0.31",
"webpack": "~4.35.2",
"webpack-cli": "~3.3.5",
"webpack-dev-server": "~3.7.2"
"truffle": "^5.1.11",
"webpack": "^4.41.5",
"webpack-cli": "~3.3.10",
"webpack-dev-server": "~3.10.2"
},
"dependencies": {
"arb-provider-truffle": "^0.2.0",
"arb-provider-web3": "^0.2.0",
"bootstrap": "^3.4.1",
"arb-provider-truffle": "^0.3.0",
"arb-provider-web3": "^0.3.0",
"bootstrap": "^4.4.1",
"jquery": "^3.4.1",
"web3": "~1.2.1"
"web3": "~1.2.6"
},
"workspaces": {
"nohoist": []
Expand Down
6 changes: 2 additions & 4 deletions docs/Developer_Quickstart.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ list of dependencies.
Using [Homebrew](https://brew.sh/):

```bash
brew install python3 docker docker-compose parity rocksdb
brew install python3 docker docker-compose rocksdb
brew cask install docker
open -a Docker
```
Expand All @@ -40,7 +40,6 @@ Using apt:
```bash
sudo apt update
sudo apt install -y python3 python3-pip docker docker-compose
bash <(curl https://get.parity.io -L)
```

> Docker [can be used without sudo](https://docs.docker.com/install/linux/linux-postinstall/)
Expand All @@ -66,7 +65,6 @@ Here are the important dependencies in case you are not running on a supported O
- [node](https://nodejs.org/en/)
- [python3 and pip3](https://www.python.org/downloads/)
- [truffle](https://truffleframework.com/docs/truffle/getting-started/installation)
- [parity](https://www.parity.io/ethereum)
- [yarn](https://yarnpkg.com/en/)

> Requires `node -v` version 8, 10 or 12
Expand All @@ -78,7 +76,7 @@ Here are the important dependencies in case you are not running on a supported O
Download the Arbitrum Monorepo from source:

```bash
git clone -b v0.2.1 --depth=1 -c advice.detachedHead=false https://github.com/offchainlabs/arbitrum.git
git clone -b v0.3.0 --depth=1 -c advice.detachedHead=false https://github.com/offchainlabs/arbitrum.git
cd arbitrum
yarn
yarn build
Expand Down
6 changes: 3 additions & 3 deletions packages/arb-bridge-eth/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
]
},
"dependencies": {
"@openzeppelin/contracts": "^2.4.0"
"@openzeppelin/contracts": "^2.5.0"
},
"devDependencies": {
"@openzeppelin/test-helpers": "^0.5.4",
"truffle": "^5.0.33",
"truffle-flattener": "^1.4.0"
"truffle": "^5.1.11",
"truffle-flattener": "^1.4.2"
},
"workspaces": {
"nohoist": [
Expand Down
6 changes: 3 additions & 3 deletions packages/arb-compiler-evm/contract-templates/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
"build": "truffle compile"
},
"dependencies": {
"@openzeppelin/contracts": "^2.4.0",
"arb-provider-truffle": "^0.2.0"
"@openzeppelin/contracts": "^2.5.0",
"arb-provider-truffle": "^0.3.3"
},
"devDependencies": {
"truffle": "^5.0.33"
"truffle": "^5.1.11"
},
"workspaces": {
"nohoist": [
Expand Down
45 changes: 22 additions & 23 deletions packages/arb-provider-ethers/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "arb-provider-ethers",
"version": "0.3.0",
"version": "0.3.2",
"description": "Arbitrum provider for ethers",
"author": "Offchain Labs, Inc.",
"license": "Apache-2.0",
Expand All @@ -17,38 +17,37 @@
"homepage": "https://offchainlabs.com",
"scripts": {
"prepare": "yarn build",
"prepublishOnly": "yarn shrinkABI && yarn test && yarn lint",
"preversion": "npm run lint",
"shrinkABI": "node shrinkABI.js && yarn run prettier src/lib/ArbChain.json src/lib/ArbChannel.json src/lib/GlobalPendingInbox.json --write",
"prepublishOnly": "yarn lint && yarn format && yarn test",
"preversion": "yarn lint",
"build": "tsc && cp src/lib/abi/index.d.ts src/lib/abi/ArbRollup.d.ts src/lib/abi/GlobalPendingInbox.d.ts dist/lib/abi",
"test": "jest --config jest.config.js",
"format": "yarn run prettier '**/*.{js,json,md,ts,yml}' --write && yarn run lint --fix",
"lint": "eslint . src/**/*.ts tests/**/*.ts",
"lint": "eslint src/**/*.ts tests/**/*.ts",
"update-abi": "./scripts/update-abi"
},
"dependencies": {
"@types/node-fetch": "^2.5.0",
"ethers": "~4.0.28",
"jayson": "~2.1.2",
"node-fetch": "~2.3.0",
"promise-poller": "~1.7.0",
"@types/node-fetch": "^2.5.4",
"ethers": "^4.0.44",
"jayson": "^3.2.0",
"node-fetch": "^2.6.0",
"promise-poller": "^1.9.1",
"solidity-bytes-utils": "^0.0.8"
},
"devDependencies": {
"@types/jest": "^24.0.17",
"@typescript-eslint/eslint-plugin": "^2.0.0",
"@typescript-eslint/parser": "^2.0.0",
"eslint": "^6.2.1",
"eslint-config-prettier": "^6.1.0",
"eslint-plugin-prettier": "^3.1.0",
"jest": "^24.9.0",
"jest-junit": "^7.0.0",
"prettier": "^1.18.2",
"ts-jest": "^24.0.2",
"typechain": "^0.3.21",
"typescript": "^3.5.3"
"@types/jest": "^25.1.1",
"@typescript-eslint/eslint-plugin": "^2.19.0",
"@typescript-eslint/parser": "^2.19.0",
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.10.0",
"eslint-plugin-prettier": "^3.1.2",
"jest": "^25.1.0",
"jest-junit": "^10.0.0",
"prettier": "^1.19.1",
"ts-jest": "^25.2.0",
"typechain": "^1.0.4",
"typescript": "^3.7.5"
},
"files": [
"lib/**/*"
"dist/**/*"
]
}
1 change: 1 addition & 0 deletions packages/arb-provider-truffle/lib/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ function provider(outputFolder, buildLocation, options, should_compile) {
buildLocation = path.resolve(rootPath, "build/contracts");
}
options.allowUnlimitedContractSize = true;
options.network_id = 123456789;
const arbProvider = ganache.provider(options);

const contractCode = {};
Expand Down
18 changes: 9 additions & 9 deletions packages/arb-provider-truffle/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "arb-provider-truffle",
"version": "0.3.0",
"version": "0.3.3",
"description": "Arbitrum provider for truffle",
"author": "Offchain Labs, Inc.",
"license": "Apache-2.0",
Expand All @@ -20,15 +20,15 @@
},
"homepage": "https://offchainlabs.com",
"dependencies": {
"callsite": "~1.0.0",
"ganache-core": "2.7.0"
"callsite": "^1.0.0",
"ganache-core": "^2.10.1"
},
"devDependencies": {
"eslint": "^6.2.1",
"eslint-config-prettier": "^6.1.0",
"eslint-plugin-prettier": "^3.1.0",
"jest": "^24.9.0",
"jest-junit": "^7.0.0",
"prettier": "^1.18.2"
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.10.0",
"eslint-plugin-prettier": "^3.1.2",
"jest": "^25.1.0",
"jest-junit": "^10.0.0",
"prettier": "^1.19.1"
}
}
22 changes: 11 additions & 11 deletions packages/arb-provider-web3/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "arb-provider-web3",
"version": "0.3.0",
"version": "0.3.1",
"description": "Arbitrum provider for web3",
"author": "Offchain Labs, Inc.",
"license": "Apache-2.0",
Expand All @@ -20,17 +20,17 @@
},
"homepage": "https://offchainlabs.com",
"dependencies": {
"arb-provider-ethers": "^0.2.0",
"ethers": "~4.0.33",
"ethers-providers": "~2.1.19",
"ethers-utils": "~2.1.11"
"arb-provider-ethers": "^0.3.2",
"ethers": "^4.0.44",
"ethers-providers": "^2.1.19",
"ethers-utils": "^2.1.11"
},
"devDependencies": {
"eslint": "^6.2.1",
"eslint-config-prettier": "^6.1.0",
"eslint-plugin-prettier": "^3.1.0",
"jest": "^24.9.0",
"jest-junit": "^7.0.0",
"prettier": "^1.18.2"
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.10.0",
"eslint-plugin-prettier": "^3.1.2",
"jest": "^25.1.0",
"jest-junit": "^10.0.0",
"prettier": "^1.19.1"
}
}
Loading

0 comments on commit 3f17cbb

Please sign in to comment.