Skip to content
This repository has been archived by the owner on Sep 14, 2023. It is now read-only.

feat: codegened object and tuple factories #882

Merged
merged 6 commits into from
Apr 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 17 additions & 1 deletion codegen/TypeCodegen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,22 @@ is${variant.tag}(value) {
}
}
`)
.add($.object, (_codec) => (name, isTypes) => `
${
isTypes
? `export type ${name} = ${this.nativeVisitor.visit(_codec)}
export function ${name}<X>(fields: C.RunicArgs<X, ${name}>): C.ValueRune<${name}, C.RunicArgs.U<X>>`
: `export function ${name}(fields) {
return Rune.rec(fields)
}`
}`)
.add($.tuple, (_codec, ..._element) => (name, isTypes) =>
isTypes
? `export type ${name} = ${this.nativeVisitor.visit(_codec)}
export function ${name}<X>(...elements: C.RunicArgs<X, ${name}>): C.ValueRune<${name}, C.RunicArgs.U<X>>`
: `export function ${name}(...elements) {
return Rune.tuple(elements)
}`)
.fallback((codec) => (name, isTypes) =>
isTypes ? `export type ${name} = ${this.nativeVisitor.visit(codec)}` : ""
)
Expand Down Expand Up @@ -205,7 +221,7 @@ export const $${name.replace(/^./, (x) => x.toLowerCase())}${
${this.declVisitor.visit(codec)(name, isTypes)}
`).join("\n")
}

`,
)
}
Expand Down
4 changes: 2 additions & 2 deletions examples/sign/ed25519.eg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { Balances, createUsers, MultiAddress, System } from "@capi/westend-dev"
import { assert } from "asserts"
import { Rune } from "capi"
import { ExtrinsicSender } from "capi"
import { signature } from "capi/patterns/signature/polkadot.ts"
import * as ed from "https://esm.sh/@noble/ed25519@1.7.3"

Expand Down Expand Up @@ -53,7 +53,7 @@ await Balances
value: 12345n,
dest: billy.address,
})
.signed(signature({ sender: Rune.rec({ address, sign }) }))
.signed(signature({ sender: ExtrinsicSender({ address, sign }) }))
.sent()
.dbgStatus("Transfer:")
.finalizedEvents()
Expand Down
40 changes: 25 additions & 15 deletions examples/xcm/asset_teleportation.eg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import {
XcmV2Fungibility,
XcmV2Junction,
XcmV2Junctions,
XcmV2MultiAsset,
XcmV2MultiLocation,
XcmV2NetworkId,
XcmV2WeightLimit,
} from "@capi/rococo-dev"
Expand All @@ -39,22 +41,30 @@ console.log("Alice initial free:", aliceFreeInitial)

XcmPallet
.limitedTeleportAssets({
dest: VersionedMultiLocation.V2(Rune.rec({
parents: 0,
interior: XcmV2Junctions.X1(XcmV2Junction.Parachain(1000)),
})),
beneficiary: VersionedMultiLocation.V2(Rune.rec({
parents: 0,
interior: XcmV2Junctions.X1(XcmV2Junction.AccountId32({
id: alice.publicKey,
network: XcmV2NetworkId.Any(),
})),
})),
assets: VersionedMultiAssets.V2(Rune.array([Rune.rec({
id: XcmV2AssetId.Concrete(Rune.rec({
dest: VersionedMultiLocation.V2(
XcmV2MultiLocation({
parents: 0,
interior: XcmV2Junctions.Here(),
})),
interior: XcmV2Junctions.X1(XcmV2Junction.Parachain(1000)),
}),
),
beneficiary: VersionedMultiLocation.V2(
XcmV2MultiLocation({
parents: 0,
interior: XcmV2Junctions.X1(
XcmV2Junction.AccountId32({
id: alice.publicKey,
network: XcmV2NetworkId.Any(),
}),
),
}),
),
assets: VersionedMultiAssets.V2(Rune.array([XcmV2MultiAsset({
id: XcmV2AssetId.Concrete(
XcmV2MultiLocation({
parents: 0,
interior: XcmV2Junctions.Here(),
}),
),
fun: XcmV2Fungibility.Fungible(500_000_000_000_000n),
})])),
feeAssetItem: 0,
Expand Down
7 changes: 6 additions & 1 deletion fluent/ExtrinsicRune.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { blake2_256, hex } from "../crypto/mod.ts"
import * as $ from "../deps/scale.ts"
import { concat } from "../deps/std/bytes.ts"
import { $extrinsic, Signer } from "../frame_metadata/Extrinsic.ts"
import { Rune, ValueRune } from "../rune/mod.ts"
import { Rune, RunicArgs, ValueRune } from "../rune/mod.ts"
import { Chain, ChainRune } from "./ChainRune.ts"
import { CodecRune } from "./CodecRune.ts"
import { PatternRune } from "./PatternRune.ts"
Expand All @@ -12,6 +12,11 @@ export interface ExtrinsicSender<C extends Chain> {
address: Chain.Address<C>
sign: Signer<C["metadata"]>
}
export function ExtrinsicSender<X, C extends Chain>(
extrinsicSender: RunicArgs<X, ExtrinsicSender<C>>,
): Rune<ExtrinsicSender<C>, RunicArgs.U<X>> {
return Rune.rec(RunicArgs.resolve(extrinsicSender))
}

export interface SignatureData<C extends Chain> {
sender: ExtrinsicSender<C>
Expand Down