diff --git a/Makefile b/Makefile index 04085c9..355470a 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -e2e: build build - yarn workspace dapp-agoric-orca-contract test; yarn workspace dapp-agoric-orca-contract build; yarn workspace dapp-agoric-orca-contract e2e +e2e: test-orca build build + yarn workspace dapp-agoric-orca-contract e2e build: - yarn workspace dapp-agoric-orca-contract test; yarn workspace dapp-agoric-orca-contract build; + yarn workspace dapp-agoric-orca-contract build:deployer; redeploy: yarn workspace dapp-agoric-orca-contract deployc test-orca: diff --git a/contract/Makefile b/contract/Makefile index 37be559..06a2385 100644 --- a/contract/Makefile +++ b/contract/Makefile @@ -7,7 +7,7 @@ ATOM_DENOM=ibc/BA313C4A19DFBF943586C0387E6B11286F9E416B4DD27574E6909CABE0E342FA ATOM=000000$(ATOM_DENOM) # your deployer address made from make add-address -ADDR=agoric1mqvg26gpv6xzch2v0wpv569md3c2z4cdxq9clz +ADDR=agoric1jwuskhnxkjw50vnx3ak8qwmvy8f43sfdxnd438 PROVISION_POOL_ADDR=agoric1megzytg65cyrgzs6fvzxgrcqvwwl7ugpt62346 PROPOSAL=1 @@ -262,7 +262,7 @@ e2e: kubectl exec -i agoriclocal-genesis-0 -c validator -- bash -c "yarn add @agoric/orchestration@0.1.1-dev-9c9e5cf.0" kubectl exec -i agoriclocal-genesis-0 -c validator -- bash -c "yarn add @agoric/vow@0.1.1-dev-9c9e5cf.0" kubectl exec -i agoriclocal-genesis-0 -c validator -- bash -c "yarn add @agoric/async-flow@0.1.1-dev-9c9e5cf.0" - make copy-bn-js + # make copy-bn-js kubectl exec -i agoriclocal-genesis-0 -c validator -- bash -c "yarn build:deployer" kubectl exec -i agoriclocal-genesis-0 -c validator -- bash -c "yarn node scripts/deploy-contract.js --install src/orca.contract.js --eval src/orca.proposal.js" kubectl exec -i agoriclocal-genesis-0 -c validator -- bash -c "yarn node scripts/deploy-contract.js --install src/orca.contract.js --eval src/orca.proposal.js" diff --git a/contract/package.json b/contract/package.json index f176af3..f2ab37d 100644 --- a/contract/package.json +++ b/contract/package.json @@ -18,7 +18,8 @@ "deploy": "make dev-working", "test": "ava", "lint": "tsc && eslint '**/*.js'", - "lint:fix": "eslint --fix '**/*.js'" + "lint:fix": "eslint --fix '**/*.js'", + "e2e": "make e2e" }, "devDependencies": { "@agoric/deploy-script-support": "dev", diff --git a/ui/vite.config.ts b/ui/vite.config.ts index 627a319..ae12eca 100644 --- a/ui/vite.config.ts +++ b/ui/vite.config.ts @@ -1,7 +1,17 @@ import { defineConfig } from 'vite'; import react from '@vitejs/plugin-react'; - -// https://vitejs.dev/config/ export default defineConfig({ plugins: [react()], + resolve: { + alias: { + '@noble/hashes/sha256': '../node_modules/@noble/hashes/src/sha256.ts', + '@noble/hashes/sha3': '../node_modules/@noble/hashes/src/sha3.ts', + '@noble/hashes/ripemd160': + '../node_modules/@noble/hashes/src/ripemd160.ts', + '@noble/hashes/sha512': '../node_modules/@noble/hashes/src/sha512.ts', + '@noble/hashes/pbkdf2': '../node_modules/@noble/hashes/src/pbkdf2.ts', + '@noble/hashes/utils': '../node_modules/@noble/hashes/src/utils.ts', + '@noble/hashes/crypto': '../node_modules/@noble/hashes/src/crypto.ts', + }, + }, });