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.

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

2098 remove jakarta condition in on chain view #2130

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
47cf160
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang Aug 8, 2022
53bf5c5
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang Aug 11, 2022
eddeb1d
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang Aug 23, 2022
ac9bd70
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang Sep 13, 2022
ca9577d
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang Sep 28, 2022
8c1643d
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang Oct 4, 2022
d34128b
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang Oct 5, 2022
ad53532
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang Oct 20, 2022
1d175f5
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang Oct 25, 2022
b1414ef
Merge branch 'master' of github.com:ecadlabs/taquito
hui-an-yang Oct 27, 2022
c029847
feat: support new types for new operations UpdateConsensusKey and Dra…
hui-an-yang Oct 31, 2022
33489db
test: update_consensus_key unit test added for limanet
hui-an-yang Nov 4, 2022
029efa1
feat: support new operation UpdateConsensusKey for Lima
hui-an-yang Nov 5, 2022
2992fcf
feat: support new operation updateConsensusKey in local-forger for Lima
hui-an-yang Nov 7, 2022
edd3f63
revert: removed unnecesorry change of updateConsensusKey in rpc-batch…
hui-an-yang Nov 7, 2022
e0126e5
revert: changes of update_consensus_key in RpcContractProvider and RP…
hui-an-yang Nov 8, 2022
984e3a5
feat: support new operation drainDelegate for Lima
hui-an-yang Nov 8, 2022
1c0a203
Merge branch 'lima' of github.com:ecadlabs/taquito into 2065-local-fo…
hui-an-yang Nov 8, 2022
db4db3d
Merge branch 'lima' of github.com:ecadlabs/taquito into 2072-support-…
hui-an-yang Nov 16, 2022
b2f4a98
feat: support new encoding for ticket & ticket depreacted in lima wit…
hui-an-yang Nov 17, 2022
3f0723c
Merge branch 'lima' of github.com:ecadlabs/taquito into 2072-support-…
hui-an-yang Nov 17, 2022
501b4b2
Configure NPM Workspaces (#2088)
danielelisi Nov 17, 2022
2e9ceba
build(deps): bump loader-utils from 1.4.1 to 1.4.2
dependabot[bot] Nov 17, 2022
4070a28
fix: added ASSERT_SOME in ticketCode and fixed 2 integration tests in…
hui-an-yang Nov 17, 2022
d978b87
Merge branch 'lima' of github.com:ecadlabs/taquito into 2065-local-fo…
hui-an-yang Nov 17, 2022
64903a8
fixs merge conflicts
hui-an-yang Nov 17, 2022
6628b93
fix: fixs merge conflicts
hui-an-yang Nov 17, 2022
5b73497
fix: replaced ASSERT_SOME with its expansion in ticketCode
hui-an-yang Nov 18, 2022
dbc38dc
fix: resolving merge conflicts with lima
hui-an-yang Nov 18, 2022
9c71ca0
Merge branch '2072-support-new-encoding-for-ticket-in-lima' of github…
hui-an-yang Nov 18, 2022
f3761d5
test: added local-forgin integration tests for new operations
hui-an-yang Nov 18, 2022
c7123ce
feat: removed Jakarta conditions in on chain view related files
hui-an-yang Nov 19, 2022
7965eb0
Merge pull request #2129 from ecadlabs/dependabot/npm_and_yarn/loader…
roxaneletourneau Nov 21, 2022
cd93b5d
fix: resolved merge conflicts from master
hui-an-yang Nov 21, 2022
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 .github/workflows/deploy_website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16.13.1
node-version: 16
- run: npm ci
- run: npm run build
- run: npm run build
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
strategy:
fail-fast: false
matrix:
node:
- '16.13.1'
- '17.3.x'
node:
- '16'
- '18'
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
- run: npm ci
Expand All @@ -30,7 +30,7 @@ jobs:
- run: npm run build-docs
- run: npm run test -- --runInBand
- name: Codecov
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v3.1.1
with:
file: .coverage/*.json
env:
Expand All @@ -46,32 +46,32 @@ jobs:
- kathmandunet
- limanet
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16.13.1
node-version: 16
- run: npm ci
- run: npm run build
- name: Tailscale
uses: tailscale/github-action@v1
with:
authkey: ${{ secrets.TAILSCALE_AUTHKEY }}
version: 1.22.2
- run: cd integration-tests && npm run test:${{ matrix.protocol }} -- --maxWorkers=8
version: 1.32.2
- run: npm -w integration-tests run test:${{ matrix.protocol }} -- --maxWorkers=8

integration-tests-flextesa:
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16.13.1
node-version: 16
- run: docker run --rm --name my-sandbox --detach -p 20000:20000 -e block_time=1 oxheadalpha/flextesa:latest kathmandubox start
- run: npm ci
- run: npm run lerna -- bootstrap
- run: npm run build
- run: cd integration-tests && npm run test:originate-known-contracts && npm run test:kathmandunet-secret-key -- --testPathIgnorePatterns ledger-signer-failing-tests.spec.ts ledger-signer.spec.ts contract-estimation-tests.spec.ts rpc-get-protocol-constants.spec.ts
- run: npm -w integration-tests run test:originate-known-contracts && npm -w integration-tests run test:kathmandunet-secret-key -- --testPathIgnorePatterns ledger-signer-failing-tests.spec.ts ledger-signer.spec.ts contract-estimation-tests.spec.ts rpc-get-protocol-constants.spec.ts
env:
RUN_KATHMANDUNET_WITH_SECRET_KEY: true
SECRET_KEY: edsk3RFfvaFaxbHx8BMtEW1rKQcPtDML3LXjNqMNLCzC3wLC1bWbAt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mondaynet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: tailscale/github-action@v1
with:
authkey: ${{ secrets.TAILSCALE_AUTHKEY }}
version: 1.30.0
version: 1.32.2

- name: Configure SSH
run: |
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ website/*.bak
integration-tests/jest-stare
**/saplingOutputParams*
**/saplingSpendParams*
apps/**/node_modules
apps/**/node_modules
35 changes: 15 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,14 @@ Taquito currently supports the following versions of Node.js®:

| Version | Supported? |
| ---------------- | ---------- |
| v12 | ❌ |
| v14 | ❌ |
| v12 LTS | ❌ |
| v14 LTS | ❌ |
| v16.13.1 | ✅ |
| v16.13.2 | ❌ |
| v16 LTS/Gallium | ✅ |
| 17.3.x | ✅ |
| v17.5.x | ❌ |
| v18 LTS/Hydrogen | ✅ |

While other versions often work, the above are what we officially support. YMMV!

Expand Down Expand Up @@ -118,13 +120,7 @@ You would like to make a contribution to Taquito? Wonderful! Please read on.

Install/use a suitable version of **Node.js** (_as listed above_), for example:

`nvm use v17.3.0`

* Install `lerna` globally:

`npm install -g lerna`

*Taquito uses `lerna` internally to simplify the build configuration.*
nvm use lts/gallium

* Install `libudev-dev`, if developing on GNU/Linux:

Expand All @@ -134,13 +130,15 @@ Install/use a suitable version of **Node.js** (_as listed above_), for example:

### Setup and build Taquito

* Run `npm clean-install`
* Run `npm run rebuild`

That command invokes serially the following commands:

* Run `npm run clean`
* Run `npm clean-install` *# n.b. no `run`: `clean-install` is an npm __built-in__*
* Run `npm run build`
* `npm run clean`
* `npm clean-install` *# n.b. no `run`: `clean-install` is an npm __built-in__*
* `npm run bootstrap`
* `npm run build`

The `clean-install` (or just `ci`) command ensures a clean install of all depenencies, and respects `package-lock.json`, to ensure a deterministic and repeatable build (it is also some 2x to 10x faster than `npm install`). It will not adjust `package.json`: hooray!

Expand All @@ -156,9 +154,9 @@ See the top-level `package.json` "scripts" section. Some common targets are:

### Running Integration Tests

The Taquito integration tests are located in the `/integration-tests/` directory.
The Taquito integration tests are located in the `integration-tests/` directory.

To run the integration tests, `cd` into `/integration-tests/` and run `npm run test` (ensure you have completed the build steps as described earlier in this README file.). The integration test suite runs all tests against the current tezos protocol testnet, and typically also against the previous and next protocol testnets. See the `scripts` property in the `integration-tests/package.json` file for specific test targets.
To run the integration tests, `cd` into `integration-tests/` and run `npm run test` (ensure you have completed the build steps as described earlier in this README file.). The integration test suite runs all tests against the current tezos protocol testnet, and typically also against the previous and next protocol testnets. See the `scripts` property in the `integration-tests/package.json` file for specific test targets.

There are many integration tests, and as they interact with real testnets, they can be slow. Furthermore, occasionally tests fail due to extrinsic reasons related to public testnets.

Expand All @@ -176,13 +174,10 @@ Please use `npm run commit` for your last commit before you push, as this will a

The Tezos Taquito [website][4] is built using [Docusaurus][5].

To run the Taquito website in development mode locally, run the following commands:
To run the Taquito website in development mode locally, run the following commands from the repo's root folder:

```
cd website
npm install
npm start
```
* Run `npm clean-install`
* Run `npm -w @taquito/website start`

## Contributions / Reporting Issues

Expand Down
2 changes: 1 addition & 1 deletion apps/taquito-test-dapp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ A minimal end-to-end testing setup for developing Tezos DApps with Taquito and B
1. Clone the Taquito repository: `git clone [email protected]:ecadlabs/taquito.git`
2. Change your current working directory to the newly cloned repository directory, then change to `apps/taquito-test-dapp`.
3. Install all dependencies:
`npm install`
`npm clean-install`
4. Start development server:
`npm run dev`
5. Open http://localhost:3030 in your browser to see a sample application.
Expand Down
Loading