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

Jump to bottom

[v0.31] Change account linking pragma to run-time configuration of execution #2383

Merged
merged 3 commits into from
Mar 13, 2023
Merged

[v0.31] Change account linking pragma to run-time configuration of execution #2383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a29411b
change account linking pragma to run-time configuration of execution
turbolent Mar 10, 2023
703db0c
allow account linking in script
turbolent Mar 10, 2023
56058bf
only take account linking pragma in account if it appears as the firs…
turbolent Mar 13, 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
349 changes: 344 additions & 5 deletions runtime/account_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1546,7 +1546,7 @@ func TestRuntimePublicKey(t *testing.T) {
publicKey: "0102".decodeHex(),
signatureAlgorithm: SignatureAlgorithm.ECDSA_P256
)

var publickeyRef = &publicKey.publicKey as &[UInt8]
publickeyRef[0] = 3

Expand Down Expand Up @@ -1706,7 +1706,7 @@ func TestAuthAccountContracts(t *testing.T) {

nextTransactionLocation := newTransactionLocationGenerator()

// Deploy contract interface
// Deploy contract interface
err := rt.ExecuteTransaction(
Script{
Source: DeploymentTransaction("HelloInterface", []byte(`
Expand Down Expand Up @@ -1807,7 +1807,7 @@ func TestAuthAccountContracts(t *testing.T) {

nextTransactionLocation := newTransactionLocationGenerator()

// Deploy contract interface
// Deploy contract interface
err := rt.ExecuteTransaction(
Script{
Source: DeploymentTransaction("HelloInterface", []byte(`
Expand Down Expand Up @@ -2540,7 +2540,7 @@ func TestRuntimeAccountLink(t *testing.T) {
setupTransaction := []byte(`
transaction {
prepare(acct: AuthAccount) {
acct.linkAccount(/public/foo)
acct.linkAccount(/private/foo)
}
}
`)
Expand All @@ -2556,7 +2556,8 @@ func TestRuntimeAccountLink(t *testing.T) {
)
require.Error(t, err)

assert.ErrorContains(t, err, "value of type `AuthAccount` has no member `linkAccount`")
var accountLinkingForbiddenErr interpreter.AccountLinkingForbiddenError
assert.ErrorAs(t, err, &accountLinkingForbiddenErr)
})

t.Run("publish and claim", func(t *testing.T) {
Expand Down Expand Up @@ -2687,4 +2688,342 @@ func TestRuntimeAccountLink(t *testing.T) {
logs,
)
})

t.Run("enabled, contract, missing pragma", func(t *testing.T) {

t.Parallel()

runtime := NewInterpreterRuntime(Config{
AtreeValidationEnabled: true,
AccountLinkingEnabled: true,
})

address := common.MustBytesToAddress([]byte{0x1})

accountCodes := map[Location][]byte{}
var logs []string
var events []cadence.Event

signerAccount := address

runtimeInterface := &testRuntimeInterface{
getCode: func(location Location) (bytes []byte, err error) {
return accountCodes[location], nil
},
storage: newTestLedger(nil, nil),
getSigningAccounts: func() ([]Address, error) {
return []Address{signerAccount}, nil
},
resolveLocation: singleIdentifierLocationResolver(t),
getAccountContractCode: func(address Address, name string) (code []byte, err error) {
location := common.AddressLocation{
Address: address,
Name: name,
}
return accountCodes[location], nil
},
updateAccountContractCode: func(address Address, name string, code []byte) (err error) {
location := common.AddressLocation{
Address: address,
Name: name,
}
accountCodes[location] = code
return nil
},
log: func(message string) {
logs = append(logs, message)
},
emitEvent: func(event cadence.Event) error {
events = append(events, event)
return nil
},
}

nextTransactionLocation := newTransactionLocationGenerator()

// Deploy contract
err := runtime.ExecuteTransaction(
Script{
Source: DeploymentTransaction(
"AccountLinker",
[]byte(`
// should have no influence
#allowAccountLinking

pub contract AccountLinker {

pub fun link(_ account: AuthAccount) {
account.linkAccount(/private/foo)
}
}
`,
),
),
},
Context{
Interface: runtimeInterface,
Location: nextTransactionLocation(),
},
)
require.NoError(t, err)

// Set up account

setupTransaction := []byte(`
import AccountLinker from 0x1

transaction {
prepare(signer: AuthAccount) {
AccountLinker.link(signer)
}
}
`)

err = runtime.ExecuteTransaction(
Script{
Source: setupTransaction,
},
Context{
Interface: runtimeInterface,
Location: nextTransactionLocation(),
},
)
require.Error(t, err)

var accountLinkingForbiddenErr interpreter.AccountLinkingForbiddenError
assert.ErrorAs(t, err, &accountLinkingForbiddenErr)
})

t.Run("enabled, contract, pragma in tx", func(t *testing.T) {

t.Parallel()

runtime := NewInterpreterRuntime(Config{
AtreeValidationEnabled: true,
AccountLinkingEnabled: true,
})

address := common.MustBytesToAddress([]byte{0x1})

accountCodes := map[Location][]byte{}
var logs []string
var events []cadence.Event

signerAccount := address

runtimeInterface := &testRuntimeInterface{
getCode: func(location Location) (bytes []byte, err error) {
return accountCodes[location], nil
},
storage: newTestLedger(nil, nil),
getSigningAccounts: func() ([]Address, error) {
return []Address{signerAccount}, nil
},
resolveLocation: singleIdentifierLocationResolver(t),
getAccountContractCode: func(address Address, name string) (code []byte, err error) {
location := common.AddressLocation{
Address: address,
Name: name,
}
return accountCodes[location], nil
},
updateAccountContractCode: func(address Address, name string, code []byte) (err error) {
location := common.AddressLocation{
Address: address,
Name: name,
}
accountCodes[location] = code
return nil
},
log: func(message string) {
logs = append(logs, message)
},
emitEvent: func(event cadence.Event) error {
events = append(events, event)
return nil
},
}

nextTransactionLocation := newTransactionLocationGenerator()

// Deploy contract
err := runtime.ExecuteTransaction(
Script{
Source: DeploymentTransaction(
"AccountLinker",
[]byte(`
pub contract AccountLinker {

pub fun link(_ account: AuthAccount) {
account.linkAccount(/private/foo)
}
}
`,
),
),
},
Context{
Interface: runtimeInterface,
Location: nextTransactionLocation(),
},
)
require.NoError(t, err)

// Set up account

setupTransaction := []byte(`
#allowAccountLinking

import AccountLinker from 0x1

transaction {
prepare(signer: AuthAccount) {
AccountLinker.link(signer)
}
}
`)

events = nil

err = runtime.ExecuteTransaction(
Script{
Source: setupTransaction,
},
Context{
Interface: runtimeInterface,
Location: nextTransactionLocation(),
},
)
require.NoError(t, err)

require.Len(t, events, 1)

require.Equal(t,
string(stdlib.AccountLinkedEventType.ID()),
events[0].EventType.ID(),
)
require.Equal(t,
[]cadence.Value{
cadence.NewAddress(common.MustBytesToAddress([]byte{0x1})),
cadence.NewPath("private", "foo"),
},
events[0].Fields,
)
})

t.Run("enabled, contract, pragma in script", func(t *testing.T) {

t.Parallel()

runtime := NewInterpreterRuntime(Config{
AtreeValidationEnabled: true,
AccountLinkingEnabled: true,
})

address := common.MustBytesToAddress([]byte{0x1})

accountCodes := map[Location][]byte{}
var logs []string
var events []cadence.Event

signerAccount := address

runtimeInterface := &testRuntimeInterface{
getCode: func(location Location) (bytes []byte, err error) {
return accountCodes[location], nil
},
storage: newTestLedger(nil, nil),
getSigningAccounts: func() ([]Address, error) {
return []Address{signerAccount}, nil
},
resolveLocation: singleIdentifierLocationResolver(t),
getAccountContractCode: func(address Address, name string) (code []byte, err error) {
location := common.AddressLocation{
Address: address,
Name: name,
}
return accountCodes[location], nil
},
updateAccountContractCode: func(address Address, name string, code []byte) (err error) {
location := common.AddressLocation{
Address: address,
Name: name,
}
accountCodes[location] = code
return nil
},
log: func(message string) {
logs = append(logs, message)
},
emitEvent: func(event cadence.Event) error {
events = append(events, event)
return nil
},
}

nextTransactionLocation := newTransactionLocationGenerator()

// Deploy contract
err := runtime.ExecuteTransaction(
Script{
Source: DeploymentTransaction(
"AccountLinker",
[]byte(`
pub contract AccountLinker {

pub fun link(_ account: AuthAccount) {
account.linkAccount(/private/foo)
}
}
`,
),
),
},
Context{
Interface: runtimeInterface,
Location: nextTransactionLocation(),
},
)
require.NoError(t, err)

// Set up account

setupTransaction := []byte(`
#allowAccountLinking

import AccountLinker from 0x1

pub fun main() {
AccountLinker.link(getAuthAccount(0x1))
}
`)

events = nil

_, err = runtime.ExecuteScript(
Script{
Source: setupTransaction,
},
Context{
Interface: runtimeInterface,
Location: common.ScriptLocation{},
},
)
require.NoError(t, err)

require.Len(t, events, 1)

require.Equal(t,
string(stdlib.AccountLinkedEventType.ID()),
events[0].EventType.ID(),
)
require.Equal(t,
[]cadence.Value{
cadence.NewAddress(common.MustBytesToAddress([]byte{0x1})),
cadence.NewPath("private", "foo"),
},
events[0].Fields,
)
})

}
2 changes: 2 additions & 0 deletions runtime/interpreter/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ type Config struct {
AtreeStorageValidationEnabled bool
// AtreeValueValidationEnabled determines if the validation of atree values is enabled
AtreeValueValidationEnabled bool
// AccountLinkingAllowed determines if the account linking function is allowed to be used
AccountLinkingAllowed bool
// OnAccountLinked is triggered when an account is linked by the program
OnAccountLinked OnAccountLinkedFunc
}
Loading