add '%my account address%' variable

aergoio · Jul 14, 2024 · f14bbd9 · f14bbd9
1 parent c6c184a
commit f14bbd9
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 3 deletions.
diff --git a/contract/vm_dummy/test_files/feature_multicall.lua b/contract/vm_dummy/test_files/feature_multicall.lua
@@ -87,4 +87,15 @@ function recv_aergo()
   -- does nothing
 end
 
-abi.payable(recv_aergo)
+function resend_to(address)
+  local amount = system.getAmount()
+  contract.send(address, amount)
+  return amount
+end
+
+function send_to(address, amount)
+  contract.send(address, amount)
+end
+
+abi.payable(recv_aergo, resend_to)
+abi.register(send_to)
diff --git a/contract/vm_dummy/vm_dummy_test.go b/contract/vm_dummy/vm_dummy_test.go
@@ -5689,6 +5689,51 @@ func TestComposableTransactions(t *testing.T) {
 		 ["assert","%last_result%","=","test2"]
 		]`)
 
+		multicall(t, bc, "ac3", `[
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","sender"],
+		 ["assert","%last_result%","=","%my account address%"],
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","is_contract","%my account address%"],
+		 ["assert","%last_result%","=",false],
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","set","account","%my account address%"],
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","get","account"],
+		 ["assert","%last_result%","=","%my account address%"]
+		]`)
+
+		// CALL + SEND
+
+		multicall(t, bc, "ac3", `[
+		 ["get balance","%my account address%"],
+		 ["store result as","my balance before"],
+		 ["get balance","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA"],
+		 ["store result as","contract balance before"],
+		 ["call + send","0.25 aergo","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","resend_to","%my account address%"],
+		 ["assert","%last_result%","=","250000000000000000"],
+		 ["get balance","%my account address%"],
+		 ["assert","%last_result%","=","%my balance before%"],
+		 ["get balance","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA"],
+		 ["assert","%last_result%","=","%contract balance before%"]
+		]`)
+
+		multicall(t, bc, "ac3", `[
+		 ["get balance","%my account address%"],
+		 ["store result as","my balance before"],
+		 ["get balance","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA"],
+		 ["store result as","contract balance before"],
+
+		 ["let","amount","1.5","aergo"],
+		 ["call + send","%amount%","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","recv_aergo"],
+
+		 ["assert","%my aergo balance%","<","%my balance before%"],
+		 ["get balance","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA"],
+		 ["assert","%last_result%",">","%contract balance before%"],
+
+		 ["call","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA","send_to","%my account address%","%amount%"],
+
+		 ["assert","%my aergo balance%","=","%my balance before%"],
+		 ["get balance","AmhbUWkqenFtgKLnbDd1NXHce7hn35pcHWYRWBnq5vauLfEQXXRA"],
+		 ["assert","%last_result%","=","%contract balance before%"]
+		]`)
+
 
 		// CALL LOOP
 

diff --git a/contract/vm_multicall.go b/contract/vm_multicall.go
@@ -96,7 +96,9 @@ end
 
 function get_arg_value(varname, default)
   local value = default
-  if varname == "my aergo balance" then
+  if varname == "my account address" then
+    value = system.getContractID()
+  elseif varname == "my aergo balance" then
     value = action["get balance"]()
   elseif vars[varname] ~= nil then
     value = vars[varname]

diff --git a/contract/vm_multicall.lua b/contract/vm_multicall.lua
@@ -91,7 +91,9 @@ end
 
 function get_arg_value(varname, default)
   local value = default
-  if varname == "my aergo balance" then
+  if varname == "my account address" then
+    value = system.getContractID()
+  elseif varname == "my aergo balance" then
     value = action["get balance"]()
   elseif vars[varname] ~= nil then
     value = vars[varname]

diff --git a/tests/test-multicall.sh b/tests/test-multicall.sh
@@ -1033,6 +1033,51 @@ multicall "ac3" '[
  ["assert","%last_result%","=","test2"]
 ]'
 
+multicall "ac3" '[
+ ["call","'$address'","sender"],
+ ["assert","%last_result%","=","%my account address%"],
+ ["call","'$address'","is_contract","%my account address%"],
+ ["assert","%last_result%","=",false],
+ ["call","'$address'","set","account","%my account address%"],
+ ["call","'$address'","get","account"],
+ ["assert","%last_result%","=","%my account address%"]
+]'
+
+# CALL + SEND
+
+multicall "ac3" '[
+ ["get balance","%my account address%"],
+ ["store result as","my balance before"],
+ ["get balance","'$address'"],
+ ["store result as","contract balance before"],
+ ["call + send","0.25 aergo","'$address'","resend_to","%my account address%"],
+ ["assert","%last_result%","=","250000000000000000"],
+ ["get balance","%my account address%"],
+ ["assert","%last_result%","=","%my balance before%"],
+ ["get balance","'$address'"],
+ ["assert","%last_result%","=","%contract balance before%"]
+]'
+
+multicall "ac3" '[
+ ["get balance","%my account address%"],
+ ["store result as","my balance before"],
+ ["get balance","'$address'"],
+ ["store result as","contract balance before"],
+
+ ["let","amount","1.5","aergo"],
+ ["call + send","%amount%","'$address'","recv_aergo"],
+
+ ["assert","%my aergo balance%","<","%my balance before%"],
+ ["get balance","'$address'"],
+ ["assert","%last_result%",">","%contract balance before%"],
+
+ ["call","'$address'","send_to","%my account address%","%amount%"],
+
+ ["assert","%my aergo balance%","=","%my balance before%"],
+ ["get balance","'$address'"],
+ ["assert","%last_result%","=","%contract balance before%"]
+]'
+
 
 # CALL LOOP