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.

Sign up for GitHub

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

change network id's to be below 109 #495

Merged
merged 1 commit into from
Aug 2, 2018
Merged

change network id's to be below 109 #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ FROM augurproject/dev-node-geth:latest
ARG normal_time=false
ENV USE_NORMAL_TIME=$normal_time

ARG network_id=12346
ARG network_id=101
ENV NETWORK_ID=$network_id

# Install Node
Expand Down
12 changes: 6 additions & 6 deletions dist/augur.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@ module.exports={
"Trade": "0xb03cf72bc5a9a344aac43534d664917927367487",
"TradingEscapeHatch": "0xdfef677bf5f66f3eeff481a587c04cb58e95b92a"
},
"12346": {
"101": {
"Controller": "0xfcaf25bf38e7c86612a25ff18cb8e09ab07c9885",
"Universe": "0xf5fa9e803f10c099531047826b9de7bb34975da8",
"Augur": "0x25ff5dc79a7c4e34254ff0f4a19d69e491201dd3",
Expand All @@ -982,7 +982,7 @@ module.exports={
"Trade": "0xf3bcabd8fae29f75be271ebe2499edb4c7c139b7",
"TradingEscapeHatch": "0x021076fb9adafcf83869435f9d72a5873869b4ad"
},
"22346": {
"102": {
"Controller": "0xfcaf25bf38e7c86612a25ff18cb8e09ab07c9885",
"Universe": "0xaac01b4aaa2ebd04a4790c85b76e1749d8ef8e13",
"Augur": "0x25ff5dc79a7c4e34254ff0f4a19d69e491201dd3",
Expand All @@ -1001,7 +1001,7 @@ module.exports={
"Trade": "0x97ba58dbe58898f2b669c56496f46f638dc322d4",
"TradingEscapeHatch": "0x897516718140a2bbb9730904823f9db6d9ae28c0"
},
"32346": {
"103": {
"Controller": "0xfcaf25bf38e7c86612a25ff18cb8e09ab07c9885",
"Universe": "0x161c723cac007e4283cee4ba11b15277e46eec53",
"Augur": "0x25ff5dc79a7c4e34254ff0f4a19d69e491201dd3",
Expand Down Expand Up @@ -1104,9 +1104,9 @@ module.exports={
"19": 1340162,
"42": 7926279,
"8995": 0,
"12346": 113,
"22346": 10,
"32346": 10
"101": 113,
"102": 10,
"103": 10
}
},{}],35:[function(require,module,exports){
"use strict";
Expand Down
4 changes: 2 additions & 2 deletions scripts/docker/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ docker pull augurproject/dev-node-geth:latest

# Build and copy to merge with current address.json/block_numbers.json
IMAGE_NAME=augurproject/dev-pop-geth
docker build --no-cache . --build-arg normal_time=false --build-arg network_id=22346 -t $IMAGE_NAME:$TAG -t $IMAGE_NAME:latest
docker build --no-cache . --build-arg normal_time=false --build-arg network_id=102 -t $IMAGE_NAME:$TAG -t $IMAGE_NAME:latest
./scripts/copy-docker-files.sh $IMAGE_NAME:latest

IMAGE_NAME=augurproject/dev-pop-normtime-geth
# Build and copy to merge with updated address.json/block_numbers.json
docker build --no-cache . --build-arg normal_time=true --build-arg network_id=32346 -t $IMAGE_NAME:$TAG -t $IMAGE_NAME:latest
docker build --no-cache . --build-arg normal_time=true --build-arg network_id=103 -t $IMAGE_NAME:$TAG -t $IMAGE_NAME:latest
./scripts/copy-docker-files.sh $IMAGE_NAME:latest

8 changes: 4 additions & 4 deletions src/contracts/addresses.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
"Trade": "0xb03cf72bc5a9a344aac43534d664917927367487",
"TradingEscapeHatch": "0xdfef677bf5f66f3eeff481a587c04cb58e95b92a"
},
"12346": {
"101": {
"Controller": "0xfcaf25bf38e7c86612a25ff18cb8e09ab07c9885",
"Universe": "0xf5fa9e803f10c099531047826b9de7bb34975da8",
"Augur": "0x25ff5dc79a7c4e34254ff0f4a19d69e491201dd3",
Expand All @@ -129,7 +129,7 @@
"Trade": "0xf3bcabd8fae29f75be271ebe2499edb4c7c139b7",
"TradingEscapeHatch": "0x021076fb9adafcf83869435f9d72a5873869b4ad"
},
"22346": {
"102": {
"Controller": "0xfcaf25bf38e7c86612a25ff18cb8e09ab07c9885",
"Universe": "0xaac01b4aaa2ebd04a4790c85b76e1749d8ef8e13",
"Augur": "0x25ff5dc79a7c4e34254ff0f4a19d69e491201dd3",
Expand All @@ -148,7 +148,7 @@
"Trade": "0x97ba58dbe58898f2b669c56496f46f638dc322d4",
"TradingEscapeHatch": "0x897516718140a2bbb9730904823f9db6d9ae28c0"
},
"32346": {
"103": {
"Controller": "0xfcaf25bf38e7c86612a25ff18cb8e09ab07c9885",
"Universe": "0x161c723cac007e4283cee4ba11b15277e46eec53",
"Augur": "0x25ff5dc79a7c4e34254ff0f4a19d69e491201dd3",
Expand All @@ -167,4 +167,4 @@
"Trade": "0xb8da5fa6c6f9b55f1c9fa09e26a24d3675dbc36e",
"TradingEscapeHatch": "0xd1102fbe361acf2c54f572caca4b928350555f40"
}
}
}
8 changes: 4 additions & 4 deletions src/contracts/upload-block-numbers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"19": 1340162,
"42": 7926279,
"8995": 0,
"12346": 113,
"22346": 10,
"32346": 10
}
"101": 113,
"102": 10,
"103": 10
}
2 changes: 1 addition & 1 deletion test/unit/contracts/artifacts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var expect = require("chai").expect;
var fs = require("fs");
var path = require("path");

var NETWORK_IDS = ["1", "3", "4", "19", "42", "8995", "12346", "22346", "32346"];
var NETWORK_IDS = ["1", "3", "4", "19", "42", "8995", "101", "102", "103"];

describe("artifacts", function () {
it("has a well-formed addresses.json", function (done) {
Expand Down