crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Invalid working_directory (#568)

Browse Source 
* Invalid working_directory

Invalid working_directory leads to a bug where some of commands are
executed incorrect code version.

* Fix prettier
This commit is contained in:
Marcin Wolny 2022-08-31 14:37:39 +00:00 committed by GitHub
parent d738eede0e
commit 1fb44a55b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 126 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

187
.circleci/config.yml
View File

@ -1,9 +1,9 @@
version: 2.1 version: 2.1
parameters: parameters:
cache_version: cache_version:
type: string type: string
default: v3 default: v4
jobs: jobs:
build: build:
@ -11,15 +11,17 @@ jobs:
docker: docker:
- image: node:16 - image: node:16
environment: environment:
NODE_OPTIONS: '--max-old-space-size=16384' NODE_OPTIONS: "--max-old-space-size=16384"
working_directory: ~/repo
steps: steps:
- checkout - checkout
- run: git submodule update --init --recursive - run: git submodule update --init --recursive
- run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV - run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV
- restore_cache: - restore_cache:
keys: keys:
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - lib-{{ .Environment.CIRCLE_BRANCH }}
- restore_cache:
keys:
- cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
- run: - run:
name: install-yarn name: install-yarn
command: npm install --force --global yarn@1.22.0 command: npm install --force --global yarn@1.22.0
@ -29,10 +31,48 @@ jobs:
- setup_remote_docker - setup_remote_docker
- run: yarn build:ci - run: yarn build:ci
- save_cache: - save_cache:
key: repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> key: cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
paths: paths:
- ~/repo - ~/project/contracts/erc20/node_modules
- ~/project/contracts/test-utils/node_modules
- ~/project/contracts/treasury/node_modules
- ~/project/contracts/utils/node_modules
- ~/project/contracts/zero-ex/node_modules
- ~/project/node_modules
- ~/project/packages/asset-swapper/node_modules
- ~/project/packages/contract-addresses/node_modules
- ~/project/packages/contract-artifacts/node_modules
- ~/project/packages/contract-wrappers/node_modules
- ~/project/packages/protocol-utils/node_modules
- ~/.cache/yarn - ~/.cache/yarn
- save_cache:
key: lib-{{ .Environment.CIRCLE_BRANCH }}
paths:
- ~/project/contracts/erc20/generated-artifacts/
- ~/project/contracts/erc20/generated-wrappers/
- ~/project/contracts/erc20/lib/
- ~/project/contracts/erc20/test/generated-artifacts/
- ~/project/contracts/erc20/test/generated-wrappers/
- ~/project/contracts/test-utils/lib/
- ~/project/contracts/treasury/generated-artifacts/
- ~/project/contracts/treasury/generated-wrappers/
- ~/project/contracts/treasury/lib/
- ~/project/contracts/treasury/test/generated-artifacts/
- ~/project/contracts/treasury/test/generated-wrappers/
- ~/project/contracts/utils/generated-artifacts/
- ~/project/contracts/utils/generated-wrappers/
- ~/project/contracts/utils/lib/
- ~/project/contracts/utils/test/generated-artifacts/
- ~/project/contracts/utils/test/generated-wrappers/
- ~/project/contracts/zero-ex/generated-artifacts/
- ~/project/contracts/zero-ex/generated-wrappers/
- ~/project/contracts/zero-ex/lib/
- ~/project/contracts/zero-ex/test/generated-artifacts/
- ~/project/contracts/zero-ex/test/generated-wrappers/
- ~/project/packages/contract-addresses/lib/
- ~/project/packages/contract-artifacts/lib/
- ~/project/packages/contract-wrappers/lib/
- ~/project/packages/protocol-utils/lib/
- store_artifacts: - store_artifacts:
path: ~/repo/packages/abi-gen/test-cli/output path: ~/repo/packages/abi-gen/test-cli/output
- store_artifacts: - store_artifacts:
@ -41,108 +81,124 @@ jobs:
resource_class: xlarge resource_class: xlarge
docker: docker:
- image: node:16 - image: node:16
working_directory: ~/repo
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
keys: keys:
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
- restore_cache:
keys:
- lib-{{ .Environment.CIRCLE_BRANCH }}
- run: yarn wsrun -p @0x/contracts-exchange -m --serial -c test:circleci - run: yarn wsrun -p @0x/contracts-exchange -m --serial -c test:circleci
test-integrations-ganache: test-integrations-ganache:
resource_class: xlarge resource_class: xlarge
docker: docker:
- image: node:16 - image: node:16
working_directory: ~/repo
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
keys: keys:
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
- restore_cache:
keys:
- lib-{{ .Environment.CIRCLE_BRANCH }}
- run: yarn wsrun -p @0x/contracts-integrations -m --serial -c test:circleci - run: yarn wsrun -p @0x/contracts-integrations -m --serial -c test:circleci
test-contracts-staking-ganache: test-contracts-staking-ganache:
resource_class: xlarge resource_class: xlarge
docker: docker:
- image: node:16 - image: node:16
working_directory: ~/repo
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
keys: keys:
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
- lib-{{ .Environment.CIRCLE_BRANCH }}
- run: yarn wsrun -p @0x/contracts-staking -m --serial -c test:circleci - run: yarn wsrun -p @0x/contracts-staking -m --serial -c test:circleci
test-contracts-extra-ganache: test-contracts-extra-ganache:
resource_class: xlarge resource_class: xlarge
docker: docker:
- image: node:16 - image: node:16
working_directory: ~/repo
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
keys: keys:
- repo-{{ checksum "yarn.lock" }} - cache-{{ checksum "yarn.lock" }}
- restore_cache:
keys:
- lib-{{ .Environment.CIRCLE_BRANCH }}
- run: yarn wsrun -p @0x/contracts-exchange-forwarder -p @0x/contracts-coordinator -m --serial -c test:circleci - run: yarn wsrun -p @0x/contracts-exchange-forwarder -p @0x/contracts-coordinator -m --serial -c test:circleci
test-contracts-rest-ganache: test-contracts-rest-ganache:
resource_class: xlarge resource_class: xlarge
docker: docker:
- image: node:16 - image: node:16
working_directory: ~/repo
steps: steps:
- checkout - checkout
- run: | - run: |
git diff --name-only development >> changed.txt git diff --name-only development >> changed.txt
if ! grep -q \.sol changed.txt; then if ! grep -q \.sol changed.txt; then
circleci-agent step halt circleci-agent step halt
fi fi
- restore_cache: - restore_cache:
keys: keys:
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
- restore_cache:
keys:
- lib-{{ .Environment.CIRCLE_BRANCH }}
- run: | - run: |
yarn wsrun \ yarn wsrun \
-p @0x/contracts-multisig \ -p @0x/contracts-multisig \
-p @0x/contracts-utils \ -p @0x/contracts-utils \
-p @0x/contracts-exchange-libs \ -p @0x/contracts-exchange-libs \
-p @0x/contracts-erc20 \ -p @0x/contracts-erc20 \
-p @0x/contracts-erc721 \ -p @0x/contracts-erc721 \
-p @0x/contracts-erc1155 \ -p @0x/contracts-erc1155 \
-p @0x/contracts-asset-proxy \ -p @0x/contracts-asset-proxy \
-p @0x/contracts-broker \ -p @0x/contracts-broker \
-p @0x/contracts-zero-ex \ -p @0x/contracts-zero-ex \
-m --serial -c test:circleci -m --serial -c test:circleci
test-foundry: test-foundry:
resource_class: xlarge resource_class: xlarge
docker: docker:
- image: ghcr.io/foundry-rs/foundry:latest - image: ghcr.io/foundry-rs/foundry:latest
working_directory: ~/repo/contracts/zero-ex
steps: steps:
- checkout - checkout
- run: | - run: |
git diff --name-only development >> changed.txt git diff --name-only development >> changed.txt
if ! grep -q \.sol changed.txt; then cat changed.txt
circleci-agent step halt if ! grep -q \.sol changed.txt; then
fi circleci-agent step halt
fi
- restore_cache: - restore_cache:
keys: keys:
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
# - run: forge install - restore_cache:
- run: forge test keys:
- lib-{{ .Environment.CIRCLE_BRANCH }}
- run: git submodule update --init --recursive
- run:
command: forge test
working_directory: ~/project/contracts/zero-ex
test-publish: test-publish:
resource_class: large resource_class: large
environment: environment:
NODE_OPTIONS: '--max-old-space-size=6442' NODE_OPTIONS: "--max-old-space-size=6442"
docker: docker:
- image: node:16 - image: node:16
- image: 0xorg/verdaccio - image: 0xorg/verdaccio
working_directory: ~/repo
steps: steps:
- checkout - checkout
- run: | - run: |
git diff --name-only development >> changed.txt git diff --name-only development >> changed.txt
if ! grep -q packages/ changed.txt; then cat changed.txt
circleci-agent step halt if ! grep -q packages/ changed.txt; then
fi circleci-agent step halt
fi
- restore_cache: - restore_cache:
keys: keys:
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
- restore_cache:
keys:
- lib-{{ .Environment.CIRCLE_BRANCH }}
- run: - run:
command: yarn test:publish:circleci command: yarn test:publish:circleci
no_output_timeout: 1800 no_output_timeout: 1800
@ -151,26 +207,30 @@ jobs:
test-doc-generation: test-doc-generation:
docker: docker:
- image: node:16 - image: node:16
working_directory: ~/repo
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
keys: keys:
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
- restore_cache:
keys:
- lib-{{ .Environment.CIRCLE_BRANCH }}
- run: - run:
command: yarn test:generate_docs:circleci command: yarn test:generate_docs:circleci
no_output_timeout: 1200 no_output_timeout: 1200
test-rest: test-rest:
docker: docker:
- image: node:16 - image: node:16
working_directory: ~/repo
environment: environment:
RUST_ROUTER: 'true' RUST_ROUTER: "true"
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
keys: keys:
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
- restore_cache:
keys:
- lib-{{ .Environment.CIRCLE_BRANCH }}
- run: yarn wsrun -p @0x/contracts-test-utils -m --serial -c test:circleci - run: yarn wsrun -p @0x/contracts-test-utils -m --serial -c test:circleci
- run: yarn wsrun -p @0x/contract-addresses -m --serial -c test:circleci - run: yarn wsrun -p @0x/contract-addresses -m --serial -c test:circleci
- run: yarn wsrun -p @0x/contract-artifacts -m --serial -c test:circleci - run: yarn wsrun -p @0x/contract-artifacts -m --serial -c test:circleci
@ -196,27 +256,26 @@ jobs:
- checkout - checkout
- restore_cache: - restore_cache:
keys: keys:
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
- lib-{{ .Environment.CIRCLE_BRANCH }}
- run: - run:
command: yarn lerna run lint command: yarn lerna run lint
working_directory: ~/repo
- run: - run:
command: yarn prettier:ci command: yarn prettier:ci
working_directory: ~/repo
- run: - run:
command: yarn deps_versions:ci command: yarn deps_versions:ci
working_directory: ~/repo
- run: - run:
command: yarn diff_md_docs:ci command: yarn diff_md_docs:ci
working_directory: ~/repo
submit-coverage: submit-coverage:
docker: docker:
- image: node:16 - image: node:16
working_directory: ~/repo
steps: steps:
- restore_cache: - restore_cache:
keys: keys:
- repo-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
- restore_cache:
keys:
- lib-{{ .Environment.CIRCLE_BRANCH }}
- restore_cache: - restore_cache:
keys: keys:
- coverage-contract-wrappers-test-{{ checksum "yarn.lock" }} - coverage-contract-wrappers-test-{{ checksum "yarn.lock" }}

10
packages/asset-swapper/src/utils/market_operation_utils/constants.ts
View File

@ -224,10 +224,7 @@ export const SELL_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
ERC20BridgeSource.Velodrome, ERC20BridgeSource.Velodrome,
ERC20BridgeSource.Synthetix, ERC20BridgeSource.Synthetix,
]), ]),
[ChainId.ArbitrumRinkeby]: new SourceFilters([ [ChainId.ArbitrumRinkeby]: new SourceFilters([ERC20BridgeSource.Native, ERC20BridgeSource.UniswapV3]),
ERC20BridgeSource.Native,
ERC20BridgeSource.UniswapV3,
]),
}, },
new SourceFilters([]), new SourceFilters([]),
); );
@ -379,10 +376,7 @@ export const BUY_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
ERC20BridgeSource.Velodrome, ERC20BridgeSource.Velodrome,
ERC20BridgeSource.Synthetix, ERC20BridgeSource.Synthetix,
]), ]),
[ChainId.ArbitrumRinkeby]: new SourceFilters([ [ChainId.ArbitrumRinkeby]: new SourceFilters([ERC20BridgeSource.Native, ERC20BridgeSource.UniswapV3]),
ERC20BridgeSource.Native,
ERC20BridgeSource.UniswapV3,
]),
}, },
new SourceFilters([]), new SourceFilters([]),
); );

1
packages/contract-addresses/addresses.json
View File

@ -344,5 +344,4 @@
"positiveSlippageFeeTransformer": "0xd56b9c014b45ed95e2a048a0c28121db30265f13" "positiveSlippageFeeTransformer": "0xd56b9c014b45ed95e2a048a0c28121db30265f13"
} }
} }
} }

2
packages/contract-addresses/src/index.ts
View File

@ -39,7 +39,7 @@ export enum ChainId {
Celo = 42220, Celo = 42220,
Optimism = 10, Optimism = 10,
Arbitrum = 42161, Arbitrum = 42161,
ArbitrumRinkeby = 421611 ArbitrumRinkeby = 421611,
} }
/** /**