Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: #3580 txtar #3590

Merged
merged 4 commits into from
Jan 23, 2025
Merged

fix: #3580 txtar #3590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d179d0a
fix txtar
leohhhn Jan 23, 2025
376a178
fixup ci as welll
thehowl Jan 23, 2025
cceccde
revert back to tabsg
thehowl Jan 23, 2025
0ca4ced
fixup more spacing
thehowl Jan 23, 2025
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
3 changes: 3 additions & 0 deletions .github/workflows/gnoland.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ on:
# since there are integration suites that cover the gnovm / tm2
- gnovm/**
- tm2/**
# Changes to examples/ can create failures in gno.land, eg. txtars,
# see: https://github.com/gnolang/gno/pull/3590
- examples/**
thehowl marked this conversation as resolved.
Show resolved Hide resolved
workflow_dispatch:

jobs:
Expand Down
5 changes: 2 additions & 3 deletions gno.land/pkg/integration/testdata/issue_1786.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ import (
"std"

"gno.land/r/demo/wugnot"
pusers "gno.land/p/demo/users"
)

func ProxyWrap() {
Expand All @@ -64,7 +63,7 @@ func ProxyWrap() {
wugnot.Deposit() // `proxywugnot` has ugnot

// SEND WUGNOT: PROXY_WUGNOT -> USER
wugnot.Transfer(pusers.AddressOrName(std.GetOrigCaller()), ugnotSent)
wugnot.Transfer(std.GetOrigCaller(), ugnotSent)
}

func ProxyUnwrap(wugnotAmount uint64) {
Expand All @@ -73,7 +72,7 @@ func ProxyUnwrap(wugnotAmount uint64) {
}

// SEND WUGNOT: USER -> PROXY_WUGNOT
wugnot.TransferFrom(pusers.AddressOrName(std.GetOrigCaller()), pusers.AddressOrName(std.CurrentRealm().Addr()), wugnotAmount)
wugnot.TransferFrom(std.GetOrigCaller(), std.CurrentRealm().Addr(), wugnotAmount)

// UNWRAP IT
wugnot.Withdraw(wugnotAmount)
Expand Down
Loading