@typemove/aptos 1.2.9 → 1.3.0-rc.1

package/src/abis/0x4.json

@@ -1,6 +1,6 @@
 [
   {
-    "bytecode": "0xa11ceb0b060000000c010014021436034ab40204fe023605b403860307ba06ea0708a40e4006e40e7e10e20f94040af613390caf14850b0db41f100000010101020103010401050106010700080009000a0600000b0600000c0600000d080006100700031107010001081308000315020004160701000009170b0003270600022e04010601000e000100000f02030000120405010800140406010800180708000019070800001a070800001b090100001c0a0b00001d04010108001e04050108001f0c020000200c0d000021040501080009040e010800220f030000230f030000240f0300002504050108042f1112010004301113010003311401000432161701000333100300093401120009330103000235190301060436171b010008371c030003381d01010801391a1a00082104050108053a200100033b010800063c211a00013d1a1a00033e0c2200083f23010003400104010808412425000442261701030343201901060944280300034520080003462a080003472b01000648212c0007492e030100081d04010108034a0c1200034b0c1000044c031b0100034d0c0100034e0c040108094f040e010806500b0500025134030106131014101401161016011a181b1a1d171f1e261e281a2918132716272f2d301e1b10330133101b0135311d31361709170217361e381801060800010501080000010b05010900010804010b0501080606060c0804080408040b08010809080401080703060506080406080402060804060804010a0201060807010802010b0801080902060802080401080a01060b080109000101010609000106080a070505050b05010806080a030b0b01080101070b08010900010900010801010b0b0109000103010b0801090003060b05010806050b08010301060b050109000108060f070b0801030b050108060b0501080608040807060807050508040b08010308040c0b080108090803080401060c01060804010c02060506080402060b0501080605010b08010302060b08010900090001080902060807080910070b0801030b050108060b0501080608040807060807050508040b08010308040c0b080108090a020803080402060c0a020206050a0201060a02010202070a09000a0900060b0801080a0b0801050b080105050b0801080a0b080105010b05010803010803050b080108090804050b08010809050206080207080302070b0b010900090005746f6b656e056572726f72056576656e74066f626a656374066f7074696f6e067369676e657206737472696e6706766563746f720a636f6c6c656374696f6e07726f79616c7479074275726e5265660d4d75746174696f6e4576656e740a4d757461746f7252656605546f6b656e15616464726573735f66726f6d5f6275726e5f726566046275726e06537472696e67064f626a6563740f636f6c6c656374696f6e5f6e616d650a436f6c6c656374696f6e11636f6c6c656374696f6e5f6f626a6563740e436f6e7374727563746f72526566064f7074696f6e07526f79616c747906637265617465136372656174655f66726f6d5f6163636f756e74126372656174655f6e616d65645f746f6b656e146372656174655f746f6b656e5f61646472657373116372656174655f746f6b656e5f736565640763726561746f720b6465736372697074696f6e1167656e65726174655f6275726e5f7265661467656e65726174655f6d757461746f725f726566046e616d650f7365745f6465736372697074696f6e087365745f6e616d65077365745f7572690375726905696e6e65720944656c6574655265660473656c66126d7574617465645f6669656c645f6e616d65096f6c645f76616c7565096e65775f76616c756505696e6465780f6d75746174696f6e5f6576656e74730b4576656e7448616e646c650769735f736f6d6506626f72726f7717616464726573735f66726f6d5f64656c6574655f72656607657874726163740664656c657465096578697374735f61740e64657374726f795f68616e646c6504736f6d651064656372656d656e745f737570706c790e6f626a6563745f61646472657373096e6f745f666f756e640a616464726573735f6f660d6372656174655f6f626a656374066c656e6774680c6f75745f6f665f72616e67650f67656e65726174655f7369676e6572196372656174655f636f6c6c656374696f6e5f6164647265737311616464726573735f746f5f6f626a65637410696e6372656d656e745f737570706c79106765745f776974685f64656661756c74106e65775f6576656e745f68616e646c6504696e69741a6372656174655f6f626a6563745f66726f6d5f6163636f756e74136372656174655f6e616d65645f6f626a656374156372656174655f6f626a6563745f6164647265737305627974657306617070656e641763616e5f67656e65726174655f64656c6574655f7265661367656e65726174655f64656c6574655f726566046e6f6e651c616464726573735f66726f6d5f636f6e7374727563746f725f7265661b6f626a6563745f66726f6d5f636f6e7374727563746f725f7265660367657404757466380a656d69745f6576656e74000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000010308060000000000000003080300000000000000030802000000000000000308010000000000000003080400000000000000030805000000000000000308000800000000000003088000000000000000030800020000000000000a0203023a3a0a020c0b6465736372697074696f6e0a0205046e616d650a020403757269126170746f733a3a6d657461646174615f7631ff030601000000000000001545544f4b454e5f444f45535f4e4f545f45584953541854686520746f6b656e20646f6573206e6f7420657869737402000000000000000c454e4f545f43524541544f52265468652070726f7669646564207369676e6572206973206e6f74207468652063726561746f72030000000000000012454649454c445f4e4f545f4d555441424c4526546865206669656c64206265696e67206368616e676564206973206e6f74206d757461626c6504000000000000001445544f4b454e5f4e414d455f544f4f5f4c4f4e472954686520746f6b656e206e616d65206973206f76657220746865206d6178696d756d206c656e67746805000000000000000d455552495f544f4f5f4c4f4e472254686520555249206973206f76657220746865206d6178696d756d206c656e677468060000000000000015454445534352495054494f4e5f544f4f5f4c4f4e472a546865206465736372697074696f6e206973206f76657220746865206d6178696d756d206c656e6774680105546f6b656e010301183078313a3a6f626a6563743a3a4f626a65637447726f75700703757269010100046e616d650101000763726561746f7201010007726f79616c74790101000b6465736372697074696f6e0101000f636f6c6c656374696f6e5f6e616d6501010011636f6c6c656374696f6e5f6f626a656374010100000202260b0801080a280b0801050102032908042a08042b08040202012805030206080b050108062c031e08042108042508042d0b0b0108010001000001110a0010003800040a0b001000380111150c01050f0b0010013802140c010b01020101000103152c0e001000380004100d000f0038030c050e0511150c020b0511170b020c0105140d000f0138040c010b010c030a031118041b0a0311190a032c0313030c070101010c060c040b0738050e040b030b063806111c02020100010301100e0038070c010a0129030407050a0703111e270b012b031002143808020301000103010f0e0038070c010a0129030407050a0703111e270b012b0310021402040100001f610b0011200c0c0a0c11210c0a0e0a0b0c0b010b020b030b040b050c140c120c100c0e0c090c0d0c0b0e101122070725041a051f0b0b0107041123270e0e11220706250425052a0b0b0107001123270e141122070825043005350b0b0107051123270a0b11240c110e0d0e09112538090c080e080e11112011270c0f0b080c070d0f0c060b070b062e060000000000000000380a0b0e0b100b140e11380b12030c130e110b132d030e12380c045d0b0b0d12380d112a055f0b0b010b0a02050100001f610a0011200c0c0b00112b0c0a0e0a0b0c0b010b020b030b040b050c140c120c100c0e0c090c0d0c0b0e101122070725041a051f0b0b0107041123270e0e11220706250425052a0b0b0107001123270e141122070825043005350b0b0107051123270a0b11240c110e0d0e09112538090c080e080e11112011270c0f0b080c070d0f0c060b070b062e060000000000000000380a0b0e0b100b140e11380b12030c130e110b132d030e12380c045d0b0b0d12380d112a055f0b0b010b0a020601000029660a0011200c0c0e010e0311080c130b000b13112c0c0a0e0a0b0c0b010b020b030b040b050c150c120c100c0e0c090c0d0c0b0e101122070725041f05240b0b0107041123270e0e1122070625042a052f0b0b0107001123270e1511220708250435053a0b0b0107051123270a0b11240c110e0d0e09112538090c080e080e11112011270c0f0b080c070d0f0c060b070b062e060000000000000000380a0b0e0b100b150e11380b12030c140e110b142d030e12380c04620b0b0d12380d112a05640b0b010b0a020701000003060b000b010b021108112d02080100000b1b0a0111220707250406050d0b01010b000107041123270b00112e140c020d020709380e0d020b01112e14380e0b0202090100010301100e0038070c010a0129030407050a0703111e270b012b03100214380f020a01000103010f0e0038070c010a0129030407050a0703111e270b012b03100314020b0100002f1c0a001131040a0b001132381038110c020c0105120b0011340c0438120b0438130c020c010b010b020c060c050b060c030b050b031200020c01000030070b0038140c010e0138151202020d01000103010f0e0038070c010a0129030407050a0703111e270b012b03100414020e0100010332240e0038070c050a0529030407050a0703111e270b052b03010a0038160c040e04380c04160b040c0105220a0038170c030b0038180c020e030e021125380938190c010b01020f01000103332c0e0111220706250406050b0b000107001123270b000c020a021005142903041305180b02010703111e270b021005142a030c030a030f06070a11370a031003140a011201381a0b010b030f0315021001000103332c0e0111220707250406050b0b000107041123270b000c020a021005142903041305180b02010703111e270b021005142a030c030a030f06070b11370a031004140a011201381a0b010b030f0415021101000103332c0e0111220708250406050b0b000107051123270b000c020a021005142903041305180b02010703111e270b021005142a030c030a030f06070c11370a031007140a011201381a0b010b030f0715021201000103010f0e0038070c010a0129030407050a0703111e270b012b03100714020000000103000302030302000305030400",
+    "bytecode": "0xa11ceb0b060000000c010016021636034cc4020490034205d203a20307f4069708088b0f4006cb0f7e10c91094040add14390c9615a60f0dbc24100000010101020103010401050106010701080009000a000b0600000c0600000d0600000e08000611070003120701000109140800031602000417070100000a180b0003290600023004010601000f00010000100203000013040501080015040601080019070800001a070800001b070800001c090800001d0a0100001e0b0c00001f0401010800200405010800210d020000220d0e00002304050108000a040f0108002410030000251003000026100300002704050108043112130100043212140100033315010004341718010003351103000a360113000a3501030002371a0301060438181c010009391d0300033a1e010108013b1b1b00092304050108053c210100033d010800043e031c0100063f221b0001401b1b0003410d23000942240100034301040108094425260004452718010307461405010006472803000348211a01060a492a0300034a210800034b2c0800034c2d0100064d222e00084730030100091f04010108034e0d1300034f0d110003500d010003510d0401080a52040f010806530c0500025436030106141115111501171117011b191c1b1e18201f230514051505281f2a1b2b1b17052d19142917291c05332f341f1c11230123111c0138331e3339180a180218391f3b1901060800010501080000010b05010900010804010b0501080606060c0804080408040b08010809080401080707060c08040804080408040b08010809080403060506080406080402060804060804010a0201060807010802010b0801080902060802080401080a01060b080109000101010609000106080a070505050b05010806080a030b0b01080101070b08010900010900010801010b0b0109000103010b0801090003060b05010806050b08010301060b050109000108061208040b0501080608040807060807050508040b080103030804080408040b080108040c0b080108090803080401060c01060804010c02060506080402060b0501080605010b08010302060b0801090009000207080408040108090206080708091308040b0501080608040807060807050508040b080103030804080408040b080108040c0b080108090a020803080402060c0a020206050a0201060a02010202070a09000a0900060b0801080a0b0801050b080105050b0801080a0b080105010b05010803010803050b080108090804050b08010809050206080207080302070b0b010900090005746f6b656e056572726f72056576656e74066f626a656374066f7074696f6e067369676e657206737472696e670c737472696e675f7574696c7306766563746f720a636f6c6c656374696f6e07726f79616c7479074275726e5265660d4d75746174696f6e4576656e740a4d757461746f7252656605546f6b656e15616464726573735f66726f6d5f6275726e5f726566046275726e06537472696e67064f626a6563740f636f6c6c656374696f6e5f6e616d650a436f6c6c656374696f6e11636f6c6c656374696f6e5f6f626a6563740e436f6e7374727563746f72526566064f7074696f6e07526f79616c747906637265617465136372656174655f66726f6d5f6163636f756e74126372656174655f6e616d65645f746f6b656e156372656174655f6e756d62657265645f746f6b656e146372656174655f746f6b656e5f61646472657373116372656174655f746f6b656e5f736565640763726561746f720b6465736372697074696f6e1167656e65726174655f6275726e5f7265661467656e65726174655f6d757461746f725f726566046e616d650f7365745f6465736372697074696f6e087365745f6e616d65077365745f7572690375726905696e6e65720944656c6574655265660473656c66126d7574617465645f6669656c645f6e616d65096f6c645f76616c7565096e65775f76616c756505696e6465780f6d75746174696f6e5f6576656e74730b4576656e7448616e646c650769735f736f6d6506626f72726f7717616464726573735f66726f6d5f64656c6574655f72656607657874726163740664656c657465096578697374735f61740e64657374726f795f68616e646c6504736f6d651064656372656d656e745f737570706c790e6f626a6563745f61646472657373096e6f745f666f756e640a616464726573735f6f660d6372656174655f6f626a656374046e6f6e65066c656e6774680c6f75745f6f665f72616e67650f67656e65726174655f7369676e6572196372656174655f636f6c6c656374696f6e5f6164647265737311616464726573735f746f5f6f626a65637410696e6372656d656e745f737570706c79106765745f776974685f64656661756c7409746f5f737472696e6706617070656e64106e65775f6576656e745f68616e646c6504696e69741a6372656174655f6f626a6563745f66726f6d5f6163636f756e74136372656174655f6e616d65645f6f626a656374156372656174655f6f626a6563745f616464726573730562797465731763616e5f67656e65726174655f64656c6574655f7265661367656e65726174655f64656c6574655f7265661c616464726573735f66726f6d5f636f6e7374727563746f725f7265661b6f626a6563745f66726f6d5f636f6e7374727563746f725f7265660367657404757466380a656d69745f6576656e74000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000010308060000000000000003080300000000000000030802000000000000000308010000000000000003080400000000000000030805000000000000000308000800000000000003088000000000000000030800020000000000000a0203023a3a0a020c0b6465736372697074696f6e0a0205046e616d650a020403757269126170746f733a3a6d657461646174615f7631ff030601000000000000001545544f4b454e5f444f45535f4e4f545f45584953541854686520746f6b656e20646f6573206e6f7420657869737402000000000000000c454e4f545f43524541544f52265468652070726f7669646564207369676e6572206973206e6f74207468652063726561746f72030000000000000012454649454c445f4e4f545f4d555441424c4526546865206669656c64206265696e67206368616e676564206973206e6f74206d757461626c6504000000000000001445544f4b454e5f4e414d455f544f4f5f4c4f4e472954686520746f6b656e206e616d65206973206f76657220746865206d6178696d756d206c656e67746805000000000000000d455552495f544f4f5f4c4f4e472254686520555249206973206f76657220746865206d6178696d756d206c656e677468060000000000000015454445534352495054494f4e5f544f4f5f4c4f4e472a546865206465736372697074696f6e206973206f76657220746865206d6178696d756d206c656e6774680105546f6b656e010301183078313a3a6f626a6563743a3a4f626a65637447726f75700703757269010100046e616d650101000763726561746f7201010007726f79616c74790101000b6465736372697074696f6e0101000f636f6c6c656374696f6e5f6e616d6501010011636f6c6c656374696f6e5f6f626a656374010100000202280b0801080a2a0b0801050102032b08042c08042d08040202012a05030206090b050108062e032008042308042708042f0b0b0108010001000001110a0010003800040a0b001000380111160c01050f0b0010013802140c010b01020101000103162c0e001000380004100d000f0038030c050e0511160c020b0511180b020c0105140d000f0138040c010b010c030a031119041b0a03111a0a032c0313030c070101010c060c040b0738050e040b030b063806111d02020100010301100e0038070c010a0129030407050a0703111f270b012b031002143808020301000103010f0e0038070c010a0129030407050a0703111f270b012b031002140204010000208a010b0011210c0b0a0b11220c090e090b0b0b010b020b0338090b040b050c170c150c130c120c0d0c080c0c0c0a0e13380a042b0e121124061400000000000000160e13380b1124160707250425052a0b0a01070411252705360e121124070725043105360b0a0107041125270e0d1124070625043c05410b0a0107001125270e1711240708250447054c0b0a0107051125270a0a11260c140e0c0e081127380c0c070e070e14112111290c0e0d0e2e060000000000000000380d0c0f0e13380a046e0b120c100d100e0f380e112c0d100d13380f112c0b100c0605700b120c060b060c110b070b0f0b0d0b110b170e14381012030c160e140b162d030e1538110486010b0a0d153812112e0588010b0a010b090205010000208a010a0011210c0b0b00112f0c090e090b0b0b010b020b0338090b040b050c170c150c130c120c0d0c080c0c0c0a0e13380a042b0e121124061400000000000000160e13380b1124160707250425052a0b0a01070411252705360e121124070725043105360b0a0107041125270e0d1124070625043c05410b0a0107001125270e1711240708250447054c0b0a0107051125270a0a11260c140e0c0e081127380c0c070e070e14112111290c0e0d0e2e060000000000000000380d0c0f0e13380a046e0b120c100d100e0f380e112c0d100d13380f112c0b100c0605700b120c060b060c110b070b0f0b0d0b110b170e14381012030c160e140b162d030e1538110486010b0a0d153812112e0588010b0a010b0902060100002b8f010a0011210c0b0e010e0311090c160b000b1611300c090e090b0b0b010b020b0338090b040b050c180c150c130c120c0d0c080c0c0c0a0e13380a04300e121124061400000000000000160e13380b112416070725042a052f0b0a010704112527053b0e1211240707250436053b0b0a0107041125270e0d1124070625044105460b0a0107001125270e181124070825044c05510b0a0107051125270a0a11260c140e0c0e081127380c0c070e070e14112111290c0e0d0e2e060000000000000000380d0c0f0e13380a04730b120c100d100e0f380e112c0d100d13380f112c0b100c0605750b120c060b060c110b070b0f0b0d0b110b180e14381012030c170e140b172d030e153811048b010b0a0d153812112e058d010b0a010b090207010000208b010b0011210c0c0a0c11220c0a0e0a0b0c0b010b020b030b0438130b050b060c180c160c140c130c0e0c090c0d0c0b0e14380a042c0e131124061400000000000000160e14380b1124160707250426052b0b0b01070411252705370e131124070725043205370b0b0107041125270e0e1124070625043d05420b0b0107001125270e1811240708250448054d0b0b0107051125270a0b11260c150e0d0e091127380c0c080e080e15112111290c0f0d0f2e060000000000000000380d0c100e14380a046f0b130c110d110e10380e112c0d110d14380f112c0b110c0705710b130c070b070c120b080b100b0e0b120b180e15381012030c170e150b172d030e1638110487010b0b0d163812112e0589010b0b010b0a020801000003060b000b010b021109113102090100000c1b0a0111240707250406050d0b01010b000107041125270b001132140c020d02070938140d020b0111321438140b02020a0100010301100e0038070c010a0129030407050a0703111f270b012b031002143815020b01000103010f0e0038070c010a0129030407050a0703111f270b012b03100314020c010000311c0a001135040a0b001136381638170c020c0105120b0011370c0438180b0438190c020c010b010b020c060c050b060c030b050b031200020d01000032070b00381a0c010e01381b1202020e01000103010f0e0038070c010a0129030407050a0703111f270b012b03100414020f0100010334240e0038070c050a0529030407050a0703111f270b052b03010a00381c0c040e04381104160b040c0105220a00381d0c030b00381e0c020e030e021127380c381f0c010b01021001000103352c0e0111240706250406050b0b000107001125270b000c020a021005142903041305180b02010703111f270b021005142a030c030a030f06070a113a0a031003140a01120138200b010b030f0315021101000103352c0e0111240707250406050b0b000107041125270b000c020a021005142903041305180b02010703111f270b021005142a030c030a030f06070b113a0a031004140a01120138200b010b030f0415021201000103352c0e0111240708250406050b0b000107051125270b000c020a021005142903041305180b02010703111f270b021005142a030c030a030f06070c113a0a031007140a01120138200b010b030f0715021301000103010f0e0038070c010a0129030407050a0703111f270b012b03100714020000000103000302030302000305030400",
     "abi": {
       "address": "0x4",
       "name": "token",
@@ -122,6 +122,25 @@
             "0x1::object::ConstructorRef"
           ]
         },
+        {
+          "name": "create_numbered_token",
+          "visibility": "public",
+          "is_entry": false,
+          "is_view": false,
+          "generic_type_params": [],
+          "params": [
+            "&signer",
+            "0x1::string::String",
+            "0x1::string::String",
+            "0x1::string::String",
+            "0x1::string::String",
+            "0x1::option::Option<0x4::royalty::Royalty>",
+            "0x1::string::String"
+          ],
+          "return": [
+            "0x1::object::ConstructorRef"
+          ]
+        },
         {
           "name": "create_token_address",
           "visibility": "public",

package/src/account-resource-client.ts

@@ -1,15 +1,22 @@
-import { AptosClient, MaybeHexString } from 'aptos'
+import {
+  AccountAddressInput,
+  Aptos,
+  MoveStructId,
+  LedgerVersionArg,
+  PaginationArgs,
+  MoveResource
+} from '@aptos-labs/ts-sdk'
 import { TypeDescriptor } from '@typemove/move'
 import { defaultMoveCoder } from './move-coder.js'
 import { TypedMoveResource } from './models.js'
 
-type ResourceQuery = {
-  ledgerVersion?: bigint | number
-}
+// type ResourceQuery = {
+//   ledgerVersion?: bigint | number
+// }
 
 export class AccountResourceClient {
-  client: AptosClient
-  constructor(client: AptosClient) {
+  client: Aptos
+  constructor(client: Aptos) {
     this.client = client
   }
 
@@ -18,41 +25,45 @@ export class AccountResourceClient {
    * @param accountAddress
    * @param query
    */
-  async getAll(accountAddress: MaybeHexString, query?: ResourceQuery) {
-    return this.client.getAccountResources(accountAddress, query)
+  async getAll(accountAddress: AccountAddressInput, options?: PaginationArgs & LedgerVersionArg) {
+    return this.client.getAccountResources({ accountAddress, options })
   }
 
   /**
    * Match a single resource with exact type, resource type should not contain any type
    * @param accountAddress
    * @param resourceType
-   * @param query
+   * @param options
    */
   async matchExact<T>(
-    accountAddress: MaybeHexString,
+    accountAddress: AccountAddressInput,
     resourceType: TypeDescriptor<T>,
-    query?: ResourceQuery
+    options?: LedgerVersionArg
   ): Promise<TypedMoveResource<T> | undefined> {
     if (resourceType.existAnyType()) {
       throw new Error('resource type for match call should not contain any type')
     }
-    const typeStr = resourceType.getSignature()
-    const result = await this.client.getAccountResource(accountAddress, typeStr, query)
-    return defaultMoveCoder(this.client.nodeUrl).decodeResource<T>(result)
+    const typeStr = resourceType.getSignature() as MoveStructId
+    const result = await this.client.getAccountResource({ accountAddress, resourceType: typeStr, options })
+    const resource: MoveResource = {
+      type: typeStr,
+      data: result
+    }
+    return defaultMoveCoder(this.client.config.fullnode).decodeResource<T>(resource)
   }
 
   /**
    * Match all resources with type pattern, it could be a partial type like `amm.Pool<aptos_coin.AptosCoin.type(), ANY_TYPE>`
    * @param accountAddress
    * @param resourceType
-   * @param query
+   * @param options
    */
   async matchAll<T>(
-    accountAddress: MaybeHexString,
+    accountAddress: AccountAddressInput,
     resourceType: TypeDescriptor<T>,
-    query?: ResourceQuery
+    options?: PaginationArgs & LedgerVersionArg
   ): Promise<TypedMoveResource<T>[]> {
-    const result = await this.client.getAccountResources(accountAddress, query)
-    return defaultMoveCoder(this.client.nodeUrl).filterAndDecodeResources<T>(resourceType, result)
+    const result = await this.client.getAccountResources({ accountAddress, options })
+    return defaultMoveCoder(this.client.config.fullnode).filterAndDecodeResources<T>(resourceType, result)
   }
 }

package/src/aptos-chain-adapter.ts

@@ -6,25 +6,29 @@ import {
   InternalMoveModule,
   InternalMoveStruct
 } from '@typemove/move'
-import { AptosClient } from 'aptos'
 
-import { Event, MoveModuleBytecode, MoveResource } from './move-types.js'
+import { Aptos, Event, MoveModuleBytecode, MoveResource } from '@aptos-labs/ts-sdk'
 import { toInternalModule } from './to-internal.js'
 
 export class AptosChainAdapter extends ChainAdapter<MoveModuleBytecode, Event | MoveResource> {
   // static INSTANCE = new AptosChainAdapter()
-  client: AptosClient
-  constructor(client: AptosClient) {
+  client: Aptos
+  constructor(client: Aptos) {
     super()
     this.client = client
   }
 
   async fetchModules(account: string): Promise<MoveModuleBytecode[]> {
-    return await this.client.getAccountModules(account)
+    return await this.client.getAccountModules({
+      accountAddress: account
+    })
   }
 
   async fetchModule(account: string, module: string): Promise<MoveModuleBytecode> {
-    return await this.client.getAccountModule(account, module)
+    return await this.client.getAccountModule({
+      accountAddress: account,
+      moduleName: module
+    })
   }
 
   toInternalModules(modules: MoveModuleBytecode[]): InternalMoveModule[] {