Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

chore: upgrade to capi beta40 #197

Merged
merged 10 commits into from
Jun 2, 2023
Merged

chore: upgrade to capi beta40 #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d861039
upgrade to capi beta40
peetzweg Jun 1, 2023
3e2fb0e
actually upgrading capi 🤦
peetzweg Jun 1, 2023
08860d9
adapt vite config as suggested by @kratico
peetzweg Jun 1, 2023
7be3730
fix: node shims
kratico Jun 1, 2023
dec332d
fix
ryanleecode Jun 1, 2023
69d01cd
removes unnecessary definitions
peetzweg Jun 2, 2023
bd14be3
define process env for browser, required in recent capi release.
peetzweg Jun 2, 2023
1b6940a
adds back in capi required env vars...
peetzweg Jun 2, 2023
13960f8
define process.env
peetzweg Jun 2, 2023
6434c53
adds capi workaround back in...
peetzweg Jun 2, 2023
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
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
"www"
],
"dependencies": {
"@capi/westend": "https://capi.dev/@v0.1.0-beta.38/9fccbde64e0e4b10/westend.tar",
"@capi/westend": "https://capi.dev/b33e3e53689c9ad6/westend.tar",
"@headlessui/react": "^1.7.11",
"@preact/signals": "^1.1.3",
"@talisman-connect/wallets": "^1.1.3",
"capi": "0.1.0-beta.38",
"capi": "0.1.0-beta.40",
"dotenv": "^16.0.3",
"preact": "^10.12.1",
"react-hook-form": "^7.43.3",
Expand Down Expand Up @@ -41,6 +41,6 @@
"start:docker": "sudo docker-compose up --build --abort-on-container-exit",
"start:docker:db": "docker-compose up --build --abort-on-container-exit dynamodb",
"clean:docker": "docker-compose down --rmi all",
"sync": "capi sync --package-json package.json"
"sync": "capi sync node --runtime-config package.json --server https://capi.dev"
}
}
177 changes: 80 additions & 97 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
</head>
<body>
<div id="app"></div>
<script>
// TODO remove once closed https://github.com/paritytech/capi/issues/1038
// temporary capi workaround
window.process = { env: {} };
peetzweg marked this conversation as resolved.
Show resolved Hide resolved
</script>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>
12 changes: 4 additions & 8 deletions www/src/components/wizards/multisig/Members.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ export function MultisigMembers() {
await multisig.accountId.run(),
)

const multisigInfo: AccountInfo = await westend.System.Account.value(
const multisigInfo = (await westend.System.Account.value(
multisig.accountId,
).run()
).run()) as AccountInfo
// `multisigInfo` is undefined for blank accounts
const multisigExists = !!multisigInfo
if (multisigExists) {
Expand Down Expand Up @@ -145,7 +145,7 @@ export function MultisigMembers() {
.map((events: { pure: unknown }[]) => events.map(({ pure }) => pure))
.access(0)

const stashBytes = await createStashCall.run()
const stashBytes = (await createStashCall.run()) as Uint8Array
const stashAddress = ss58.encode(
await westend.addressPrefix().run(),
stashBytes,
Expand Down Expand Up @@ -217,11 +217,7 @@ export function MultisigMembers() {
})}
{errors.members && <InputError msg={errors.members.message} />}
<SumTable unit="WND">
{multisigCreationFees.map((fee) => (
<SumTable.Row
{...fee}
/>
))}
{multisigCreationFees.map((fee) => <SumTable.Row {...fee} />)}
</SumTable>
<hr className="divide-x-0 divide-gray-300 mt-4 mb-2" />
<div className="flex justify-between">
Expand Down
2 changes: 1 addition & 1 deletion www/src/util/transaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ export async function estimateFee(address: string, value: bigint) {
})
.estimate()
.run()
return fee.partialFee
return fee
}
Loading