From a064695973c6c4afb1a57966b3d14555c4ca150c Mon Sep 17 00:00:00 2001
From: samliok <samliok@stanford.edu>
Date: Thu, 21 Dec 2023 21:54:10 -0500
Subject: [PATCH 1/2] rename call_program

---
 .../examples/imports/program/program.go       |   3 +--
 x/programs/examples/testdata/counter.wasm     | Bin 37537 -> 37332 bytes
 x/programs/examples/testdata/token.wasm       | Bin 36782 -> 36765 bytes
 x/programs/rust/examples/counter/src/lib.rs   |  12 ++++++------
 .../rust/wasmlanche_sdk/src/host/program.rs   |  11 ++++-------
 x/programs/rust/wasmlanche_sdk/src/program.rs |  10 +++++-----
 6 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/x/programs/examples/imports/program/program.go b/x/programs/examples/imports/program/program.go
index 1ef54baad7..d3d196e939 100644
--- a/x/programs/examples/imports/program/program.go
+++ b/x/programs/examples/imports/program/program.go
@@ -62,11 +62,10 @@ func (i *Import) Register(link runtime.Link, meter runtime.Meter, imports runtim
 // callProgramFn makes a call to an entry function of a program in the context of another program's ID.
 func (i *Import) callProgramFn(
 	caller *wasmtime.Caller,
-	callerID int64,
 	programID int64,
-	maxUnits int64,
 	function int64,
 	args int64,
+	maxUnits int64,
 ) int64 {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
diff --git a/x/programs/examples/testdata/counter.wasm b/x/programs/examples/testdata/counter.wasm
index 8ad9f2c730de7e19ef038b71bc71f7063667eedf..4ecbb2c5968d51481f245067bfb98d9f2e039c36 100755
GIT binary patch
delta 3517
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
D(%6am

delta 3683
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
LP9NOgTbTbpESjZf

diff --git a/x/programs/examples/testdata/token.wasm b/x/programs/examples/testdata/token.wasm
index a38d37dbed3004621214c680fc326e0342e03d92..1b106cf27a46e57f18aa68c2d5323dfc89425e57 100755
GIT binary patch
delta 2120
zcmaJ?OK%)S5boDJ_A#rGAJP(AO3!3Lv%=Qqu-di!++Gw=B)A|U9Fjv$Xf;F#!i583
zHeiGkED<yk2#LrSgn<K!FlR_^`~+?sxNt(wfphq(XU4G;6kB%pbaz!(ecxBrKkbV<
z`{HgOcz)OtFSywe7c%1?o}1!_8U0o)I(DjsQK{zPEn3$i5h{{mRQ=LIGgijG7%;8O
z`)Q=K>@pTPP2Pa%H`9AlHV})Lih*cj2vhuPr{QPhZ;XRlbY&PPeEg7qJXWs;uu~TT
zZcmxt$==L_d&TWt+0GyO^XC+KXWAJ`-_#;SbG6Et7*Ra_1;io``?Viu_%#1>;myOB
z7pFY?RY?~KimXiWHh*f4HnT_}LJH+ymd4JQ4H+OXNBD5@A@M=OL_ESn8BI{QTAJAu
zK+quvAMMP3kv##_fEDn%YVlfTb-;jCfxBc6=y|8m+oK2o-!6?)P5|!m5<vq5@#hhW
zQy%*#P!#4KOHF`SVeofm=M<66fwufKuF;mAc4d)}N$f^l*G{g$OHI3#wRTq7RV2cP
zavKA#o(yGzkzI;>cns~e4qQ~%h3N)e=jwXpm8_DX3@frJpeNWKMSes32inhXoSn-G
z)=d)tKr)mEGtZ>jDQ{tBE=7#U!|p(}{!q{v3H`3qn)cQh2U`Ctm~e+QMxwpV(?a`=
zA0&4xy-c%Hf<Y7~ilP}w0wNJ}R_t09V*i7cYX6*k3o8>Xmf1EWa!ilH6bF&YF<d1(
zs13U_mv#jkW~4W>Y581cm!WrjYRi@f5Gww#0=68jDsNi!*rheTP61kXP3sN;k0|0r
zDwks83H-Ms-V_80#dlee9VCk5J-!Yofo(yCE+7Zc?lNN(nI*$JCgT)M)K9<+5n;V|
z#g+V>XmS2AT0&dL`O(?A!=IzK7u0uk9^{>k{%dUl^=n?0SJ_j(II-Z<iJOlWNSZgG
z)&jALxQdTNB(cnY+t@4=223=yB~<MPX$&UM8-=zew1ZAK5KG!g7>ivrDl`X%43G$F
zaGBlz9?j|uP<71%v;h3OxDb1$b1nRo=#On<5(fQ{xbOyI1%p2jeFRI4%ji1YW5M>*
zh-!0>r&QZi^@d-M>iL(O&u0x?HzF;8uIe{#Y7ZqwLa}L5RYL~>R)b?<={ma08vmBl
z{r2bt(1;x#afFS;&&SdzYG5a_#~eFLajQ(<Z6W`tmA|;P#9R4$ThAqaQ9Dfst($6d
zLUO>Pkm_cs0EHlQkl){0m~Ys?-+<Rzk0Th|t84j#t=R!EPsGYgR*rqtb@)}$^%K#j
zwvveT2silPp>vHC&ZxYde0B8fjH6ovp|OMKg|vm`cSo~V9D>?48EPh=((a0t2)V&w
ztOC)L4Q318$^}qY;1!qvNAt@^pw!HRfxDkz7T%$VSOZ|m{I5}xsj6#mD4}?{7+xgL
z@Ztqz2bzub?m>8y42_2!h=uGCM8{Sh)K)sds)HpA)+VM80BX~P3RL7s*jX*01RT7g
z`Hl%+r=+RYE$t)}q~nkj%C(|F;&mV*?fc=NZS(~T_btBgPiT4ozCn?(1AA}&k2$mG
Zt+K+d$0lniA-DkQ^bl!v*csn?<v;1gYZL$g

delta 2272
zcmZWqO=u)V6t1fNtDfmenvFtC7O8I6C4&<)hjC`fWX;sbV&bl_cnTsSA`)5;vZp;P
z+pT8Z?7AS*f(S0TEJQ>k67i_<wm0#%Ac7ac;|d<U>G!I-cP508sp_g%uipE<@4dRa
zC%)Yi2Q9(x9nOds{NNuh+?-!8e_fl)wagTcZx=<ulvol`;?N)ySB&aET8L9m%gq*3
zp1ztTo^soaC4R)4O6V_(qk{ECgsJEYiD5p&kIdqa$?X`1O0=E%l#l=8ACBEuS~%ui
zXmJ?5Br|=V&g)b09UDa3kqHd=zT#uGyC2`8WgR3Q-NuwZaHI|skLKPgV`8M73kb|T
z?1o>T;y26R7T@O4;qdfFJpaLU0wgN(r{Dul3jR(i&X_sw?jFm$XEX06F6DbJ@ensf
z_$SL!f6N99_~<|I5#YnY2Mt?df|92d0Td`#&t-sT;N*xFU-RaR&J%1+oC1n(7!;RT
z1K?m);4XIsn95_AUc;Th^eTpjj6nUDRj6v9ihrQpcHT?FDP$=z-9nry7y1FCIYndQ
z$BxX>1{~3b%-W941u@b_Q#Gbn;H05~`mpj>*=6Lw2hIit+`Bb!<}tF(B!ov;`#4`;
z1$TL%nzcWp0K%;z9+8~jy_<wh74EBW!n*?VtIXBBqF+ZqfqWtzrk}`^UtP%bV;N$t
zcic>cgIti21De;!T*)Eh!0e=S;vJF)X}RE;)kpIihX=K89<piO+y@g=C3DFNXM==8
z(z$F(LAiaAQ!S9SDTYtz4yzX>me~fhQd8wwJLK~SKFbseha4ccwy2nTmYBu)i_kuH
zV?&$-4mFinF;sZ%yy8NM6}CC#9g5Gmi>$j?j40rU%ExY;pkyQAksx3w3YU&SsIXq)
z9e@dREg!Mv15gLcj8SC7N3P@}LXJ@dcKARr;=*`ui%Ta<9xiI?Pt^K^FqB0_*k_K*
zQS44Gu2<!L_+#?gqWfKg&z4V~@8yb!_<|dZseo;p`gCd`CW~8>1rqoB&^z%6WlXca
z!!7LvuUjQSxy#Wfor?y~sx9tt97YWn<xl6&=C);`{;y@J*B4#wQgcL;aI?PXD0hjm
zG(dku^I?F7DqOQ=_VZUq1zP}Jf&LpU20xpNX{gV<8{Z^Vr436Vy6_sjg?(`jL!&Qx
zxcdmqIalZ!{b0dVeL{rZ;h8C0<fZwQBr0z_|4iOekrr7+q0oOB^K?dq)GKNQ(kc`-
zi`7YMQ4zY=kl#bLDm13sKu-WBZdKL=GA=bpG07ftfYwRlDt$jj{z+Uux8C7#`R4lB
zrG{lXLd}{-WSfNMBN{bRNy|qNYPLLBUwpk~0)G`=n=2f_jA&NpGp4?=m7oF@=tPHq
z(XiCZl#D+o5NWZOG-y~$BwC@8060sfV$iCRWqb5ADmv~9g&jzRB#apzJ7ZvSS<@UR
zh=xGtsMHp9l{TIe>pt~cB66C{^ctf!&`<+w@uKJL`wu|3ejF^}c|5p*kN7Ty$h;=P
z_sU;JOSxay0EbfWGWw7J-o+5D(!3#TU$IFa#rqkOnCQHHF014CmN<#QSf}&>s7>n7
zho49XFp~NyQOcHDl*8Vt7Lf#jVHc}4up>z@#t<AxGb^YNuw_e0YL)c_i}wulxQ>7h
m!AX-sWcwzJ@^`&(I$ULRl$zM~5aoy|@ZP1-Kb#xie))gkwuQ0)

diff --git a/x/programs/rust/examples/counter/src/lib.rs b/x/programs/rust/examples/counter/src/lib.rs
index e94fff17b0..32f6d66cfa 100644
--- a/x/programs/rust/examples/counter/src/lib.rs
+++ b/x/programs/rust/examples/counter/src/lib.rs
@@ -41,14 +41,14 @@ fn inc(program: Program, to: Address, amount: i64) -> bool {
 /// Increments the count at the address by the amount for an external program.
 #[public]
 fn inc_external(
-    program: Program,
+    _: Program,
     target: Program,
     max_units: i64,
     of: Address,
     amount: i64,
 ) -> i64 {
-    program
-        .call_program(&target, max_units, "inc", params!(&of, &amount))
+    target
+        .call_function("inc", params!(&of, &amount), max_units)
         .unwrap()
 }
 
@@ -63,8 +63,8 @@ fn get_value(program: Program, of: Address) -> i64 {
 
 /// Gets the count at the address for an external program.
 #[public]
-fn get_value_external(program: Program, target: Program, max_units: i64, of: Address) -> i64 {
-    program
-        .call_program(&target, max_units, "get_value", params!(&of))
+fn get_value_external(_: Program, target: Program, max_units: i64, of: Address) -> i64 {
+    target
+        .call_function("get_value", params!(&of), max_units)
         .unwrap()
 }
diff --git a/x/programs/rust/wasmlanche_sdk/src/host/program.rs b/x/programs/rust/wasmlanche_sdk/src/host/program.rs
index df61db4ccf..8a91badbde 100644
--- a/x/programs/rust/wasmlanche_sdk/src/host/program.rs
+++ b/x/programs/rust/wasmlanche_sdk/src/host/program.rs
@@ -7,26 +7,23 @@ use crate::program::Program;
 extern "C" {
     #[link_name = "call_program"]
     fn _call_program(
-        caller_id: i64,
         target_id: i64,
-        max_units: i64,
         function: i64,
         args_ptr: i64,
+        max_units: i64,
     ) -> i64;
 }
 
-/// Calls another program `target` and returns the result.
+/// Calls a program `target` and returns the result.
 pub(crate) fn call(
-    caller: &Program,
     target: &Program,
-    max_units: i64,
     function_name: &str,
     args: &[u8],
+    max_units: i64,
 ) -> Result<i64, StateError> {
-    let caller = to_smart_ptr(caller.id())?;
     let target = to_smart_ptr(target.id())?;
     let function = to_smart_ptr(function_name.as_bytes())?;
     let args = to_smart_ptr(args)?;
 
-    Ok(unsafe { _call_program(caller, target, max_units, function, args) })
+    Ok(unsafe { _call_program(target, function, args, max_units) })
 }
diff --git a/x/programs/rust/wasmlanche_sdk/src/program.rs b/x/programs/rust/wasmlanche_sdk/src/program.rs
index a25606cb9a..a65469bf84 100644
--- a/x/programs/rust/wasmlanche_sdk/src/program.rs
+++ b/x/programs/rust/wasmlanche_sdk/src/program.rs
@@ -29,21 +29,21 @@ impl Program {
         State::new(Program::new(*self.id()))
     }
 
-    /// Attempts to call another program `target` from this program `caller`.
+    /// Attempts to call a function `name` with `args` on the given program. This method
+    /// is used to call functions on external programs.
     /// # Errors
     /// Returns a `StateError` if the call fails.
     /// # Safety
     /// The caller must ensure that `function_name` + `args` point to valid memory locations.
-    pub fn call_program(
+    pub fn call_function(
         &self,
-        target: &Program,
-        max_units: i64,
         function_name: &str,
         args: Vec<Vec<u8>>,
+        max_units: i64,
     ) -> Result<i64, StateError> {
         // flatten the args into a single byte vector
         let args = args.into_iter().flatten().collect::<Vec<u8>>();
-        call_program(self, target, max_units, function_name, &args)
+        call_program(self, function_name, &args, max_units)
     }
 }
 

From 438e64ba11392df6b9807175cf865d4eb0cbe5f8 Mon Sep 17 00:00:00 2001
From: samliok <samliok@stanford.edu>
Date: Thu, 21 Dec 2023 22:10:16 -0500
Subject: [PATCH 2/2] =?UTF-8?q?cargo=20fmt=20=F0=9F=98=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 x/programs/rust/examples/counter/src/lib.rs        | 8 +-------
 x/programs/rust/wasmlanche_sdk/src/host/program.rs | 7 +------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/x/programs/rust/examples/counter/src/lib.rs b/x/programs/rust/examples/counter/src/lib.rs
index 32f6d66cfa..65bcaa2a1e 100644
--- a/x/programs/rust/examples/counter/src/lib.rs
+++ b/x/programs/rust/examples/counter/src/lib.rs
@@ -40,13 +40,7 @@ fn inc(program: Program, to: Address, amount: i64) -> bool {
 
 /// Increments the count at the address by the amount for an external program.
 #[public]
-fn inc_external(
-    _: Program,
-    target: Program,
-    max_units: i64,
-    of: Address,
-    amount: i64,
-) -> i64 {
+fn inc_external(_: Program, target: Program, max_units: i64, of: Address, amount: i64) -> i64 {
     target
         .call_function("inc", params!(&of, &amount), max_units)
         .unwrap()
diff --git a/x/programs/rust/wasmlanche_sdk/src/host/program.rs b/x/programs/rust/wasmlanche_sdk/src/host/program.rs
index 8a91badbde..fe5bc69e87 100644
--- a/x/programs/rust/wasmlanche_sdk/src/host/program.rs
+++ b/x/programs/rust/wasmlanche_sdk/src/host/program.rs
@@ -6,12 +6,7 @@ use crate::program::Program;
 #[link(wasm_import_module = "program")]
 extern "C" {
     #[link_name = "call_program"]
-    fn _call_program(
-        target_id: i64,
-        function: i64,
-        args_ptr: i64,
-        max_units: i64,
-    ) -> i64;
+    fn _call_program(target_id: i64, function: i64, args_ptr: i64, max_units: i64) -> i64;
 }
 
 /// Calls a program `target` and returns the result.