balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'upgrade-taquito' into 'dev'

Browse Source 
Upgraded taquito and using carthage network

See merge request ligolang/ligo!488
This commit is contained in:
Jev Björsell 2020-03-08 04:08:49 +00:00
commit b7636e816f
10 changed files with 3145 additions and 1123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3564
tools/webide/packages/client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
tools/webide/packages/client/package.json
View File

@ -6,8 +6,8 @@
"@fortawesome/fontawesome-svg-core": "^1.2.25", "@fortawesome/fontawesome-svg-core": "^1.2.25",
"@fortawesome/free-solid-svg-icons": "^5.11.2", "@fortawesome/free-solid-svg-icons": "^5.11.2",
"@fortawesome/react-fontawesome": "^0.1.6", "@fortawesome/react-fontawesome": "^0.1.6",
"@taquito/taquito": "^5.1.0-beta.1", "@taquito/taquito": "^6.1.0-beta.0",
"@taquito/tezbridge-signer": "^5.1.0-beta.1", "@taquito/tezbridge-signer": "^6.1.0-beta.0",
"@types/jest": "24.0.18", "@types/jest": "24.0.18",
"@types/node": "12.7.12", "@types/node": "12.7.12",
"@types/react": "16.9.5", "@types/react": "16.9.5",

5
tools/webide/packages/client/src/components/output/deploy-output-pane.tsx
View File

