From 07e0b8024bd42e0b2a50036f20adc472ba626049 Mon Sep 17 00:00:00 2001 From: jovonni Date: Fri, 16 Aug 2024 13:40:03 -0400 Subject: [PATCH 1/4] fix(Makefile): fixing Makefile target to point to e2e --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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: From d2361e93776642d3dffc01a701e7dfae140b62aa Mon Sep 17 00:00:00 2001 From: jovonni Date: Fri, 16 Aug 2024 13:41:38 -0400 Subject: [PATCH 2/4] fix(Makefile): removed copy-bn-js action from makefile, no longer needed --- contract/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" From 9d195568d2fdae8e12a9c6eb24d3bfc8893058df Mon Sep 17 00:00:00 2001 From: jovonni Date: Fri, 16 Aug 2024 13:44:21 -0400 Subject: [PATCH 3/4] fix(package.json): added e2e script --- contract/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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", From ce101b92692ebef442a1185c08278bc9a294505e Mon Sep 17 00:00:00 2001 From: jovonni Date: Fri, 16 Aug 2024 13:45:31 -0400 Subject: [PATCH 4/4] fix(vite.config.ts): added resolutions for @noble/hashes dependencies --- ui/vite.config.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) 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', + }, + }, });