c400b5c · bridge · git.iko.soy

DEVELOPMENT.md+2−2

compare with master

unifiedsplit

@@ -171,7 +171,7 @@ npm run pilot-l2

171Start a local fake ship from the master branch in the [urbit repo](https://github.com/urbit/urbit)

172

173```sh

174−/path/to/urbit -F zod -B ./bin/solid.pill -A ./pkg/arvo zod

174+/path/to/urbit -F zod -B ./bin/solid.pill -A ./pkg/arvo -c zod --http-port 8080

175```

176

177```dojo

@@ -185,7 +185,7 @@ Start a local fake ship from the master branch in the [urbit repo](https://githu

185> :roller|local

186> :roller|setkey '58d62eb79797502bc0f66cd3e7a49d00287bff53a2734b799ef09cb746340ed0'

187> :roller|quota 9.999

188−> |cors-approve 'http://localhost:3000'

188+> |cors-approve 'https://127.0.0.1:3000'

189:: Once L2 txs have been sent via Bridge, this will manually commit and batch them, avoiding waiting for the timer

190::

191> :roller|commit

migrations/1_migration.js+2−1

@@ -63,7 +63,8 @@ module.exports = async function(deployer) {

63 '0x0000000000000000000000000000000000000000',

64 azimuth.address,

65 polls.address,

66− claims.address

66+ claims.address,

67+ '0x0000000000000000000000000000000000000000' // treasury

67 );

68 );

68

69

69 // configure contract ownership

70 // configure contract ownership

package-lock.json+3−15

@@ -6173,8 +6173,8 @@

6173 }

6174 },

6175 "node_modules/azimuth-solidity": {

6176− "version": "1.2.3",

6176+ "version": "1.2.4",

6177− "resolved": "git+ssh://git@github.com/urbit/azimuth.git#c5394f7aabb6e9de49a67ab0cd227ac62303efd5",

6177+ "resolved": "git+ssh://git@github.com/urbit/azimuth.git#bcf1d7bcf64cd73a3688434feb786be39a116819",

6178 "bundleDependencies": [

6179 "openzeppelin-solidity"

6180 ],

@@ -16541,11 +16541,6 @@

16541 "xhr-request-promise": "^0.1.2"

16542 }

16543 },

16544− "node_modules/web3/node_modules/eth-lib/node_modules/bn.js": {

16545− "version": "4.12.0",

16546− "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",

16547− "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="

16548− },

16549 "node_modules/web3/node_modules/get-stream": {

16544 "node_modules/web3/node_modules/get-stream": {

16550 "version": "6.0.1",

16545 "version": "6.0.1",

16551 "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",

16546 "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",

@@ -21435,7 +21430,7 @@

21435 }

21430 }

21436 },

21431 },

21437 "azimuth-solidity": {

21432 "azimuth-solidity": {

21438− "version": "git+ssh://git@github.com/urbit/azimuth.git#c5394f7aabb6e9de49a67ab0cd227ac62303efd5",

21433+ "version": "git+ssh://git@github.com/urbit/azimuth.git#bcf1d7bcf64cd73a3688434feb786be39a116819",

21439 "from": "azimuth-solidity@github:urbit/azimuth",

21434 "from": "azimuth-solidity@github:urbit/azimuth",

21440 "requires": {

21435 "requires": {

21441 "babel-polyfill": "^6.26.0",

21436 "babel-polyfill": "^6.26.0",

@@ -28503,13 +28498,6 @@

28503 "bn.js": "^4.11.6",

28498 "bn.js": "^4.11.6",

28504 "elliptic": "^6.4.0",

28499 "elliptic": "^6.4.0",

28505 "xhr-request-promise": "^0.1.2"

28500 "xhr-request-promise": "^0.1.2"

28506− },

28507− "dependencies": {

28508− "bn.js": {

28509− "version": "4.12.0",

28510− "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",

28511− "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="

28512− }

28513 }

28501 }

28514 },

28502 },

28515 "get-stream": {

28503 "get-stream": {

src/lib/constants.ts+2

@@ -230,6 +230,7 @@ const EIP1559_TRANSACTION_TYPE = 2;

230// https://chainlist.org/?testnets=true

231const ETHEREUM_MAINNET_CHAIN_ID = '0x1';

232const ETHEREUM_GOERLI_CHAIN_ID = '0x5';

233+const ETHEREUM_LOCAL_CHAIN_ID = '0x539';

233

234

234export {

235export {

235 CHECK_BLOCK_EVERY_MS,

236 CHECK_BLOCK_EVERY_MS,

@@ -282,4 +283,5 @@ export {

282 INITIAL_NETWORK_KEY_REVISION,

283 INITIAL_NETWORK_KEY_REVISION,

283 ETHEREUM_MAINNET_CHAIN_ID,

284 ETHEREUM_MAINNET_CHAIN_ID,

284 ETHEREUM_GOERLI_CHAIN_ID,

285 ETHEREUM_GOERLI_CHAIN_ID,

286+ ETHEREUM_LOCAL_CHAIN_ID,

285};

287};

src/lib/flags.js+1−1

@@ -1,7 +1,7 @@

1import { version } from '../../package.json';

2

3// are we running bridge in a development build

4−export const isDevelopment = import.meta.env.DEV === 'development';

4+export const isDevelopment = import.meta.env.DEV === true;

5export const isGoerli = import.meta.env.VITE_GOERLI === 'true';

6export const isMainnet = import.meta.env.VITE_MAINNET === 'true';

7export const versionLabel =

src/lib/network.js+7−2

@@ -1,6 +1,7 @@

1−import { isMainnet } from './flags';

1+import { isDevelopment, isGoerli, isMainnet } from './flags';

2import {

3 ETHEREUM_GOERLI_CHAIN_ID,

4+ ETHEREUM_LOCAL_CHAIN_ID,

4 ETHEREUM_MAINNET_CHAIN_ID,

5 ETHEREUM_MAINNET_CHAIN_ID,

5} from './constants';

6} from './constants';

6

7

@@ -34,7 +35,11 @@ const chainIdToNetworkType = chainId => {

34};

35};

35

36

36const expectedChainId = () => {

37const expectedChainId = () => {

38+ return isGoerli

39+ ? ETHEREUM_GOERLI_CHAIN_ID

40+ : isDevelopment && !isMainnet

41+ ? ETHEREUM_LOCAL_CHAIN_ID

37− return isMainnet ? ETHEREUM_MAINNET_CHAIN_ID : ETHEREUM_GOERLI_CHAIN_ID;

42+ : ETHEREUM_MAINNET_CHAIN_ID;

38};

43};

39

44

40export {

45export {

src/worker/index.ts+1

@@ -1,4 +1,5 @@

1import { Buffer } from 'buffer/';

2+// eslint-disable-next-line

2(self as any).Buffer = Buffer;

3(self as any).Buffer = Buffer;

3

4

4export const walletgenWorker = new ComlinkWorker<typeof import('./worker')>(

5export const walletgenWorker = new ComlinkWorker<typeof import('./worker')>(

truffle-config.js+1−1

@@ -5,7 +5,7 @@ require('babel-polyfill');

5module.exports = {

6 networks: {

7 development: {

8− host: 'localhost',

8+ host: '0.0.0.0',

9 port: 8545,

10 network_id: '*', // Match any network id

11 gas: 6000000,