@ -39,15 +39,14 @@ export const DeployOutputPane = () => {
<Output id="output"> <Output id="output">
{contract && ( {contract && (
<div> <div>
The contract was successfully deployed to the babylonnet test The contract was successfully deployed to the carthage test network.
network.
<br /> <br />
<br /> <br />
View your new contract using{' '} View your new contract using{' '}
<a <a
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
href={`https://better-call.dev/babylon/${contract}`} href={`https://better-call.dev/carthage/${contract}`}
> >
Better Call Dev Better Call Dev
</a> </a>

10
tools/webide/packages/client/src/redux/actions/deploy.ts
View File

@ -11,7 +11,7 @@ import { Command } from '../types';
import { CancellableAction } from './cancellable'; import { CancellableAction } from './cancellable';
Tezos.setProvider({ Tezos.setProvider({
rpc: 'https://api.tez.ie/rpc/babylonnet', rpc: 'https://api.tez.ie/rpc/carthagenet',
signer: new TezBridgeSigner() signer: new TezBridgeSigner()
}); });
@ -56,7 +56,9 @@ export class DeployAction extends CancellableAction {
return; return;
} }
dispatch({ ...new UpdateLoadingAction('Deploying to babylon network...') }); dispatch({
...new UpdateLoadingAction('Deploying to carthage network...')
});
return { return {
address: (await op.contract()).address, address: (await op.contract()).address,
storage: michelsonStorage storage: michelsonStorage
@ -64,7 +66,9 @@ export class DeployAction extends CancellableAction {
} }
async deployOnServerSide(dispatch: Dispatch, getState: () => AppState) { async deployOnServerSide(dispatch: Dispatch, getState: () => AppState) {
dispatch({ ...new UpdateLoadingAction('Deploying to babylon network...') }); dispatch({
...new UpdateLoadingAction('Deploying to carthage network...')
});
const { editor: editorState, deploy: deployState } = getState(); const { editor: editorState, deploy: deployState } = getState();

2
tools/webide/packages/e2e/test/deploy.spec.js
View File

@ -18,7 +18,7 @@ describe('Deploy contract', () => {
beforeEach(async () => await page.goto(API_HOST)); beforeEach(async () => await page.goto(API_HOST));
it('should deploy', async done => { it('should deploy', async done => {
expect(await deploy()).toContain('The contract was successfully deployed to the babylonnet test network.'); expect(await deploy()).toContain('The contract was successfully deployed to the carthage test network.');
done(); done();
}); });

566
tools/webide/packages/server/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
tools/webide/packages/server/package.json
View File

@ -31,7 +31,7 @@
"dependencies": { "dependencies": {
"@google-cloud/storage": "^4.0.0", "@google-cloud/storage": "^4.0.0",
"@hapi/joi": "^16.1.7", "@hapi/joi": "^16.1.7",
"@taquito/taquito": "^5.1.0-beta.1", "@taquito/taquito": "^6.1.0-beta.0",
"@types/node-fetch": "^2.5.4", "@types/node-fetch": "^2.5.4",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"escape-html": "^1.0.3", "escape-html": "^1.0.3",

2
tools/webide/packages/server/src/handlers/deploy.ts
View File

@ -13,7 +13,7 @@ interface DeployBody {
storage: string; storage: string;
} }
Tezos.setProvider({ rpc: 'https://api.tez.ie/rpc/babylonnet' }); Tezos.setProvider({ rpc: 'https://api.tez.ie/rpc/carthagenet' });
const validateRequest = (body: any): { value: DeployBody; error: any } => { const validateRequest = (body: any): { value: DeployBody; error: any } => {
return joi return joi

4
tools/webide/packages/server/src/services/key.ts
View File

@ -1,12 +1,12 @@
import fetch from 'node-fetch'; import fetch from 'node-fetch';
const URL = 'https://api.tez.ie/keys/babylonnet/'; const URL = 'https://api.tez.ie/keys/carthagenet/';
const AUTHORIZATION_HEADER = 'Bearer ligo-ide'; const AUTHORIZATION_HEADER = 'Bearer ligo-ide';
export async function fetchRandomPrivateKey(): Promise<string> { export async function fetchRandomPrivateKey(): Promise<string> {
const response = await fetch(URL, { const response = await fetch(URL, {
method: 'POST', method: 'POST',
headers: { 'Authorization': AUTHORIZATION_HEADER } headers: { Authorization: AUTHORIZATION_HEADER }
}); });
return response.text(); return response.text();

87
tools/webide/yarn.lock
View File

@ -1343,44 +1343,37 @@
"@svgr/plugin-svgo" "^4.3.1" "@svgr/plugin-svgo" "^4.3.1"
loader-utils "^1.2.3" loader-utils "^1.2.3"
"@taquito/http-utils@^5.1.0-beta.1": "@taquito/http-utils@^6.1.0-beta.0":
version "5.1.0-beta.1" version "6.1.0-beta.0"
resolved "https://registry.yarnpkg.com/@taquito/http-utils/-/http-utils-5.1.0-beta.1.tgz#283b89eeae13c78c54657bccef15f1b3242326a0" resolved "https://registry.yarnpkg.com/@taquito/http-utils/-/http-utils-6.1.0-beta.0.tgz#9d7eb1e41962e3d6aefbb89840e496753407fef6"
integrity sha512-/UvE61t9j5CR94vy8Dtb+/6oJERE0P9LmHBbkESKUxNC9SAlETCEntSNiHha+vuwgCoOj0pXsHkBtAZkWAaEeg== integrity sha512-qQg/siOh3Vrj4lYbRGuHXKLgd8Or/5upJ2LgP8Y+i6X0n/uBsE6lnwGD8JCHWt644tvhEuf53j7DJI13blLaKg==
dependencies: dependencies:
xhr2-cookies "^1.1.0" xhr2-cookies "^1.1.0"
"@taquito/indexer@^5.1.0-beta.1": "@taquito/michelson-encoder@^6.1.0-beta.0":
version "5.1.0-beta.1" version "6.1.0-beta.0"
resolved "https://registry.yarnpkg.com/@taquito/indexer/-/indexer-5.1.0-beta.1.tgz#62595d2b4758ad541dc54906896131ddf8ee9c59" resolved "https://registry.yarnpkg.com/@taquito/michelson-encoder/-/michelson-encoder-6.1.0-beta.0.tgz#8f8d143a69814723550776dfe9c024a2196cbb57"
integrity sha512-NDWK7XQGgUP0YkEWhJklF9uhKHZDWtRaAPSsSfxSDYiQzol4iAUn7ru7+TQPNqfsXq0NjpvzGHBysQ8HTeb0Gg== integrity sha512-02CHk0Ag7pBLCDIJnAKXPp4Owcl3qLkIKB8pQa5uOT1fxefaT2EadMnxQEpbXPiFp4tcBRJq16Bd4JtogO+/CQ==
dependencies: dependencies:
"@taquito/http-utils" "^5.1.0-beta.1" "@taquito/utils" "^6.1.0-beta.0"
bignumber.js "^9.0.0" bignumber.js "^9.0.0"
fast-json-stable-stringify "^2.1.0"
"@taquito/michelson-encoder@^5.1.0-beta.1": "@taquito/rpc@^6.1.0-beta.0":
version "5.1.0-beta.1" version "6.1.0-beta.0"
resolved "https://registry.yarnpkg.com/@taquito/michelson-encoder/-/michelson-encoder-5.1.0-beta.1.tgz#38620820d377f908ea6fc6d4136fa08247702656" resolved "https://registry.yarnpkg.com/@taquito/rpc/-/rpc-6.1.0-beta.0.tgz#e3247607a578f778f5168a356567dc86c0a3b809"
integrity sha512-kBpHDfsvsxzsIXbM4dOZs0nklY7CjCunSJ2sABUdBu4SmXDM06F5NDzg0166q7VBhFZgOhq/NNM9g7hcgn5qJg== integrity sha512-umpiFpasPIVNuRUkrlOi2Z3tOHQ1p6MU0AI3xRUdoUf2Hhn7tWN1CsFzQzm87LekVz1kW7Dogkwc5hD4gsIPZg==
dependencies: dependencies:
"@taquito/utils" "^5.1.0-beta.1" "@taquito/http-utils" "^6.1.0-beta.0"
bignumber.js "^9.0.0"
"@taquito/rpc@^5.1.0-beta.1":
version "5.1.0-beta.1"
resolved "https://registry.yarnpkg.com/@taquito/rpc/-/rpc-5.1.0-beta.1.tgz#6e6aa3ca57a9e5d5811f7bb16ce3a1e9fd8a87e3"
integrity sha512-ZbqpJVZw1ljAS92Xs9t/1BAgPEMzOv3qk7ubWU7AGZOKDLREjOqI4EAZQfq4gL9hP2KIgqgLubTvPF3GsmTADg==
dependencies:
"@taquito/http-utils" "^5.1.0-beta.1"
bignumber.js "^9.0.0" bignumber.js "^9.0.0"
lodash "^4.17.15" lodash "^4.17.15"
"@taquito/signer@^5.1.0-beta.1": "@taquito/signer@^6.1.0-beta.0":
version "5.1.0-beta.1" version "6.1.0-beta.0"
resolved "https://registry.yarnpkg.com/@taquito/signer/-/signer-5.1.0-beta.1.tgz#b5aadd782df0cc7330501c01f5d4ffd5c537ebd7" resolved "https://registry.yarnpkg.com/@taquito/signer/-/signer-6.1.0-beta.0.tgz#05d3994347de460f0f1722a99ac0bdc95528d3cf"
integrity sha512-N7ZteHnXv2kS+CCxbmQ+Br21aIf8cwP/WGAjwOh0uMUcXg2qsmKE/0XnRYnLhftVaJolNo85oBckYnA6U48uCg== integrity sha512-/N5X+e029r5xJ8/LCdRqzBMh3or0n3BL2m15CRsZdhH21n8I1SHRh7vqXG/jDHLqB7i47lWW6rb5V2Pql2q0og==
dependencies: dependencies:
"@taquito/utils" "^5.1.0-beta.1" "@taquito/utils" "^6.1.0-beta.0"
bignumber.js "^9.0.0" bignumber.js "^9.0.0"
bip39 "^3.0.2" bip39 "^3.0.2"
elliptic "^6.5.1" elliptic "^6.5.1"
@ -1388,31 +1381,30 @@
pbkdf2 "^3.0.17" pbkdf2 "^3.0.17"
typedarray-to-buffer "^3.1.5" typedarray-to-buffer "^3.1.5"
"@taquito/taquito@^5.1.0-beta.1": "@taquito/taquito@^6.1.0-beta.0":
version "5.1.0-beta.1" version "6.1.0-beta.0"
resolved "https://registry.yarnpkg.com/@taquito/taquito/-/taquito-5.1.0-beta.1.tgz#32ab600a3a08214463e961085205e25c87fea122" resolved "https://registry.yarnpkg.com/@taquito/taquito/-/taquito-6.1.0-beta.0.tgz#f7497979170019f888b32f290012ce1005cd0c7a"
integrity sha512-hLV7vZiraMlx+Not3dRdELNSwxd0ZLndRGGDBh+uexpo1aH7xX5IQbIgQBREaR1F7fqHswxBBCKcBbrGhP5EWQ== integrity sha512-gln8L2w4jYPj5PY2sCld5J8b5i+so7qUnGbVtoWIvqURfLSxIzLhhGDCMoSqJaJnjWWDQcsE88398TbCLjZJxQ==
dependencies: dependencies:
"@taquito/indexer" "^5.1.0-beta.1" "@taquito/michelson-encoder" "^6.1.0-beta.0"
"@taquito/michelson-encoder" "^5.1.0-beta.1" "@taquito/rpc" "^6.1.0-beta.0"
"@taquito/rpc" "^5.1.0-beta.1" "@taquito/signer" "^6.1.0-beta.0"
"@taquito/signer" "^5.1.0-beta.1" "@taquito/utils" "^6.1.0-beta.0"
"@taquito/utils" "^5.1.0-beta.1"
bignumber.js "^9.0.0" bignumber.js "^9.0.0"
rxjs "^6.5.3" rxjs "^6.5.3"
"@taquito/tezbridge-signer@^5.1.0-beta.1": "@taquito/tezbridge-signer@^6.1.0-beta.0":
version "5.1.0-beta.1" version "6.1.0-beta.0"
resolved "https://registry.yarnpkg.com/@taquito/tezbridge-signer/-/tezbridge-signer-5.1.0-beta.1.tgz#8e88cc3c47a802dade294336d9afa53f8d53bc21" resolved "https://registry.yarnpkg.com/@taquito/tezbridge-signer/-/tezbridge-signer-6.1.0-beta.0.tgz#adaad917091e946d6284ce4fd74f314b9c52c8d3"
integrity sha512-Q/bjRjMgYjIcrdW4h2JUAajYuck0wxxb27k7ElINVEtV3qdP3g+0Ubls1YXPMnb5MG4NlDJ4H3xGWiy1dnfrdQ== integrity sha512-diVlbdJTqrw23xZ86E3NqfKDLrJSdg6sNQ1tZkQUvinEwYUGCUTTu7+kDM9vOM/loEH0vfyUUBE+cf27uJ7j1w==
dependencies: dependencies:
"@taquito/utils" "^5.1.0-beta.1" "@taquito/utils" "^6.1.0-beta.0"
typedarray-to-buffer "^3.1.5" typedarray-to-buffer "^3.1.5"
"@taquito/utils@^5.1.0-beta.1": "@taquito/utils@^6.1.0-beta.0":
version "5.1.0-beta.1" version "6.1.0-beta.0"
resolved "https://registry.yarnpkg.com/@taquito/utils/-/utils-5.1.0-beta.1.tgz#6ab4f344abd0e3e7d40828182f461cccb9b94b24" resolved "https://registry.yarnpkg.com/@taquito/utils/-/utils-6.1.0-beta.0.tgz#11e8887379738cae10d7a696c7b6cc0cec9eeab0"
integrity sha512-3Qk+RLYKNYUW3jj1HYH0KymQQjWXdMcsp08eG+Cc0LKDvwzC5ewd4tfeUwq/jfHsd1fQ9LsG5FJ3NZg93W0H6w== integrity sha512-RaqVw1F7tR9RV71wuDs2Qn1DSH5qwcVVQc/JZMwQS92YUGyFGM5Sp3d+TivBaMhcjgESJNPUNijKj2xNCLd1aQ==
dependencies: dependencies:
blakejs "^1.1.0" blakejs "^1.1.0"
bs58check "^2.1.2" bs58check "^2.1.2"
@ -4900,6 +4892,11 @@ fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
fast-json-stable-stringify@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
fast-levenshtein@~2.0.4: fast-levenshtein@~2.0.4:
version "2.0.6" version "2.0.6"
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"