From 2915fb4484fe86bf93fbf6298eb5ce7ed14de3b2 Mon Sep 17 00:00:00 2001 From: ltzMaxwell Date: Fri, 21 Feb 2025 13:15:21 +0800 Subject: [PATCH] fixup --- gno.land/pkg/integration/testdata/grc20_registry.txtar | 4 ++-- gnovm/pkg/gnolang/realm.go | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gno.land/pkg/integration/testdata/grc20_registry.txtar b/gno.land/pkg/integration/testdata/grc20_registry.txtar index 4377e10a575..50067c745fb 100644 --- a/gno.land/pkg/integration/testdata/grc20_registry.txtar +++ b/gno.land/pkg/integration/testdata/grc20_registry.txtar @@ -10,8 +10,8 @@ gnokey maketx call -pkgpath gno.land/r/registry -func TransferByName -args 'foo2 stdout 'not found' # add foo20, and foo20wrapper -gnokey maketx addpkg -pkgdir $WORK/foo20 -pkgpath gno.land/r/foo20 -gas-fee 1000000ugnot -gas-wanted 10000000 -broadcast -chainid=tendermint_test test1 -gnokey maketx addpkg -pkgdir $WORK/foo20wrapper -pkgpath gno.land/r/foo20wrapper -gas-fee 1000000ugnot -gas-wanted 10000000 -broadcast -chainid=tendermint_test test1 +gnokey maketx addpkg -pkgdir $WORK/foo20 -pkgpath gno.land/r/foo20 -gas-fee 1000000ugnot -gas-wanted 11000000 -broadcast -chainid=tendermint_test test1 +gnokey maketx addpkg -pkgdir $WORK/foo20wrapper -pkgpath gno.land/r/foo20wrapper -gas-fee 1000000ugnot -gas-wanted 11000000 -broadcast -chainid=tendermint_test test1 # we call Transfer with foo20, after it's registered gnokey maketx call -pkgpath gno.land/r/registry -func TransferByName -args 'foo20' -args 'g123456789' -args '42' -gas-fee 1000000ugnot -gas-wanted 8000000 -broadcast -chainid=tendermint_test test1 diff --git a/gnovm/pkg/gnolang/realm.go b/gnovm/pkg/gnolang/realm.go index ac685c300d1..c9cf0997891 100644 --- a/gnovm/pkg/gnolang/realm.go +++ b/gnovm/pkg/gnolang/realm.go @@ -244,6 +244,7 @@ func checkCrossRealm2(rlm *Realm, store Store, tv *TypedValue, seenObjs []Object if debug { debug.Printf("checkCrossRealm2, tv: %v (type: %v) \n", tv, reflect.TypeOf(tv.V)) } + fillValueTV(store, tv) oo2 := tv.GetFirstObject2(store) if oo2 != nil { // if it is checking a pointer, and it @@ -701,7 +702,6 @@ func (rlm *Realm) processNewEscapedMarks(store Store) { // except for new-reals that get demoted // because ref-count isn't >= 2. for _, eo := range rlm.newEscaped { - //fmt.Println("eo: ", eo) if debug { if !eo.GetIsNewEscaped() { panic("new escaped mark not marked as new escaped") @@ -724,7 +724,6 @@ func (rlm *Realm) processNewEscapedMarks(store Store) { // add to escaped, and mark dirty previous owner. po := getOwner(store, eo) - //fmt.Println("po: ", po) if po == nil { // e.g. !eo.GetIsNewReal(), // should have no parent. @@ -743,7 +742,6 @@ func (rlm *Realm) processNewEscapedMarks(store Store) { panic("new escaped object has no object ID") } // escaped has no owner. - //fmt.Println("set owner to be nil") eo.SetOwner(nil) } }