Skip to content

Commit

Permalink
Merge pull request #272 from radixdlt/expiration-time
Browse files Browse the repository at this point in the history 
Expiration-time
  • Loading branch information
@xstelea
xstelea authored Nov 4, 2024
2 parents de91cb3 + a14648b commit d2890c0
Show file tree
Hide file tree
Showing 3 changed files with 160 additions and 157 deletions.
312 changes: 158 additions & 154 deletions packages/dapp-toolkit/.releaserc
View file
Original file line number Diff line number Diff line change
@@ -1,186 +1,190 @@
{
"branches": [
"main",
"next",
"branches": [
"main",
"next",
{
"name": "develop",
"channel": "dev",
"prerelease": "dev"
},
{
"name": "release/([a-z0-9-.]+)",
"channel": "${name.replace(/^release\\//g, \"\")}",
"prerelease": "${name.replace(/^release\\//g, \"\")}"
}
],
"plugins": [
[
"@semantic-release/commit-analyzer",
{
"name": "develop",
"channel": "dev",
"prerelease": "dev"
},
{
"name": "release/([a-z0-9-.]+)",
"channel": "${name.replace(/^release\\//g, \"\")}",
"prerelease": "${name.replace(/^release\\//g, \"\")}"
"preset": "conventionalcommits",
"releaseRules": [
{
"type": "refactor",
"release": "patch"
},
{
"type": "major",
"release": "major"
},
{
"type": "docs",
"scope": "README",
"release": "patch"
},
{
"type": "test",
"release": false
},
{
"type": "style",
"release": "patch"
},
{
"type": "perf",
"release": "patch"
},
{
"type": "ci",
"release": false
},
{
"type": "build",
"release": false
},
{
"type": "chore",
"release": "patch"
},
{
"type": "code",
"release": "patch"
},
{
"type": "no-release",
"release": false
}
],
"parserOpts": {
"noteKeywords": [
"BREAKING CHANGE",
"BREAKING CHANGES"
]
}
}
],
"plugins": [
[
"@semantic-release/commit-analyzer",
{
"preset": "conventionalcommits",
"releaseRules": [
[
"@semantic-release/release-notes-generator",
{
"preset": "conventionalcommits",
"parserOpts": {
"noteKeywords": [
"BREAKING CHANGE",
"BREAKING CHANGES"
]
},
"writerOpts": {
"commitsSort": [
"subject",
"scope"
]
},
"presetConfig": {
"types": [
{
"type": "refactor",
"release": "patch"
"type": "feat",
"section": ":sparkles: Features",
"hidden": false
},
{
"type": "fix",
"section": ":bug: Fixes",
"hidden": false
},
{
"type": "major",
"release": "major"
},
{
"type": "docs",
"scope": "README",
"release": "patch"
"section": ":memo: Documentation",
"hidden": false
},
{
"type": "test",
"release": false
"type": "style",
"section": ":barber: Code-style",
"hidden": false
},
{
"type": "style",
"release": "patch"
"type": "refactor",
"section": ":zap: Refactor",
"hidden": false
},
{
"type": "perf",
"release": "patch"
"section": ":fast_forward: Performance",
"hidden": false
},
{
"type": "ci",
"release": false
"type": "test",
"section": ":white_check_mark: Tests",
"hidden": false
},
{
"type": "build",
"release": false
"type": "ci",
"section": ":repeat: CI",
"hidden": false
},
{
"type": "chore",
"release": "patch"
"section": ":repeat: Chore",
"hidden": false
},
{
"type": "no-release",
"release": false
}
],
"parserOpts": {
"noteKeywords": [
"BREAKING CHANGE",
"BREAKING CHANGES"
]
}
}
],
[
"@semantic-release/release-notes-generator",
{
"preset": "conventionalcommits",
"parserOpts": {
"noteKeywords": [
"BREAKING CHANGE",
"BREAKING CHANGES"
]
},
"writerOpts": {
"commitsSort": [
"subject",
"scope"
]
},
"presetConfig": {
"types": [
{
"type": "feat",
"section": ":sparkles: Features",
"hidden": false
},
{
"type": "fix",
"section": ":bug: Fixes",
"hidden": false
},
{
"type": "major",
"release": "major"
},
{
"type": "docs",
"section": ":memo: Documentation",
"hidden": false
},
{
"type": "style",
"section": ":barber: Code-style",
"hidden": false
},
{
"type": "refactor",
"section": ":zap: Refactor",
"hidden": false
},
{
"type": "perf",
"section": ":fast_forward: Performance",
"hidden": false
},
{
"type": "test",
"section": ":white_check_mark: Tests",
"hidden": false
},
{
"type": "ci",
"section": ":repeat: CI",
"hidden": false
},
{
"type": "chore",
"section": ":repeat: Chore",
"hidden": false
},
{
"type": "build",
"section": ":wrench: Build",
"hidden": false
}
]
}
}
],
[
"semantic-release-replace-plugin",
{
"replacements": [
{
"files": [
"src/version.ts"
],
"from": "export const __VERSION__ = '2.0.0'",
"to": "export const __VERSION__ = '${nextRelease.version}'",
"countMatches": true
"type": "build",
"section": ":wrench: Build",
"hidden": false
}
]
}
],
[
"@semantic-release/exec",
{
"prepareCmd": "rm -rf dist && npm run build"
}
],
"@semantic-release/npm",
"@semantic-release/github",
[
"@saithodev/semantic-release-backmerge",
{
"backmergeBranches": [
{
"from": "main",
"to": "develop"
}
],
"backmergeStrategy": "merge",
"clearWorkspace": true,
"fastForwardMode": "ff"
}
]
}
],
[
"semantic-release-replace-plugin",
{
"replacements": [
{
"files": [
"src/version.ts"
],
"from": "export const __VERSION__ = '2.0.0'",
"to": "export const __VERSION__ = '${nextRelease.version}'",
"countMatches": true
}
]
}
],
[
"@semantic-release/exec",
{
"prepareCmd": "rm -rf dist && npm run build"
}
],
"@semantic-release/npm",
"@semantic-release/github",
[
"@saithodev/semantic-release-backmerge",
{
"backmergeBranches": [
{
"from": "main",
"to": "develop"
}
],
"backmergeStrategy": "merge",
"clearWorkspace": true,
"fastForwardMode": "ff"
}
]
}
]
}
3 changes: 1 addition & 2 deletions ...es/dapp-toolkit/src/modules/wallet-request/pre-authorization-request/subintent-builder.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export const SubintentRequestBuilder = () => {
*/
const manifest = (value: string) => {
state.transactionManifest = value
return api
return { setExpiration }
}

/**
Expand All @@ -97,7 +97,6 @@ export const SubintentRequestBuilder = () => {
}

const api = {
setExpiration,
addBlobs,
message,
toRequestItem,
Expand Down
2 changes: 1 addition & 1 deletion packages/dapp-toolkit/src/schemas/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ export const SubintentRequestItem = object({
transactionManifest: string(),
blobs: optional(array(string())),
message: optional(string()),
expiration: optional(union([ExpireAtTime, ExpireAfterSignature])),
expiration: union([ExpireAtTime, ExpireAfterSignature]),
})

export type SubintentResponseItem = InferOutput<typeof SubintentResponseItem>
Expand Down

0 comments on commit d2890c0

Please sign in to comment.