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

simulated增加context支持 #79

Merged
merged 13 commits into from
Oct 17, 2022
Merged

simulated增加context支持 #79

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ff814a9
新增context支持
web3creator Oct 9, 2022
cf46610
新增context支持
web3creator Oct 9, 2022
cc33632
新增context指出
web3creator Oct 10, 2022
26def50
新增context指出
web3creator Oct 10, 2022
c9d2ab3
新增context指出
web3creator Oct 10, 2022
87dc4a7
修复指针bug
web3creator Oct 13, 2022
582a357
修复lint
web3creator Oct 13, 2022
17791b9
修复一些问题
web3creator Oct 13, 2022
d27f996
修复一些问题
web3creator Oct 13, 2022
f6588fb
修复一些问题
web3creator Oct 14, 2022
038286c
修复一些特性
web3creator Oct 14, 2022
175d280
修复一些特性
web3creator Oct 14, 2022
91988d7
一些优化
web3creator Oct 17, 2022
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
110 changes: 58 additions & 52 deletions examples/erc20/contract/erc20.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,16 @@ type ConstructorReq struct {
TotalSupply *big.Int
}

func Constructor(req *ConstructorReq) error {
emptyMap, err := adt.MakeEmptyMap(adt.AdtStore(context.Background()), adt.BalanceTableBitwidth)
func Constructor(ctx context.Context, req *ConstructorReq) error {
emptyMap, err := adt.MakeEmptyMap(adt.AdtStore(ctx), adt.BalanceTableBitwidth)
if err != nil {
return err
}
emptyRoot, err := emptyMap.Root()
if err != nil {
return err
}
caller, err := sdk.Caller()
caller, err := sdk.Caller(ctx)
if err != nil {
return err
}
Expand All @@ -114,8 +114,8 @@ func Constructor(req *ConstructorReq) error {
Allowed: emptyRoot,
}

logger.Logf("construct token %s issue %s token to %s", req.Name, req.TotalSupply.String(), actorToString(caller))
_ = sdk.Constructor(state)
logger.Logf(ctx, "construct token %s issue %s token to %s", req.Name, req.TotalSupply.String(), actorToString(caller))
_ = sdk.Constructor(ctx, state)
return nil
}

Expand All @@ -125,13 +125,13 @@ type FakeSetBalance struct {
}

// FakeSetBalance NOTICE **beacause unable to set init balance in constructor, so just add this function for test contract, and must be remove after fvm support get really caller**
func (t *Erc20Token) FakeSetBalance(req *FakeSetBalance) error {
addrId, err := sdk.ResolveAddress(req.Addr)
func (t *Erc20Token) FakeSetBalance(ctx context.Context, req *FakeSetBalance) error {
addrId, err := sdk.ResolveAddress(ctx, req.Addr)
if err != nil {
return err
}

balanceMap, err := adt.AsMap(adt.AdtStore(context.Background()), t.Balances, adt.BalanceTableBitwidth)
balanceMap, err := adt.AsMap(adt.AdtStore(ctx), t.Balances, adt.BalanceTableBitwidth)
if err != nil {
return err
}
Expand All @@ -143,7 +143,7 @@ func (t *Erc20Token) FakeSetBalance(req *FakeSetBalance) error {
if err != nil {
return err
}
_ = sdk.SaveState(t)
_ = sdk.SaveState(ctx, t)
return nil
}

Expand All @@ -167,19 +167,21 @@ func (t *Erc20Token) GetTotalSupply() *big.Int {
return t.TotalSupply
}

/*GetBalanceOf sender by ID.
/*
GetBalanceOf sender by ID.

* `args[0]` - the ID of user.*/
func (t *Erc20Token) GetBalanceOf(addr *address.Address) (*big.Int, error) {
senderId, err := sdk.ResolveAddress(*addr)
* `args[0]` - the ID of user.
*/
func (t *Erc20Token) GetBalanceOf(ctx context.Context, addr *address.Address) (*big.Int, error) {
senderId, err := sdk.ResolveAddress(ctx, *addr)
if err != nil {
return nil, err
}
return t.getBalanceOf(senderId)
return t.getBalanceOf(ctx, senderId)
}

func (t *Erc20Token) getBalanceOf(act abi.ActorID) (*big.Int, error) {
balanceMap, err := adt.AsMap(adt.AdtStore(context.Background()), t.Balances, adt.BalanceTableBitwidth)
func (t *Erc20Token) getBalanceOf(ctx context.Context, act abi.ActorID) (*big.Int, error) {
balanceMap, err := adt.AsMap(adt.AdtStore(ctx), t.Balances, adt.BalanceTableBitwidth)
if err != nil {
return nil, err
}
Expand All @@ -196,20 +198,21 @@ type TransferReq struct {
TransferAmount *big.Int
}

/*Transfer token from current caller to a specified address.
/*
Transfer token from current caller to a specified address.

* `receiverAddr` - the ID of receiver.

* `transferAmount` - the transfer amount.
*/
func (t *Erc20Token) Transfer(transferReq *TransferReq) error {
senderID, err := sdk.Caller()
*/
func (t *Erc20Token) Transfer(ctx context.Context, transferReq *TransferReq) error {
senderID, err := sdk.Caller(ctx)

if err != nil {
return err
}

receiverID, err := sdk.ResolveAddress(transferReq.ReceiverAddr)
receiverID, err := sdk.ResolveAddress(ctx, transferReq.ReceiverAddr)
if err != nil {
return err
}
Expand All @@ -218,11 +221,11 @@ func (t *Erc20Token) Transfer(transferReq *TransferReq) error {
return errors.New("trasfer value must bigger than zero")
}

balanceOfSender, err := t.getBalanceOf(senderID)
balanceOfSender, err := t.getBalanceOf(ctx, senderID)
if err != nil {
return err
}
balanceOfReceiver, err := t.getBalanceOf(receiverID)
balanceOfReceiver, err := t.getBalanceOf(ctx, receiverID)
if err != nil {
return err
}
Expand All @@ -235,7 +238,7 @@ func (t *Erc20Token) Transfer(transferReq *TransferReq) error {
return fmt.Errorf("transfer amount should be less than balance of sender (%v): %v", senderID, err)
}

balanceMap, err := adt.AsMap(adt.AdtStore(context.Background()), t.Balances, adt.BalanceTableBitwidth)
balanceMap, err := adt.AsMap(adt.AdtStore(ctx), t.Balances, adt.BalanceTableBitwidth)
if err != nil {
return err
}
Expand All @@ -251,8 +254,8 @@ func (t *Erc20Token) Transfer(transferReq *TransferReq) error {
return err
}
t.Balances = newBalanceMapRoot
logger.Logf("transfer from %d to %d amount %s", senderID, receiverID, transferReq.TransferAmount.String())
_ = sdk.SaveState(t)
logger.Logf(ctx, "transfer from %d to %d amount %s", senderID, receiverID, transferReq.TransferAmount.String())
_ = sdk.SaveState(ctx, t)
return nil
}

Expand All @@ -261,27 +264,29 @@ type AllowanceReq struct {
SpenderAddr address.Address
}

/*GetAllowance checks the amount of tokens that an owner Allowed a spender to transfer in behalf of the owner to another receiver.
/*
GetAllowance checks the amount of tokens that an owner Allowed a spender to transfer in behalf of the owner to another receiver.

* `ownerAddr` - the ID of owner.

* `spenderAddr` - the ID of spender*/
func (t *Erc20Token) Allowance(req *AllowanceReq) (*big.Int, error) {
ownerID, err := sdk.ResolveAddress(req.OwnerAddr)
* `spenderAddr` - the ID of spender
*/
func (t *Erc20Token) Allowance(ctx context.Context, req *AllowanceReq) (*big.Int, error) {
ownerID, err := sdk.ResolveAddress(ctx, req.OwnerAddr)
if err != nil {
return nil, err
}

spenderId, err := sdk.ResolveAddress(req.SpenderAddr)
spenderId, err := sdk.ResolveAddress(ctx, req.SpenderAddr)
if err != nil {
return nil, err
}

return t.getAllowance(ownerID, spenderId)
return t.getAllowance(ctx, ownerID, spenderId)
}

func (t *Erc20Token) getAllowance(ownerID, spenderId abi.ActorID) (*big.Int, error) {
allowBalanceMap, err := adt.AsMap(adt.AdtStore(context.Background()), t.Allowed, adt.BalanceTableBitwidth)
func (t *Erc20Token) getAllowance(ctx context.Context, ownerID, spenderId abi.ActorID) (*big.Int, error) {
allowBalanceMap, err := adt.AsMap(adt.AdtStore(ctx), t.Allowed, adt.BalanceTableBitwidth)
if err != nil {
return nil, err
}
Expand All @@ -300,21 +305,22 @@ type TransferFromReq struct {
TransferAmount *big.Int
}

/*TransferFrom transfer tokens from token owner to receiver.
/*
TransferFrom transfer tokens from token owner to receiver.

* `ownerAddr` - the ID of token owner.

* `receiverAddr` - the ID of receiver.

* `transferAmount` - the transfer amount.
*/
func (t *Erc20Token) TransferFrom(req *TransferFromReq) error {
tokenOwnerID, err := sdk.ResolveAddress(req.OwnerAddr)
*/
func (t *Erc20Token) TransferFrom(ctx context.Context, req *TransferFromReq) error {
tokenOwnerID, err := sdk.ResolveAddress(ctx, req.OwnerAddr)
if err != nil {
return err
}

receiverID, err := sdk.ResolveAddress(req.ReceiverAddr)
receiverID, err := sdk.ResolveAddress(ctx, req.ReceiverAddr)
if err != nil {
return err
}
Expand All @@ -323,19 +329,19 @@ func (t *Erc20Token) TransferFrom(req *TransferFromReq) error {
return errors.New("send value must bigger than zero")
}

spenderID, err := sdk.Caller()
spenderID, err := sdk.Caller(ctx)
if err != nil {
return err
}
balanceOfTokenOwner, err := t.getBalanceOf(tokenOwnerID)
balanceOfTokenOwner, err := t.getBalanceOf(ctx,tokenOwnerID)
if err != nil {
return err
}
balanceOfReceiver, err := t.getBalanceOf(receiverID)
balanceOfReceiver, err := t.getBalanceOf(ctx,receiverID)
if err != nil {
return err
}
approvedAmount, err := t.getAllowance(tokenOwnerID, spenderID)
approvedAmount, err := t.getAllowance(ctx,tokenOwnerID, spenderID)
if err != nil {
return err
}
Expand All @@ -358,7 +364,7 @@ func (t *Erc20Token) TransferFrom(req *TransferFromReq) error {
return fmt.Errorf("transfer amount should be less than approved spending amount of %v: %v", spenderID, err)
}

store := adt.AdtStore(context.Background())
store := adt.AdtStore(ctx)
balanceMap, err := adt.AsMap(store, t.Balances, adt.BalanceTableBitwidth)
if err != nil {
return err
Expand Down Expand Up @@ -387,7 +393,7 @@ func (t *Erc20Token) TransferFrom(req *TransferFromReq) error {
if t.Allowed, err = allowBalanceMap.Root(); err != nil {
return err
}
_ = sdk.SaveState(t)
_ = sdk.SaveState(ctx, t)
return nil
}

Expand All @@ -399,8 +405,8 @@ type ApprovalReq struct {
/*Approval approves the passed-in identity to spend/burn a maximum amount of tokens on behalf of the function caller.
* `spenderAddr` - the ID of approved user.
* `newAllowance` - the maximum approved amount.*/
func (t *Erc20Token) Approval(req *ApprovalReq) error {
spenderID, err := sdk.ResolveAddress(req.SpenderAddr)
func (t *Erc20Token) Approval(ctx context.Context, req *ApprovalReq) error {
spenderID, err := sdk.ResolveAddress(ctx, req.SpenderAddr)
if err != nil {
return err
}
Expand All @@ -409,17 +415,17 @@ func (t *Erc20Token) Approval(req *ApprovalReq) error {
return errors.New("allow value must bigger than zero")
}

callerID, err := sdk.Caller()
callerID, err := sdk.Caller(ctx)
if err != nil {
return err
}

allowance, err := t.getAllowance(callerID, spenderID)
allowance, err := t.getAllowance(ctx,callerID, spenderID)
if err != nil {
return err
}

allowBalanceMap, err := adt.AsMap(adt.AdtStore(context.Background()), t.Allowed, adt.BalanceTableBitwidth)
allowBalanceMap, err := adt.AsMap(adt.AdtStore(ctx), t.Allowed, adt.BalanceTableBitwidth)
if err != nil {
return err
}
Expand All @@ -432,8 +438,8 @@ func (t *Erc20Token) Approval(req *ApprovalReq) error {
if err != nil {
return err
}
_ = sdk.SaveState(t)
logger.Logf("approval %s for %s", getAllowKey(callerID, spenderID), req.NewAllowance.String())
_ = sdk.SaveState(ctx, t)
logger.Logf(ctx, "approval %s for %s", getAllowKey(callerID, spenderID), req.NewAllowance.String())
return nil
}

Expand Down
Loading